diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index a53c2150989..369027b1e14 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -991,7 +991,7 @@ if ($rowid) if (! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) { print 'fk_soc)) print ' disabled="disabled"'; + //if (empty($object->fk_soc)) print ' disabled'; print '> '.$langs->trans("MoreActionInvoiceOnly"); if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')'; else @@ -1016,7 +1016,7 @@ if ($rowid) if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled)) { print 'fk_soc)) print ' disabled="disabled"'; + //if (empty($object->fk_soc)) print ' disabled'; print '> '.$langs->trans("MoreActionBankViaInvoice"); if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')'; else diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 6ec43d4b7b4..18c63a48798 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -375,7 +375,7 @@ foreach($boxtoadd as $box) print ''."\n"; print '
'; -print ''; +print ''; print '
'."\n"; print ''; print "\n".''."\n"; diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index 3bceffeacfc..ad83def9ce8 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -183,10 +183,10 @@ if ($action == 'edit') $var=!$var; print ''.$langs->trans("DefaultMenuManager").''; print ''; - $formadmin->select_menu(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED, 'MAIN_MENU_STANDARD', $dirstandard, empty($conf->global->MAIN_MENU_STANDARD_FORCED)?'':' disabled="disabled"'); + $formadmin->select_menu(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED, 'MAIN_MENU_STANDARD', $dirstandard, empty($conf->global->MAIN_MENU_STANDARD_FORCED)?'':' disabled'); print ''; print ''; - $formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?$conf->global->MAIN_MENUFRONT_STANDARD:$conf->global->MAIN_MENUFRONT_STANDARD_FORCED, 'MAIN_MENUFRONT_STANDARD', $dirstandard, empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?'':' disabled="disabled"'); + $formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?$conf->global->MAIN_MENUFRONT_STANDARD:$conf->global->MAIN_MENUFRONT_STANDARD_FORCED, 'MAIN_MENUFRONT_STANDARD', $dirstandard, empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?'':' disabled'); print ''; print ''; @@ -194,10 +194,10 @@ if ($action == 'edit') $var=!$var; print ''.$langs->trans("DefaultMenuSmartphoneManager").''; print ''; - $formadmin->select_menu(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED, 'MAIN_MENU_SMARTPHONE', array_merge($dirstandard,$dirsmartphone), empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?'':' disabled="disabled"'); + $formadmin->select_menu(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED, 'MAIN_MENU_SMARTPHONE', array_merge($dirstandard,$dirsmartphone), empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?'':' disabled'); print ''; print ''; - $formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$conf->global->MAIN_MENUFRONT_SMARTPHONE:$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED, 'MAIN_MENUFRONT_SMARTPHONE', array_merge($dirstandard,$dirsmartphone), empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?'':' disabled="disabled"'); + $formadmin->select_menu(empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$conf->global->MAIN_MENUFRONT_SMARTPHONE:$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED, 'MAIN_MENUFRONT_SMARTPHONE', array_merge($dirstandard,$dirsmartphone), empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?'':' disabled'); print ''; print ''; diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index 682b1e456eb..44bab100730 100644 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -204,7 +204,7 @@ if ($action == 'edit') print ''; print '
'; - print ''; + print ''; print '     '; print ''; print '
'; diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index 49df241e957..0f6560ad055 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -122,7 +122,7 @@ $disabled=''; if (! empty($conf->productbatch->enabled)) { $langs->load("productbatch"); - $disabled=' disabled="disabled"'; + $disabled=' disabled'; print info_admin($langs->trans("WhenProductBatchModuleOnOptionAreForced")); } diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index 9ee2898e51d..3eebfebb37b 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -161,7 +161,7 @@ if (! $defaultsyslogfile) $defaultsyslogfile='dolibarr.log'; if ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->entity) { print '
'.$langs->trans("ContactSuperAdminForChange").'
'; - $option = 'disabled="disabled"'; + $option = 'disabled'; } @@ -192,7 +192,7 @@ foreach ($syslogModules as $moduleName) $var=!$var; print ''; print ''; - print ' '; + print ' '; print $module->getName(); print ''; diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index 3d281c551c1..7cd98625ac9 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -265,7 +265,7 @@ print ''; for="checkbox_hexforbinary"> trans("EncodeBinariesInHexa"); ?>