diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index ea2ce80d6ca..b8f71055b3b 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -878,15 +878,15 @@ if ($rowid) print ''.$langs->trans('MoreActions'); print ''; print ''; - print ' '.$langs->trans("None").'
'; + print ' '.$langs->trans("None").'
'; if ($conf->banque->enabled) { - print ' '.$langs->trans("MoreActionBankDirect").'
'; } if ($conf->banque->enabled && $conf->societe->enabled && $conf->facture->enabled) { - print 'fk_soc) || empty($bankviainvoice)) print ' disabled="true"'; print '> '.$langs->trans("MoreActionBankViaInvoice"); if ($adh->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')'; @@ -901,7 +901,7 @@ if ($rowid) } if ($conf->societe->enabled && $conf->facture->enabled) { - print 'fk_soc) || empty($bankviainvoice)) print ' disabled="true"'; print '> '.$langs->trans("MoreActionInvoiceOnly"); if ($adh->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')'; @@ -964,7 +964,7 @@ if ($rowid) $subjecttosend=$adh->makeSubstitution($conf->global->ADHERENT_MAIL_COTIS_SUBJECT); $texttosend=$adh->makeSubstitution($adht->getMailOnSubscription()); - $tmp='global->ADHERENT_DEFAULT_SENDINFOBYMAIL?' checked="true"':'').'>'; + $tmp='global->ADHERENT_DEFAULT_SENDINFOBYMAIL?' checked="checked"':'').'>'; $helpcontent=''; $helpcontent.=''.$langs->trans("MailFrom").': '.$conf->global->ADHERENT_MAIL_FROM.'
'."\n"; $helpcontent.=''.$langs->trans("MailRecipient").': '.$adh->email.'
'."\n"; diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 87378035b70..ca45390ea42 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -715,7 +715,7 @@ if ($id) print ''.$langs->trans("Title").''; // Full day event - print ''.$langs->trans("EventOnFullDay").'fulldayevent?' checked="true"':'').'>'; + print ''.$langs->trans("EventOnFullDay").'fulldayevent?' checked="checked"':'').'>'; // Date start print ''.$langs->trans("DateActionStart").''; diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index a68e3541cbf..28aa4a1439e 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -293,7 +293,7 @@ if ($_GET["action"] == 'create') if ($conf->global->PRODUCT_SHOW_WHEN_CREATE) print ' '; - print ''; + print ''; print ''.$langs->trans("CreateEmptyPropal").''; } diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 7f9b035687b..a3fd3eddec4 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1578,7 +1578,7 @@ if ($action == 'create') // Standard invoice print ''; - print ''; + print ''; print ''; $desc=$html->textwithpicto($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1); print $desc; @@ -1586,7 +1586,7 @@ if ($action == 'create') // Deposit print ''; - print ''; + print ''; print ''; $desc=$html->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1); print $desc; @@ -1596,7 +1596,7 @@ if ($action == 'create') if ($conf->global->FACTURE_USE_PROFORMAT) { print ''; - print ''; + print ''; print ''; $desc=$html->textwithpicto($langs->trans("InvoiceProForma"),$langs->transnoentities("InvoiceProFormaDesc"),1); print $desc; @@ -1605,7 +1605,7 @@ if ($action == 'create') // Replacement print ''; - print ''; print ''; diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index de87c4e27f1..04e5218568e 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -412,7 +412,7 @@ if ($action == 'new') print ''.$value["banque"]."\n"; print ''.price($value["amount"]).''; print ''; - print ''; + print ''; print '' ; print ''; diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 339addbaddd..7de2f333936 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -138,7 +138,7 @@ if ($_GET["action"] == 'edit') print ''.$langs->trans("Alert").': '; if ($contact->birthday_alert) { - print ''; + print ''; } else { diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index c3ec8400510..5a709158e83 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -827,7 +827,7 @@ class Form { $out.= ''; if ($show_empty) $out.= ''."\n"; - + while ($i < $num) { $obj = $this->db->fetch_object($resql); diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index ae576c16726..4c8f0238178 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -968,7 +968,7 @@ if ($_GET['action'] == 'create') // Standard invoice print ''; - print ''; + print ''; print ''; $desc=$html->textwithpicto($langs->trans("InvoiceStandardAsk"),$langs->transnoentities("InvoiceStandardDesc"),1); print $desc; @@ -977,7 +977,7 @@ if ($_GET['action'] == 'create') /* // Deposit print ''; - print ''; + print ''; print ''; $desc=$html->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1); print $desc; @@ -987,7 +987,7 @@ if ($_GET['action'] == 'create') if ($conf->global->FACTURE_USE_PROFORMAT) { print ''; - print ''; + print ''; print ''; $desc=$html->textwithpicto($langs->trans("InvoiceProForma"),$langs->transnoentities("InvoiceProFormaDesc"),1); print $desc; @@ -996,7 +996,7 @@ if ($_GET['action'] == 'create') // Replacement print ''; - print ''; print ''; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index a97a8573cf2..af9c2600519 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -1182,7 +1182,7 @@ if ($step == 5 && $datatoimport) print $langs->trans("Option"); print ''; print ''; print ' '.$langs->trans("DoNotImportFirstLine"); print ''; @@ -1532,7 +1532,7 @@ if ($step == 6 && $datatoimport) print $langs->trans("Option"); print ''; print ''; print ' '.$langs->trans("DoNotImportFirstLine"); print ''; diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php index 7a94864953a..b16e94d669c 100644 --- a/htdocs/product/composition/fiche.php +++ b/htdocs/product/composition/fiche.php @@ -201,7 +201,7 @@ if ($id || $ref) // Number of subproducts $prodsfather = $product->getFather(); //Parent Products - $product->get_sousproduits_arbo (); + $product->get_sousproduits_arbo (); print ''.$langs->trans("AssociatedProductsNumber").''.sizeof($product->get_arbo_each_prod()).''; dol_fiche_end(); @@ -232,10 +232,10 @@ if ($id || $ref) print ''; print ''; } - + // Number of parent products print ''.$langs->trans("ParentProductsNumber").''.sizeof($prodsfather).''; - + if(sizeof($prodsfather) > 0) { print ''; @@ -317,10 +317,10 @@ if ($id || $ref) print ''; print ''; } - + // Number of parent products print ''.$langs->trans("ParentProductsNumber").''.sizeof($prodsfather).''; - + if(sizeof($prodsfather) > 0) { print ''; @@ -435,7 +435,7 @@ if ($id || $ref) print ''.$labeltoshow.''; if($product->is_sousproduit($id, $objp->rowid)) { - $addchecked = ' checked="true"'; + $addchecked = ' checked="checked"'; $qty=$product->is_sousproduit_qty; } else diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index 2dd63e04e99..3d19b0a1dea 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -250,7 +250,7 @@ foreach ($demoprofiles as $profilarray) print ''; print 'Demo '.$profilarray['label'].''; //print ''; print ''.$langs->trans($profilarray['label']).''."\n"; @@ -274,7 +274,7 @@ foreach ($demoprofiles as $profilarray) if ($modulo == 0) print ''; print ''.$val->getName().'  '; print ''; print ''; diff --git a/htdocs/societe/canvas/default/tpl/card_create.tpl.php b/htdocs/societe/canvas/default/tpl/card_create.tpl.php index 36a9f8e1b8c..2ec271b7d72 100644 --- a/htdocs/societe/canvas/default/tpl/card_create.tpl.php +++ b/htdocs/societe/canvas/default/tpl/card_create.tpl.php @@ -29,9 +29,9 @@ dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors'] control->tpl['ajax_selecttype']; ?>
trans("ThirdPartyType") ?>:   -> +> trans("Company/Fundation"); ?>     -> trans("Individual"); ?> (trans("ToCreateContactWithSameName") ?>) +> trans("Individual"); ?> (trans("ToCreateContactWithSameName") ?>)

control->tpl['ajax_selectcountry']; ?> diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php index 5d5cdbf5792..69e420cf996 100644 --- a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php +++ b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php @@ -29,9 +29,9 @@ dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors'] control->tpl['ajax_selecttype']; ?>
trans("ThirdPartyType") ?>:   -> +> trans("Company/Fundation"); ?>     -> trans("Individual"); ?> (trans("ToCreateContactWithSameName") ?>) +> trans("Individual"); ?> (trans("ToCreateContactWithSameName") ?>)

control->tpl['ajax_selectcountry']; ?> diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 4ca20be2acf..12277db42a3 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -700,10 +700,10 @@ else print "
\n"; print $langs->trans("ThirdPartyType").':   '; - print ' '.$langs->trans("Company/Fundation"); print '     '; - print ' '.$langs->trans("Individual"); print ' ('.$langs->trans("ToCreateContactWithSameName").')'; print "
\n";