diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php index 33fdb675ac0..c777c36dca0 100644 --- a/htdocs/accountancy/admin/card.php +++ b/htdocs/accountancy/admin/card.php @@ -388,13 +388,13 @@ else if ($id > 0 || $ref) { if (! empty($user->rights->accounting->chartofaccount)) { print '' . $langs->trans('Modify') . ''; } else { - print '' . $langs->trans('Modify') . ''; + print '' . $langs->trans('Modify') . ''; } if (! empty($user->rights->accounting->chartofaccount)) { print '' . $langs->trans('Delete') . ''; } else { - print '' . $langs->trans('Delete') . ''; + print '' . $langs->trans('Delete') . ''; } print ''; diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php index 62eda456fe7..6a60a031a59 100644 --- a/htdocs/accountancy/admin/fiscalyear.php +++ b/htdocs/accountancy/admin/fiscalyear.php @@ -117,7 +117,7 @@ if ($result) } else { - $addbutton = '' . $langs->trans("NewFiscalYear") . ''; + $addbutton = '' . $langs->trans("NewFiscalYear") . ''; } $title = $langs->trans('AccountingPeriods'); diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index f09db4b1cf7..1c13cfea1e1 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -917,7 +917,7 @@ if (empty($action) || $action == 'view') { print '
'; if (! empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) print ''; if ($in_bookkeeping == 'notyet') print ''; - else print '' . $langs->trans("WriteBookKeeping") . ''; + else print '' . $langs->trans("WriteBookKeeping") . ''; print '
'; // TODO Avoid using js. We can use a direct link with $param diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php index a767d469120..3147339601c 100644 --- a/htdocs/accountancy/journal/expensereportsjournal.php +++ b/htdocs/accountancy/journal/expensereportsjournal.php @@ -561,11 +561,11 @@ if (empty($action) || $action == 'view') { } print '
'; if (empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1') { - print ''; + print ''; } else { if ($in_bookkeeping == 'notyet') print ''; - else print '' . $langs->trans("WriteBookKeeping") . ''; + else print '' . $langs->trans("WriteBookKeeping") . ''; } //print ''; print '
'; diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 1b71b288c6b..bec5ce67609 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -748,11 +748,11 @@ if (empty($action) || $action == 'view') { print '
'; if (! empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) print ''; if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') { - print ''; + print ''; } else { if ($in_bookkeeping == 'notyet') print ''; - else print '' . $langs->trans("WriteBookKeeping") . ''; + else print '' . $langs->trans("WriteBookKeeping") . ''; } print '
'; diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index 3e718796b24..fb7df4e8b45 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -686,11 +686,11 @@ if (empty($action) || $action == 'view') { print '
'; if (! empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) print ''; if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') { - print ''; + print ''; } else { if ($in_bookkeeping == 'notyet') print ''; - else print '' . $langs->trans("WriteBookKeeping") . ''; + else print '' . $langs->trans("WriteBookKeeping") . ''; } print '
'; diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index a6da2fc01ce..b34c0419de3 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -1746,16 +1746,16 @@ else if ($object->statut >= 1) { if ($object->email) print '
'.$langs->trans("SendCardByMail")."
\n"; - else print '
'.$langs->trans("SendCardByMail")."
\n"; + else print '
'.$langs->trans("SendCardByMail")."
\n"; } else { - print '
'.$langs->trans("SendCardByMail")."
"; + print '
'.$langs->trans("SendCardByMail")."
"; } } else { - print '
'.$langs->trans("SendCardByMail")."
"; + print '
'.$langs->trans("SendCardByMail")."
"; }*/ // Modify @@ -1765,7 +1765,7 @@ else } else { - print '
'.$langs->trans("Modify").'
'; + print '
'.$langs->trans("Modify").'
'; } // Validate @@ -1777,7 +1777,7 @@ else } else { - print '
'.$langs->trans("Validate").'
'; + print '
'.$langs->trans("Validate").'
'; } } @@ -1790,7 +1790,7 @@ else } else { - print '
'.$langs->trans("Reenable")."
"; + print '
'.$langs->trans("Reenable")."
"; } } @@ -1803,7 +1803,7 @@ else } else { - print '
'.$langs->trans("Resiliate")."
"; + print '
'.$langs->trans("Resiliate")."
"; } } @@ -1813,11 +1813,11 @@ else if ($user->rights->societe->creer) { if ($object->statut != -1) print '
'.$langs->trans("CreateDolibarrThirdParty").'
'; - else print '
'.$langs->trans("CreateDolibarrThirdParty").'
'; + else print '
'.$langs->trans("CreateDolibarrThirdParty").'
'; } else { - print '
'.$langs->trans("CreateDolibarrThirdParty")."
"; + print '
'.$langs->trans("CreateDolibarrThirdParty")."
"; } } @@ -1827,11 +1827,11 @@ else if ($user->rights->user->user->creer) { if ($object->statut != -1) print '
'.$langs->trans("CreateDolibarrLogin").'
'; - else print '
'.$langs->trans("CreateDolibarrLogin").'
'; + else print '
'.$langs->trans("CreateDolibarrLogin").'
'; } else { - print '
'.$langs->trans("CreateDolibarrLogin")."
"; + print '
'.$langs->trans("CreateDolibarrLogin")."
"; } } @@ -1842,7 +1842,7 @@ else } else { - print '
'.$langs->trans("Delete")."
"; + print '
'.$langs->trans("Delete")."
"; } // Action SPIP diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index 5f7abe63253..04d175efa21 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -654,7 +654,7 @@ if ($rowid > 0) print '
'; if ($object->statut > 0) print '
'.$langs->trans("AddSubscription")."
"; - else print '
'.$langs->trans("AddSubscription").'
'; + else print '
'.$langs->trans("AddSubscription").'
'; print '
'; } diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php index e458bf093f6..c951f36db6e 100644 --- a/htdocs/adherents/subscription/card.php +++ b/htdocs/adherents/subscription/card.php @@ -368,7 +368,7 @@ if ($rowid && $action != 'edit') } else { - print '
".$langs->trans("Modify")."
"; + print '
".$langs->trans("Modify")."
"; } } diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 3c6e6a14e6c..33b6d83e0da 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -735,7 +735,7 @@ else } else { - print ''.$langs->trans("DoTestServerAvailability").''; + print ''.$langs->trans("DoTestServerAvailability").''; } print ''.$langs->trans("DoTestSend").''; diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php index 7ce5add09a3..b8a4a85026b 100644 --- a/htdocs/admin/mails_emailing.php +++ b/htdocs/admin/mails_emailing.php @@ -509,7 +509,7 @@ else } else { - print ''.$langs->trans("DoTestServerAvailability").''; + print ''.$langs->trans("DoTestServerAvailability").''; } print ''.$langs->trans("DoTestSend").''; diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index 84570e75e2a..24a49f5d17d 100644 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -258,7 +258,7 @@ else } else { - print ''.$langs->trans("DoTestServerAvailability").''; + print ''.$langs->trans("DoTestServerAvailability").''; }*/ if (count($listofmethods) && ! empty($conf->global->MAIN_SMS_SENDMODE)) @@ -267,7 +267,7 @@ else } else { - print ''.$langs->trans("DoTestSend").''; + print ''.$langs->trans("DoTestSend").''; } print ''; diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php index 40b2a9365db..d8b8f3aa056 100644 --- a/htdocs/asset/card.php +++ b/htdocs/asset/card.php @@ -287,7 +287,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } else { - print ''.$langs->trans('Modify').''."\n"; + print ''.$langs->trans('Modify').''."\n"; } if ($user->rights->asset->delete) @@ -296,7 +296,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } else { - print ''.$langs->trans('Delete').''."\n"; + print ''.$langs->trans('Delete').''."\n"; } } print ''."\n"; diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index 72356b1e97e..233fc6e6a22 100644 --- a/htdocs/categories/photos.php +++ b/htdocs/categories/photos.php @@ -189,7 +189,7 @@ if ($object->id) } else { - print ''; + print ''; print $langs->trans("AddPhoto").''; } } diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 22648189f99..8d9e6c7d34f 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -1658,7 +1658,7 @@ if ($id > 0) } else { - print '
'.$langs->trans("Modify").'
'; + print '
'.$langs->trans("Modify").'
'; } if ($user->rights->agenda->allactions->create || @@ -1668,7 +1668,7 @@ if ($id > 0) } else { - print '
'.$langs->trans("ToClone").'
'; + print '
'.$langs->trans("ToClone").'
'; } if ($user->rights->agenda->allactions->delete || @@ -1678,7 +1678,7 @@ if ($id > 0) } else { - print '
'.$langs->trans("Delete").'
'; + print '
'.$langs->trans("Delete").'
'; } } } diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 4fba6aeec84..6f0848d0008 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -1242,7 +1242,7 @@ if ($object->id > 0) { if ($object->status != 1) { - print '
'.$langs->trans("ThirdPartyIsClosed").'
'; + print '
'.$langs->trans("ThirdPartyIsClosed").'
'; } if (! empty($conf->propal->enabled) && $user->rights->propal->creer && $object->status==1) @@ -1282,7 +1282,7 @@ if ($object->id > 0) { if (empty($user->rights->facture->creer)) { - print '
'.$langs->trans("AddBill").'
'; + print '
'.$langs->trans("AddBill").'
'; } else { @@ -1294,13 +1294,13 @@ if ($object->id > 0) if ($object->client != 0 && $object->client != 2) { if (! empty($orders2invoice) && $orders2invoice > 0) print '
'.$langs->trans("CreateInvoiceForThisCustomer").'
'; - else print '
'.$langs->trans("CreateInvoiceForThisCustomer").'
'; + else print '
'.$langs->trans("CreateInvoiceForThisCustomer").'
'; } - else print '
'.$langs->trans("AddBill").'
'; + else print '
'.$langs->trans("AddBill").'
'; } if ($object->client != 0 && $object->client != 2) print '
'.$langs->trans("AddBill").'
'; - else print '
'.$langs->trans("AddBill").'
'; + else print '
'.$langs->trans("AddBill").'
'; } } } diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index a2a6f743db8..233f32d26be 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -995,7 +995,7 @@ else if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send) { - print ''.$langs->trans("TestMailing").''; + print ''.$langs->trans("TestMailing").''; } else { @@ -1006,11 +1006,11 @@ else { if ($object->nbemail <= 0) { - print ''.$langs->trans("ValidMailing").''; + print ''.$langs->trans("ValidMailing").''; } else if (empty($user->rights->mailing->valider)) { - print ''.$langs->trans("ValidMailing").''; + print ''.$langs->trans("ValidMailing").''; } else { @@ -1022,11 +1022,11 @@ else { if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) { - print ''.$langs->trans("SendMailing").''; + print ''.$langs->trans("SendMailing").''; } else if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send) { - print ''.$langs->trans("SendMailing").''; + print ''.$langs->trans("SendMailing").''; } else { @@ -1043,7 +1043,7 @@ else { if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send) { - print ''.$langs->trans("ResetMailing").''; + print ''.$langs->trans("ResetMailing").''; } else { @@ -1055,7 +1055,7 @@ else { if ($object->statut > 0 && (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->delete)) { - print ''.$langs->trans("DeleteMailing").''; + print ''.$langs->trans("DeleteMailing").''; } else { diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index a0bfeba418d..ff5c98d425e 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -2463,7 +2463,7 @@ if ($action == 'create') print '
' . $langs->trans('Validate') . '
'; } else - print '
' . $langs->trans('Validate') . '
'; + print '
' . $langs->trans('Validate') . '
'; } // Create event /*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) // Add hidden condition because this is not a "workflow" action so should appears somewhere else on page. @@ -2486,7 +2486,7 @@ if ($action == 'create') if ($usercansend) { print '
' . $langs->trans('SendMail') . '
'; } else - print '
' . $langs->trans('SendMail') . '
'; + print '
' . $langs->trans('SendMail') . '
'; } // Create an order diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 770fc141db8..611ff8368b9 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -2532,7 +2532,7 @@ if ($action == 'create' && $user->rights->commande->creer) if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) { print '
' . $langs->trans('SendMail') . '
'; } else - print '
' . $langs->trans('SendMail') . '
'; + print '
' . $langs->trans('SendMail') . '
'; } // Valid @@ -2564,7 +2564,7 @@ if ($action == 'create' && $user->rights->commande->creer) if ($user->rights->ficheinter->creer) { print '
' . $langs->trans('AddIntervention') . '
'; } else { - print '
' . $langs->trans('AddIntervention') . '
'; + print '
' . $langs->trans('AddIntervention') . '
'; } } } @@ -2588,11 +2588,11 @@ if ($action == 'create' && $user->rights->commande->creer) if ($user->rights->expedition->creer) { print '
' . $langs->trans('CreateShipment') . '
'; } else { - print '
' . $langs->trans('CreateShipment') . '
'; + print '
' . $langs->trans('CreateShipment') . '
'; } } else { $langs->load("errors"); - print '
' . $langs->trans('CreateShipment') . '
'; + print '
' . $langs->trans('CreateShipment') . '
'; } } } @@ -2641,7 +2641,7 @@ if ($action == 'create' && $user->rights->commande->creer) if ($numshipping == 0) { print '
' . $langs->trans('Delete') . '
'; } else { - print '
' . $langs->trans("Delete") . '
'; + print '
' . $langs->trans("Delete") . '
'; } } } diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index f123dd35eb5..d355fcc4900 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -417,7 +417,7 @@ if (empty($numref)) if ($user->rights->banque->consolidate) { print ''.$langs->trans("Conciliate").''; } else { - print ''.$langs->trans("Conciliate").''; + print ''.$langs->trans("Conciliate").''; } } diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php index 9afe670230a..d2adc857ec7 100644 --- a/htdocs/compta/bank/various_payment/card.php +++ b/htdocs/compta/bank/various_payment/card.php @@ -489,12 +489,12 @@ if ($id) } else { - print ''.$langs->trans("Delete").''; + print ''.$langs->trans("Delete").''; } } else { - print ''.$langs->trans("Delete").''; + print ''.$langs->trans("Delete").''; } print ""; } diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php index b213bd25061..922df54c147 100644 --- a/htdocs/compta/deplacement/card.php +++ b/htdocs/compta/deplacement/card.php @@ -531,7 +531,7 @@ else if ($id) } else { - print ''.$langs->trans('Modify').''; + print ''.$langs->trans('Modify').''; } } @@ -543,7 +543,7 @@ else if ($id) } else { - print ''.$langs->trans('Validate').''; + print ''.$langs->trans('Validate').''; } } @@ -555,7 +555,7 @@ else if ($id) } else { - print ''.$langs->trans('ClassifyRefunded').''; + print ''.$langs->trans('ClassifyRefunded').''; } } @@ -565,7 +565,7 @@ else if ($id) } else { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } print ''; diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index a734f850fb9..996c031474b 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -4628,18 +4628,18 @@ else if ($id > 0 || ! empty($ref)) { print '
' . $langs->trans('Modify') . '
'; } else { - print '
' . $langs->trans('Modify') . '
'; + print '
' . $langs->trans('Modify') . '
'; } } else if (!$object->is_last_in_cycle()) { - print '
' . $langs->trans('Modify') . '
'; + print '
' . $langs->trans('Modify') . '
'; } else { - print '
' . $langs->trans('Modify') . '
'; + print '
' . $langs->trans('Modify') . '
'; } } } else { - print '
' . $langs->trans('Modify') . '
'; + print '
' . $langs->trans('Modify') . '
'; } } @@ -4657,7 +4657,7 @@ else if ($id > 0 || ! empty($ref)) { print '
' . $langs->trans('ReOpen') . '
'; } else { - print '
' . $langs->trans('ReOpen') . '
'; + print '
' . $langs->trans('ReOpen') . '
'; } } @@ -4672,12 +4672,12 @@ else if ($id > 0 || ! empty($ref)) // Send by mail if (($object->statut == Facture::STATUS_VALIDATED || $object->statut == Facture::STATUS_CLOSED) || ! empty($conf->global->FACTURE_SENDBYEMAIL_FOR_ALL_STATUS)) { if ($objectidnext) { - print '
' . $langs->trans('SendMail') . '
'; + print '
' . $langs->trans('SendMail') . '
'; } else { if ($usercansend) { print '
' . $langs->trans('SendMail') . '
'; } else - print '
' . $langs->trans('SendMail') . '
'; + print '
' . $langs->trans('SendMail') . '
'; } } @@ -4692,27 +4692,27 @@ else if ($id > 0 || ! empty($ref)) { print ''.$langs->trans("MakeWithdrawRequest").''; } else { - print '
' . $langs->trans('MakeWithdrawRequest') . '
'; + print '
' . $langs->trans('MakeWithdrawRequest') . '
'; } } else { - //print ''.$langs->trans("MakeWithdrawRequest").''; + //print ''.$langs->trans("MakeWithdrawRequest").''; } } else { - //print ''.$langs->trans("MakeWithdrawRequest").''; + //print ''.$langs->trans("MakeWithdrawRequest").''; } } // Create payment if ($object->type != Facture::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0 && $usercanissuepayment) { if ($objectidnext) { - print '
' . $langs->trans('DoPayment') . '
'; + print '
' . $langs->trans('DoPayment') . '
'; } else { //if ($resteapayer == 0) { // Sometimes we can receive more, so we accept to enter more and will offer a button to convert into discount (but it is not a credit note, just a prepayment done) - // print '
' . $langs->trans('DoPayment') . '
'; + // print '
' . $langs->trans('DoPayment') . '
'; //} else { print '
' . $langs->trans('DoPayment') . '
'; //} @@ -4726,7 +4726,7 @@ else if ($id > 0 || ! empty($ref)) { if ($resteapayer == 0) { - print '
'.$langs->trans('DoPaymentBack').'
'; + print '
'.$langs->trans('DoPaymentBack').'
'; } else { @@ -4773,7 +4773,7 @@ else if ($id > 0 || ! empty($ref)) { if ($objectidnext) { - print '
' . $langs->trans('ClassifyCanceled') . '
'; + print '
' . $langs->trans('ClassifyCanceled') . '
'; } else { @@ -4820,7 +4820,7 @@ else if ($id > 0 || ! empty($ref)) { print '
' . $langs->trans("CreateCreditNote") . '
'; } else { - print '
' . $langs->trans("CreateCreditNote") . '
'; + print '
' . $langs->trans("CreateCreditNote") . '
'; } } @@ -4840,7 +4840,7 @@ else if ($id > 0 || ! empty($ref)) } else { - print '
' . $langs->trans("RemoveSituationFromCycle") . '
'; + print '
' . $langs->trans("RemoveSituationFromCycle") . '
'; } } @@ -4849,9 +4849,9 @@ else if ($id > 0 || ! empty($ref)) if ($object->is_last_in_cycle() && $object->situation_final != 1) { print '
' . $langs->trans('CreateNextSituationInvoice') . '
'; } else if (!$object->is_last_in_cycle()) { - print '
' . $langs->trans('CreateNextSituationInvoice') . '
'; + print '
' . $langs->trans('CreateNextSituationInvoice') . '
'; } else { - print '
' . $langs->trans('CreateNextSituationInvoice') . '
'; + print '
' . $langs->trans('CreateNextSituationInvoice') . '
'; } } @@ -4861,31 +4861,31 @@ else if ($id > 0 || ! empty($ref)) { //var_dump($isErasable); if ($isErasable == -4) { - print '
' . $langs->trans('Delete') . '
'; + print '
' . $langs->trans('Delete') . '
'; } elseif ($isErasable == -3) { - print '
' . $langs->trans('Delete') . '
'; + print '
' . $langs->trans('Delete') . '
'; } elseif ($isErasable == -2) { - print '
' . $langs->trans('Delete') . '
'; + print '
' . $langs->trans('Delete') . '
'; } elseif ($isErasable == -1) { - print '
' . $langs->trans('Delete') . '
'; + print '
' . $langs->trans('Delete') . '
'; } elseif ($isErasable <= 0) // Any other cases { - print '
' . $langs->trans('Delete') . '
'; + print '
' . $langs->trans('Delete') . '
'; } elseif ($objectidnext) { - print '
' . $langs->trans('Delete') . '
'; + print '
' . $langs->trans('Delete') . '
'; } else { print '
' . $langs->trans('Delete') . '
'; } } else { - print '
' . $langs->trans('Delete') . '
'; + print '
' . $langs->trans('Delete') . '
'; } } print ''; diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 856433173ad..ab5dda7186f 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -1674,7 +1674,7 @@ else { if (! empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max)) { - print '
'.$langs->trans("CreateBill").'
'; + print '
'.$langs->trans("CreateBill").'
'; } else { @@ -1684,13 +1684,13 @@ else } else { - print '
'.$langs->trans("CreateBill").'
'; + print '
'.$langs->trans("CreateBill").'
'; } } } else { - print '
'.$langs->trans("CreateBill").'
'; + print '
'.$langs->trans("CreateBill").'
'; } } diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index db3e1b0ef86..907d2357950 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -543,22 +543,22 @@ if ($object->id > 0) } else { - print ''.$langs->trans("MakeWithdrawRequest").''; + print ''.$langs->trans("MakeWithdrawRequest").''; } } else { - print ''.$langs->trans("MakeWithdrawRequest").''; + print ''.$langs->trans("MakeWithdrawRequest").''; } } else { if ($num == 0) { - if ($object->statut > Facture::STATUS_DRAFT) print ''.$langs->trans("MakeWithdrawRequest").''; - else print ''.$langs->trans("MakeWithdrawRequest").''; + if ($object->statut > Facture::STATUS_DRAFT) print ''.$langs->trans("MakeWithdrawRequest").''; + else print ''.$langs->trans("MakeWithdrawRequest").''; } - else print ''.$langs->trans("MakeWithdrawRequest").''; + else print ''.$langs->trans("MakeWithdrawRequest").''; } print "
\n"; diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php index 222423b7c67..0582c4b14b3 100644 --- a/htdocs/compta/localtax/card.php +++ b/htdocs/compta/localtax/card.php @@ -295,7 +295,7 @@ if ($id) } else { - print ''.$langs->trans("Delete").''; + print ''.$langs->trans("Delete").''; } print ""; } diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php index 839b6c89294..96e94351ad4 100644 --- a/htdocs/compta/paiement/card.php +++ b/htdocs/compta/paiement/card.php @@ -438,7 +438,7 @@ if ($user->societe_id == 0 && $action == '') } else { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } } } diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index 9a21ff3dee8..c19d51b5891 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -546,7 +546,7 @@ if ($action == 'new') } else { - print ''.$langs->trans('NewCheckDepositOn',$account_label).''; + print ''.$langs->trans('NewCheckDepositOn',$account_label).''; } print '
'; print ''; diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php index f645edf4563..d1e0fe8e4e9 100644 --- a/htdocs/compta/payment_sc/card.php +++ b/htdocs/compta/payment_sc/card.php @@ -319,7 +319,7 @@ if ($action == '') } else { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } } } diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 8a313f1968c..1bfe84e4831 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -166,18 +166,18 @@ if ($nb) { { if ($mysoc->isInEEC()) { - print ''.$langs->trans("CreateForSepaFRST")."\n"; - print ''.$langs->trans("CreateForSepaRCUR")."\n"; + print ''.$langs->trans("CreateForSepaFRST")."\n"; + print ''.$langs->trans("CreateForSepaRCUR")."\n"; } else { - print ''.$langs->trans("CreateAll")."\n"; + print ''.$langs->trans("CreateAll")."\n"; } } } else { - print 'transnoentitiesnoconv("StandingOrders"))).'">'.$langs->trans("CreateAll")."\n"; + print 'transnoentitiesnoconv("StandingOrders"))).'">'.$langs->trans("CreateAll")."\n"; } print "\n"; diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index 85e503bfe7b..f63cb7761de 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -235,12 +235,12 @@ if ($id) } else { - print "trans("NotAllowed")."\">".$langs->trans("StandingOrderReject").""; + print "trans("NotAllowed")."\">".$langs->trans("StandingOrderReject").""; } } else { - print "trans("NotPossibleForThisStatusOfWithdrawReceiptORLine")."\">".$langs->trans("StandingOrderReject").""; + print "trans("NotPossibleForThisStatusOfWithdrawReceiptORLine")."\">".$langs->trans("StandingOrderReject").""; } } diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php index 9d98d6cf0ee..474fcd0a6cb 100644 --- a/htdocs/compta/salaries/card.php +++ b/htdocs/compta/salaries/card.php @@ -477,12 +477,12 @@ if ($id) } else { - print ''.$langs->trans("Delete").''; + print ''.$langs->trans("Delete").''; } } else { - print ''.$langs->trans("Delete").''; + print ''.$langs->trans("Delete").''; } print ""; } diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php index cd015e96c11..d5779266661 100644 --- a/htdocs/compta/tva/card.php +++ b/htdocs/compta/tva/card.php @@ -389,12 +389,12 @@ if ($id) } else { - print ''.$langs->trans("Delete").''; + print ''.$langs->trans("Delete").''; } } else { - print ''.$langs->trans("Delete").''; + print ''.$langs->trans("Delete").''; } print ""; } diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 5d2671ee129..a2c287ebe9a 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -2101,32 +2101,32 @@ else if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) { print '
' . $langs->trans('SendMail') . '
'; } else - print '
' . $langs->trans('SendMail') . '
'; + print '
' . $langs->trans('SendMail') . '
'; } if ($object->statut == 0 && $nbofservices) { if ($user->rights->contrat->creer) print '
'.$langs->trans("Validate").'
'; - else print '
'.$langs->trans("Validate").'
'; + else print '
'.$langs->trans("Validate").'
'; } if ($object->statut == 1) { if ($user->rights->contrat->creer) print '
'.$langs->trans("Modify").'
'; - else print '
'.$langs->trans("Modify").'
'; + else print '
'.$langs->trans("Modify").'
'; } if (! empty($conf->facture->enabled) && $object->statut > 0) { $langs->load("bills"); if ($user->rights->facture->creer) print '
'.$langs->trans("CreateBill").'
'; - else print '
'.$langs->trans("CreateBill").'
'; + else print '
'.$langs->trans("CreateBill").'
'; } if (! empty($conf->commande->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices) { $langs->load("orders"); if ($user->rights->commande->creer) print '
'.$langs->trans("CreateOrder").'
'; - else print '
'.$langs->trans("CreateOrder").'
'; + else print '
'.$langs->trans("CreateOrder").'
'; } // Clone @@ -2142,7 +2142,7 @@ else } else { - print '
'.$langs->trans("ActivateAllContracts").'
'; + print '
'.$langs->trans("ActivateAllContracts").'
'; } } if ($object->nbofservicesclosed < $nbofservices) @@ -2153,7 +2153,7 @@ else } else { - print '
'.$langs->trans("CloseAllContracts").'
'; + print '
'.$langs->trans("CloseAllContracts").'
'; } //if (! $numactive) @@ -2161,7 +2161,7 @@ else //} //else //{ - // print '
'.$langs->trans("Close").'
'; + // print '
'.$langs->trans("Close").'
'; //} } @@ -2174,7 +2174,7 @@ else } else { - print '
'.$langs->trans("Delete").'
'; + print '
'.$langs->trans("Delete").'
'; } } diff --git a/htdocs/core/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php index c64ea1fa090..9f2e55153d0 100644 --- a/htdocs/core/lib/ldap.lib.php +++ b/htdocs/core/lib/ldap.lib.php @@ -111,16 +111,16 @@ function show_ldap_test_button($butlabel,$testlabel,$key,$dn,$objectclass) print '
'; if (! function_exists("ldap_connect")) { - print ''.$butlabel.''; + print ''.$butlabel.''; } else if (empty($conf->global->LDAP_SERVER_HOST)) { - print ''.$butlabel.''; + print ''.$butlabel.''; } else if (empty($key) || empty($dn) || empty($objectclass)) { $langs->load("errors"); - print ''.$butlabel.''; + print ''.$butlabel.''; } else { diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php index d3c0e8d7992..56a02ed5b14 100644 --- a/htdocs/cron/card.php +++ b/htdocs/cron/card.php @@ -729,25 +729,25 @@ else print "\n\n
\n"; if (! $user->rights->cron->create) { - print ''.$langs->trans("Edit").''; + print ''.$langs->trans("Edit").''; } else { print ''.$langs->trans("Edit").''; } if ((empty($user->rights->cron->execute))) { - print ''.$langs->trans("CronExecute").''; + print ''.$langs->trans("CronExecute").''; } else if (empty($object->status)) { - print ''.$langs->trans("CronExecute").''; + print ''.$langs->trans("CronExecute").''; } else { print ''.$langs->trans("CronExecute").''; } if (! $user->rights->cron->create) { - print ''.$langs->trans("CronStatusActiveBtn").'/'.$langs->trans("CronStatusInactiveBtn").''; + print ''.$langs->trans("CronStatusActiveBtn").'/'.$langs->trans("CronStatusInactiveBtn").''; } else { if (empty($object->status)) { print ''.$langs->trans("CronStatusActiveBtn").''; diff --git a/htdocs/don/card.php b/htdocs/don/card.php index f3d8667dffb..7287c4e1fe5 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -795,7 +795,7 @@ if (! empty($id) && $action != 'edit') { if ($remaintopay == 0) { - print '
' . $langs->trans('DoPayment') . '
'; + print '
' . $langs->trans('DoPayment') . '
'; } else { @@ -818,12 +818,12 @@ if (! empty($id) && $action != 'edit') } else { - print '
'.$langs->trans("Delete")."
"; + print '
'.$langs->trans("Delete")."
"; } } else { - print '
'.$langs->trans("Delete")."
"; + print '
'.$langs->trans("Delete")."
"; } print "
"; diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php index 1c3a60e7e78..bf9c2768815 100644 --- a/htdocs/don/payment/card.php +++ b/htdocs/don/payment/card.php @@ -291,7 +291,7 @@ if ($_GET['action'] == '') } else { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } } } diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php index b608f72e23e..c8e8d79046b 100644 --- a/htdocs/ecm/dir_add_card.php +++ b/htdocs/ecm/dir_add_card.php @@ -303,7 +303,7 @@ if (empty($action) || $action == 'delete_section') } else { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } print ''; } diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php index 7c3473117fc..ac744cc42e1 100644 --- a/htdocs/ecm/dir_card.php +++ b/htdocs/ecm/dir_card.php @@ -478,7 +478,7 @@ if ($action != 'edit' && $action != 'delete') } else { - print ''.$langs->trans('ECMAddSection').''; + print ''.$langs->trans('ECMAddSection').''; } //if (count($filearrayall) == 0) @@ -495,9 +495,9 @@ if ($action != 'edit' && $action != 'delete') else { if (count($filearray) > 0) - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; else - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; }*/ print ''; } diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php index 959a4bc5b8d..2415e8a1a9b 100644 --- a/htdocs/ecm/file_card.php +++ b/htdocs/ecm/file_card.php @@ -410,7 +410,7 @@ if ($action != 'edit') } else { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } */ print ''; diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index f92660a0110..ed2eb5239b3 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -2463,7 +2463,7 @@ else if ($id || $ref) } else { - print ''.$langs->trans("Validate").''; + print ''.$langs->trans("Validate").''; } } @@ -2488,7 +2488,7 @@ else if ($id || $ref) { print ''.$langs->trans('SendMail').''; } - else print ''.$langs->trans('SendMail').''; + else print ''.$langs->trans('SendMail').''; } // Create bill diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index 0255b211c6d..48bfd1f4ce2 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -845,7 +845,7 @@ if ($id > 0 || ! empty($ref)) } else { - print ''.$langs->trans("CreateShipment").''; + print ''.$langs->trans("CreateShipment").''; } } print ""; @@ -910,7 +910,7 @@ if ($id > 0 || ! empty($ref)) else { print '
'; - print ''.$langs->trans("CreateShipment").''; + print ''.$langs->trans("CreateShipment").''; print '
'; } } diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index 082cccc6868..8115f8c80e3 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -2266,7 +2266,7 @@ if ($action != 'create' && $action != 'edit') //if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expensereport->expensereport_advance->send)) { print '
' . $langs->trans('SendMail') . '
'; //} else - // print '
' . $langs->trans('SendMail') . '
'; + // print '
' . $langs->trans('SendMail') . '
'; } @@ -2364,7 +2364,7 @@ if ($action != 'create' && $action != 'edit') // Pay if ($remaintopay == 0) { - print '
' . $langs->trans('DoPayment') . '
'; + print '
' . $langs->trans('DoPayment') . '
'; } else { diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php index f75a0f8bb31..7e1a1bf0d61 100644 --- a/htdocs/expensereport/payment/card.php +++ b/htdocs/expensereport/payment/card.php @@ -304,7 +304,7 @@ if ($action == '') } else { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } } } diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index b715ba853b7..54a9b64cb8f 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -678,7 +678,7 @@ if ($step == 2 && $datatoexport) } else { - print ''.$langs->trans("NextStep").''; + print ''.$langs->trans("NextStep").''; } print ''; diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 756613d6a8f..6158848ceed 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1644,7 +1644,7 @@ else if ($id > 0 || ! empty($ref)) { print '
'.$langs->trans('SendMail').'
'; } - else print '
'.$langs->trans('SendMail').'
'; + else print '
'.$langs->trans('SendMail').'
'; } // create intervention model @@ -1663,7 +1663,7 @@ else if ($id > 0 || ! empty($ref)) if ($object->statut < Fichinter::STATUS_BILLED) { if ($user->rights->propal->creer) print '
'.$langs->trans("AddProp").'
'; - else print '
'.$langs->trans("AddProp").'
'; + else print '
'.$langs->trans("AddProp").'
'; } } @@ -1674,7 +1674,7 @@ else if ($id > 0 || ! empty($ref)) if ($object->statut < Fichinter::STATUS_BILLED) { if ($user->rights->facture->creer) print '
'.$langs->trans("AddBill").'
'; - else print '
'.$langs->trans("AddBill").'
'; + else print '
'.$langs->trans("AddBill").'
'; } if (! empty($conf->global->FICHINTER_CLASSIFY_BILLED)) // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1 diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 235a3c85396..f017cce90ab 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -780,7 +780,7 @@ if ($object->id > 0) { if ($object->status != 1) { - print '
'.$langs->trans("ThirdPartyIsClosed").'
'; + print '
'.$langs->trans("ThirdPartyIsClosed").'
'; } if ($conf->supplier_proposal->enabled && $user->rights->supplier_proposal->creer) @@ -792,7 +792,7 @@ if ($object->id > 0) } else { - print ''.$langs->trans("AddSupplierProposal").''; + print ''.$langs->trans("AddSupplierProposal").''; } } @@ -805,7 +805,7 @@ if ($object->id > 0) } else { - print ''.$langs->trans("AddOrder").''; + print ''.$langs->trans("AddOrder").''; } } @@ -818,7 +818,7 @@ if ($object->id > 0) } else { - print ''.$langs->trans("AddBill").''; + print ''.$langs->trans("AddBill").''; } } @@ -832,10 +832,10 @@ if ($object->id > 0) } else { - print '
'.$langs->trans("CreateInvoiceForThisCustomer").'
'; + print '
'.$langs->trans("CreateInvoiceForThisCustomer").'
'; } } - else print '
'.$langs->trans("CreateInvoiceForThisCustomer").'
'; + else print '
'.$langs->trans("CreateInvoiceForThisCustomer").'
'; } // Add action diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index cf5e08f0ff3..d7715a21ceb 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -2275,7 +2275,7 @@ elseif (! empty($object->id)) { if (! empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED && ! empty($object->user_approve_id)) { - print ''.$langs->trans("ApproveOrder").''; + print ''.$langs->trans("ApproveOrder").''; } else { @@ -2284,7 +2284,7 @@ elseif (! empty($object->id)) } else { - print ''.$langs->trans("ApproveOrder").''; + print ''.$langs->trans("ApproveOrder").''; } } @@ -2297,7 +2297,7 @@ elseif (! empty($object->id)) { if (! empty($object->user_approve_id2)) { - print ''.$langs->trans("Approve2Order").''; + print ''.$langs->trans("Approve2Order").''; } else { @@ -2306,7 +2306,7 @@ elseif (! empty($object->id)) } else { - print ''.$langs->trans("Approve2Order").''; + print ''.$langs->trans("Approve2Order").''; } } } @@ -2320,7 +2320,7 @@ elseif (! empty($object->id)) } else { - print ''.$langs->trans("RefuseOrder").''; + print ''.$langs->trans("RefuseOrder").''; } } @@ -2370,7 +2370,7 @@ elseif (! empty($object->id)) if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->receptionner) { print '
' . $langs->trans('ReceiveProducts') . '
'; } else { - print '
' . $langs->trans('ReceiveProducts') . '
'; + print '
' . $langs->trans('ReceiveProducts') . '
'; } } } @@ -2383,7 +2383,7 @@ elseif (! empty($object->id)) } else { - print '
'.$langs->trans("MakeOrder").'
'; + print '
'.$langs->trans("MakeOrder").'
'; } } diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php index 5d6664347b7..feab3fcb1bc 100644 --- a/htdocs/fourn/commande/info.php +++ b/htdocs/fourn/commande/info.php @@ -187,7 +187,7 @@ if (! empty($conf->agenda->enabled)) } else { - print ''.$langs->trans("AddAction").''; + print ''.$langs->trans("AddAction").''; } } diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 1b1d4306a91..0d3363331d3 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -3022,9 +3022,9 @@ else else { if ($user->rights->fournisseur->facture->creer) { - print '
'.$langs->trans('ReOpen').'
'; + print '
'.$langs->trans('ReOpen').'
'; } elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) { - print '
'.$langs->trans('ReOpen').'
'; + print '
'.$langs->trans('ReOpen').'
'; } } } @@ -3036,7 +3036,7 @@ else { print '
'.$langs->trans('SendMail').'
'; } - else print '
'.$langs->trans('SendMail').'
'; + else print '
'.$langs->trans('SendMail').'
'; } // Make payments @@ -3061,7 +3061,7 @@ else { if ($resteapayer == 0) { - print '
'.$langs->trans('DoPaymentBack').'
'; + print '
'.$langs->trans('DoPaymentBack').'
'; } else { @@ -3098,7 +3098,7 @@ else } else { - print '
'.$langs->trans('Validate').'
'; } } @@ -3131,20 +3131,20 @@ else { //var_dump($isErasable); if ($isErasable == -4) { - print '
' . $langs->trans('Delete') . '
'; + print '
' . $langs->trans('Delete') . '
'; } elseif ($isErasable == -3) { // Should never happen with supplier invoice - print '
' . $langs->trans('Delete') . '
'; + print '
' . $langs->trans('Delete') . '
'; } elseif ($isErasable == -2) { // Should never happen with supplier invoice - print '
' . $langs->trans('Delete') . '
'; + print '
' . $langs->trans('Delete') . '
'; } elseif ($isErasable == -1) { - print '
' . $langs->trans('Delete') . '
'; + print '
' . $langs->trans('Delete') . '
'; } elseif ($isErasable <= 0) // Any other cases { - print '
' . $langs->trans('Delete') . '
'; + print '
' . $langs->trans('Delete') . '
'; } else { diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php index bd957503b94..5f720175b69 100644 --- a/htdocs/fourn/paiement/card.php +++ b/htdocs/fourn/paiement/card.php @@ -356,7 +356,7 @@ if ($result > 0) } else { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } } } diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 0028367cd3d..0f22e07245b 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -1326,14 +1326,14 @@ else } else { - print ''.$langs->trans("Approve").''; - print ''.$langs->trans("ActionRefuseCP").''; + print ''.$langs->trans("Approve").''; + print ''.$langs->trans("ActionRefuseCP").''; } } if (($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || ! empty($user->rights->holiday->write_all)) && ($object->statut == 2 || $object->statut == 3)) // Status validated or approved { if (($object->date_debut > dol_now()) || $user->admin) print ''.$langs->trans("ActionCancelCP").''; - else print ''.$langs->trans("ActionCancelCP").''; + else print ''.$langs->trans("ActionCancelCP").''; } if ($cancreate && $object->statut == Holiday::STATUS_CANCELED) { diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 5e69a01bcaf..2e4ae5da357 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -1091,7 +1091,7 @@ if ($step == 4 && $datatoimport) } else { - print ''.$langs->trans("NextStep").''; + print ''.$langs->trans("NextStep").''; } } @@ -1436,7 +1436,7 @@ if ($step == 5 && $datatoimport) } else { - print ''.$langs->trans("RunSimulateImportFile").''; + print ''.$langs->trans("RunSimulateImportFile").''; } print ''; } @@ -1596,14 +1596,14 @@ if ($step == 5 && $datatoimport) { //print ''; - print ''.$langs->trans("RunImportFile").''; + print ''.$langs->trans("RunImportFile").''; } } else { - print ''.$langs->trans("RunSimulateImportFile").''; + print ''.$langs->trans("RunSimulateImportFile").''; - print ''.$langs->trans("RunImportFile").''; + print ''.$langs->trans("RunImportFile").''; } print ''; } diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index b1852a3de4f..2c1905d9db4 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -96,7 +96,7 @@ if (count($import->array_import_code)) //} //else //{ - // print ''.$langs->trans("NewImport").''; + // print ''.$langs->trans("NewImport").''; //} } print ''; diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php index 0e9b3110a26..017f6a26254 100644 --- a/htdocs/loan/payment/card.php +++ b/htdocs/loan/payment/card.php @@ -289,7 +289,7 @@ if (empty($action) && ! empty($user->rights->loan->delete)) } else { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } } diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php index 9c6c9265592..b1da52ad4aa 100644 --- a/htdocs/modulebuilder/template/myobject_agenda.php +++ b/htdocs/modulebuilder/template/myobject_agenda.php @@ -232,7 +232,7 @@ if ($object->id > 0) } else { - print ''.$langs->trans("AddAction").''; + print ''.$langs->trans("AddAction").''; } } diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php index f9b3db7a99e..75754512c71 100644 --- a/htdocs/modulebuilder/template/myobject_card.php +++ b/htdocs/modulebuilder/template/myobject_card.php @@ -372,7 +372,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } else { - print ''.$langs->trans('Modify').''."\n"; + print ''.$langs->trans('Modify').''."\n"; } // Clone @@ -401,7 +401,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } else { - print ''.$langs->trans('Delete').''."\n"; + print ''.$langs->trans('Delete').''."\n"; } } print ''."\n"; diff --git a/htdocs/product/card.php b/htdocs/product/card.php index f94c34d1804..3e95b3cbb45 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -2037,12 +2037,12 @@ if ($action != 'create' && $action != 'edit') } else { - print '
'.$langs->trans("Delete").'
'; + print '
'.$langs->trans("Delete").'
'; } } else { - print '
'.$langs->trans("Delete").'
'; + print '
'.$langs->trans("Delete").'
'; } } diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php index baa738c20c5..3e4a87fe9f9 100644 --- a/htdocs/product/dynamic_price/editor.php +++ b/htdocs/product/dynamic_price/editor.php @@ -219,7 +219,7 @@ print ' print ''.$langs->trans("Back").''; if ($eid == 0) { - print '
'.$langs->trans('Delete').'
'."\n"; + print '
'.$langs->trans('Delete').'
'."\n"; } else { diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php index 24848ad26c5..eaa2f3dffc2 100644 --- a/htdocs/product/inventory/card.php +++ b/htdocs/product/inventory/card.php @@ -336,7 +336,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } else { - print ''.$langs->trans('Modify').''."\n"; + print ''.$langs->trans('Modify').''."\n"; } if ($permissiontodelete) @@ -345,7 +345,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea } else { - print ''.$langs->trans('Delete').''."\n"; + print ''.$langs->trans('Delete').''."\n"; } } print ''."\n"; diff --git a/htdocs/product/inventory/tpl/inventory.tpl.php b/htdocs/product/inventory/tpl/inventory.tpl.php index 30dc02a17d6..0b89ac8a647 100644 --- a/htdocs/product/inventory/tpl/inventory.tpl.php +++ b/htdocs/product/inventory/tpl/inventory.tpl.php @@ -201,7 +201,7 @@ if (empty($conf) || ! is_object($conf)) - trans('Delete') ?> + trans('Delete') ?> diff --git a/htdocs/product/price.php b/htdocs/product/price.php index b610e2a2914..557892da312 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -1111,7 +1111,7 @@ if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $ if ($object->isVariant()) { if ($user->rights->produit->creer || $user->rights->service->creer) { - print '
'.$langs->trans("UpdateDefaultPrice").'
'; + print '
'.$langs->trans("UpdateDefaultPrice").'
'; } } else { if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) { diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 6977ac28acf..1d9cbd7952f 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -419,12 +419,12 @@ else if ($user->rights->stock->creer) print "id."\">".$langs->trans("Modify").""; else - print "".$langs->trans("Modify").""; + print "".$langs->trans("Modify").""; if ($user->rights->stock->supprimer) print "id."\">".$langs->trans("Delete").""; else - print "".$langs->trans("Delete").""; + print "".$langs->trans("Delete").""; } } diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 852bf2a4e8d..54a4cd564ab 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -767,12 +767,12 @@ if (empty($reshook)) } else { - print '' . $langs->trans("CorrectStock") . ''; + print '' . $langs->trans("CorrectStock") . ''; } } else { - print '' . $langs->trans("CorrectStock") . ''; + print '' . $langs->trans("CorrectStock") . ''; } //if (($user->rights->stock->mouvement->creer) && ! $object->hasbatch()) @@ -783,12 +783,12 @@ if (empty($reshook)) } else { - print '' . $langs->trans("TransferStock") . ''; + print '' . $langs->trans("TransferStock") . ''; } } else { - print '' . $langs->trans("CorrectStock") . ''; + print '' . $langs->trans("CorrectStock") . ''; } print ''; diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 14b4f637718..c9abfd7d4ad 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -1118,7 +1118,7 @@ elseif ($object->id > 0) } else { - print '
'.$langs->trans('Modify').'
'; + print '
'.$langs->trans('Modify').'
'; } } @@ -1131,7 +1131,7 @@ elseif ($object->id > 0) } else { - print '
'.$langs->trans('Validate').'
'; + print '
'.$langs->trans('Validate').'
'; } } @@ -1144,7 +1144,7 @@ elseif ($object->id > 0) } else { - print '
'.$langs->trans('Close').'
'; + print '
'.$langs->trans('Close').'
'; } } @@ -1157,7 +1157,7 @@ elseif ($object->id > 0) } else { - print '
'.$langs->trans('ReOpen').'
'; + print '
'.$langs->trans('ReOpen').'
'; } } @@ -1225,7 +1225,7 @@ elseif ($object->id > 0) } else { - print '
'.$langs->trans('ToClone').'
'; + print '
'.$langs->trans('ToClone').'
'; } } @@ -1238,7 +1238,7 @@ elseif ($object->id > 0) } else { - print '
'.$langs->trans('Delete').'
'; + print '
'.$langs->trans('Delete').'
'; } } } diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php index 92c187ce438..d491e55a080 100644 --- a/htdocs/projet/info.php +++ b/htdocs/projet/info.php @@ -169,7 +169,7 @@ if (! empty($conf->agenda->enabled)) } else { - $morehtmlcenter.=''.$langs->trans("AddAction").''; + $morehtmlcenter.=''.$langs->trans("AddAction").''; } } diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 73ce4a562e4..7b96d2e2ea1 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -333,12 +333,12 @@ if ($id > 0 || ! empty($ref)) } else { - print ''.$langs->trans('AddTask').''; + print ''.$langs->trans('AddTask').''; } } else { - print ''.$langs->trans('AddTask').''; + print ''.$langs->trans('AddTask').''; } print ''; @@ -580,7 +580,7 @@ if ($id > 0 || ! empty($ref)) } else { - print ''.$langs->trans('Modify').''; + print ''.$langs->trans('Modify').''; } // Delete @@ -592,12 +592,12 @@ if ($id > 0 || ! empty($ref)) } else { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } } else { - print ''.$langs->trans('Delete').''; + print ''.$langs->trans('Delete').''; } print ''; diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index f01642016f7..3981731419e 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -2629,7 +2629,7 @@ else else { $langs->load("mails"); - print '
'.$langs->trans('SendMail').'
'; + print '
'.$langs->trans('SendMail').'
'; } if ($user->rights->societe->creer) diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php index 97e6817f5d5..5d8936060ac 100644 --- a/htdocs/societe/project.php +++ b/htdocs/societe/project.php @@ -133,7 +133,7 @@ if ($socid) /* } else { - print ''.$langs->trans("AddProject").''; + print ''.$langs->trans("AddProject").''; } } diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php index 69dc4e33307..a7a2e56ecff 100644 --- a/htdocs/stripe/class/actions_stripe.class.php +++ b/htdocs/stripe/class/actions_stripe.class.php @@ -215,23 +215,23 @@ class ActionsStripeconnect } else { - print ''.$langs->trans("StripeConnectPay").''; + print ''.$langs->trans("StripeConnectPay").''; } } elseif ($resteapayer == 0) { - print ''.$langs->trans("StripeConnectPay").''; + print ''.$langs->trans("StripeConnectPay").''; } } else { - print ''.$langs->trans("StripeConnectPay").''; + print ''.$langs->trans("StripeConnectPay").''; } } elseif (is_object($object) && $object->element == 'invoice_supplier'){ - print ''.$langs->trans("StripeConnectPay").''; + print ''.$langs->trans("StripeConnectPay").''; } elseif (is_object($object) && $object->element == 'member'){ - print ''.$langs->trans("StripeAutoSubscription").''; + print ''.$langs->trans("StripeAutoSubscription").''; } return 0; } diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index b4c2b09f330..b1133616eeb 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -1777,7 +1777,7 @@ if ($action == 'create') ) { if (count($object->lines) > 0) print '
' . $langs->trans('Validate') . '
'; - // else print ''.$langs->trans('Validate').''; + // else print ''.$langs->trans('Validate').''; } // Edit @@ -1796,7 +1796,7 @@ if ($action == 'create') if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance) { print '
' . $langs->trans('SendMail') . '
'; } else - print '
' . $langs->trans('SendMail') . '
'; + print '
' . $langs->trans('SendMail') . '
'; } // Create an order diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index a3d8b119d77..68f01707d58 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -728,7 +728,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd // Link to create an intervention // socid is needed otherwise fichinter ask it and forgot origin after form submit :\ if (!$object->fk_soc && $user->rights->ficheinter->creer) { - print '
' . $langs->trans('TicketAddIntervention') . '
'; + print '
' . $langs->trans('TicketAddIntervention') . '
'; } if ($object->fk_soc > 0 && $object->fk_statut < 8 && $user->rights->ficheinter->creer) { print '
' . $langs->trans('TicketAddIntervention') . '
'; diff --git a/htdocs/user/card.php b/htdocs/user/card.php index e4b9a269daf..a2fab9f41de 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -1726,14 +1726,14 @@ else else { $langs->load("mails"); - print '
'.$langs->trans('SendMail').'
'; + print '
'.$langs->trans('SendMail').'
'; } if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) { if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) { - print '
'.$langs->trans("Modify").'
'; + print '
'.$langs->trans("Modify").'
'; } else { @@ -1751,7 +1751,7 @@ else { if ($object->statut == 0) { - print '
'.$langs->trans("ReinitPassword").'
'; + print '
'.$langs->trans("ReinitPassword").'
'; } elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid && ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) @@ -1761,13 +1761,13 @@ else if ($object->statut == 0) { - print '
'.$langs->trans("SendNewPassword").'
'; + print '
'.$langs->trans("SendNewPassword").'
'; } else if (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid && ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) { if ($object->email) print '
'.$langs->trans("SendNewPassword").'
'; - else print '
'.$langs->trans("SendNewPassword").'
'; + else print '
'.$langs->trans("SendNewPassword").'
'; } } @@ -1793,7 +1793,7 @@ else } else { - print '
'.$langs->trans("DeleteUser").'
'; + print '
'.$langs->trans("DeleteUser").'
'; } } } diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 0c43a12361d..d501a8d3cac 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -387,7 +387,7 @@ else print '
'; if (empty($user->admin) && ! empty($dolibarr_main_demo)) { - print "trans("FeatureDisabledInDemo")."\" href=\"#\">".$langs->trans("Modify").""; + print "trans("FeatureDisabledInDemo")."\" href=\"#\">".$langs->trans("Modify").""; } else { @@ -397,7 +397,7 @@ else } else { - print "trans("NotEnoughPermissions")."\" href=\"#\">".$langs->trans("Modify").""; + print "trans("NotEnoughPermissions")."\" href=\"#\">".$langs->trans("Modify").""; } }