diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index 6358bf353f3..14e1eb90636 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -164,7 +164,7 @@ if ($result) {
// Colonne choix ligne a ventiler
- $checked = ('label' == 'O') ? ' checked=checked' : '';
+ $checked = ('label' == 'O') ? ' checked' : '';
print '
';
print '';
@@ -183,4 +183,4 @@ if ($result) {
}
llxFooter();
-$db->close();
\ No newline at end of file
+$db->close();
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 0a005862054..c1ad179342a 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -221,7 +221,7 @@ if ($resql) {
$row = $db->fetch_row($resql);
print '';
$i ++;
@@ -291,4 +291,4 @@ print "\n";
print '
';
print '';
llxFooter();
-$db->close();
\ No newline at end of file
+$db->close();
diff --git a/htdocs/accountancy/class/html.formventilation.class.php b/htdocs/accountancy/class/html.formventilation.class.php
index f2b6ba6346c..abd66a7885d 100644
--- a/htdocs/accountancy/class/html.formventilation.class.php
+++ b/htdocs/accountancy/class/html.formventilation.class.php
@@ -66,7 +66,7 @@ class FormVentilation extends Form
$selected = '';
if ($selectedkey == $obj->import_key) {
- $selected = ' selected="selected" ';
+ $selected = ' selected ';
}
$out .= '';
@@ -126,8 +126,8 @@ class FormVentilation extends Form
// Remember guy's we store in database llx_facturedet the rowid of accountingaccount and not the account_number
// Because same account_number can be share between different accounting_system and do have the same meaning
if (($selectid != '') && $selectid == $obj->rowid) {
- // $out .= '';
- $out .= '';
+ // $out .= '';
+ $out .= '';
} else {
// $out .= '';
$out .= '';
@@ -184,7 +184,7 @@ class FormVentilation extends Form
$label = $obj->pcg_type;
if (($selectid != '') && $selectid == $obj->pcg_type) {
- $out .= '';
+ $out .= '';
} else {
$out .= '';
}
@@ -240,7 +240,7 @@ class FormVentilation extends Form
$label = $obj->pcg_subtype;
if (($selectid != '') && $selectid == $obj->pcg_subtype) {
- $out .= '';
+ $out .= '';
} else {
$out .= '';
}
diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index a82787bda95..369027b1e14 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -980,18 +980,18 @@ if ($rowid)
print ' | | '.$langs->trans('MoreActions');
print ' | ';
print '';
- print ' '.$langs->trans("None").' ';
+ print ' '.$langs->trans("None").' ';
// Add entry into bank accoun
if (! empty($conf->banque->enabled))
{
- print ' '.$langs->trans("MoreActionBankDirect").' ';
}
// Add invoice with no payments
if (! empty($conf->societe->enabled) && ! empty($conf->facture->enabled))
{
- print 'fk_soc)) print ' disabled="disabled"';
+ print 'fk_soc)) print ' disabled';
print '> '.$langs->trans("MoreActionInvoiceOnly");
if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
else
@@ -1015,8 +1015,8 @@ if ($rowid)
// Add invoice with payments
if (! empty($conf->banque->enabled) && ! empty($conf->societe->enabled) && ! empty($conf->facture->enabled))
{
- print 'fk_soc)) print ' disabled="disabled"';
+ print 'fk_soc)) print ' disabled';
print '> '.$langs->trans("MoreActionBankViaInvoice");
if ($object->fk_soc) print ' ('.$langs->trans("ThirdParty").': '.$company->getNomUrl(1).')';
else
@@ -1087,7 +1087,7 @@ if ($rowid)
$subjecttosend=$object->makeSubstitution($conf->global->ADHERENT_MAIL_COTIS_SUBJECT);
$texttosend=$object->makeSubstitution($adht->getMailOnSubscription());
- $tmp='global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?' checked="checked"':'')).'>';
+ $tmp='global->ADHERENT_DEFAULT_SENDINFOBYMAIL)?' checked':'')).'>';
$helpcontent='';
$helpcontent.=''.$langs->trans("MailFrom").': '.$conf->global->ADHERENT_MAIL_FROM.' '."\n";
$helpcontent.=''.$langs->trans("MailRecipient").': '.$object->email.' '."\n";
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 3f952bae511..5da5fa621c6 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -178,7 +178,7 @@ if (! empty($triggers))
print ' | ';
$key='MAIN_AGENDA_ACTIONAUTO_'.$trigger['code'];
$value=$conf->global->$key;
- print '';
+ print '';
print ' |
'."\n";
}
}
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/events.php b/htdocs/admin/events.php
index fe109e81bbe..ed2a70f1b58 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -104,7 +104,7 @@ foreach ($eventstolog as $key => $arr)
print '';
$key='MAIN_LOGEVENTS_'.$arr['id'];
$value=$conf->global->$key;
- print '';
+ print '';
print ' | '."\n";
}
}
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 2dca4821727..e993d2c276c 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -670,7 +670,7 @@ if (! empty($conf->banque->enabled))
$row = $db->fetch_row($resql);
print '';
$i++;
@@ -694,7 +694,7 @@ print "".$langs->trans("SuggestPaymentByChequeToAddress")." | ";
print "";
print ' | ';
@@ -1108,13 +1108,13 @@ else
print '';
if ($object->status_buy)
{
- print ''.$langs->trans("ProductStatusOnBuy").'';
+ print ''.$langs->trans("ProductStatusOnBuy").'';
print ''.$langs->trans("ProductStatusNotOnBuy").'';
}
else
{
print ''.$langs->trans("ProductStatusOnBuy").'';
- print ''.$langs->trans("ProductStatusNotOnBuy").'';
+ print ''.$langs->trans("ProductStatusNotOnBuy").'';
}
print '';
print '';
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 4e2da460a74..6fc649c272e 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -121,12 +121,12 @@ class FormProduct
$this->loadWarehouses($fk_product);
$nbofwarehouses=count($this->cache_warehouses);
- $out='';
+ $out='';
if ($empty) $out.=''.($empty_label?$empty_label:' ').'';
foreach($this->cache_warehouses as $id => $arraytypes)
{
$out.='';
$out.=$arraytypes['label'];
if ($fk_product) $out.=' ('.$langs->trans("Stock").': '.($arraytypes['stock']>0?$arraytypes['stock']:'?').')';
@@ -184,7 +184,7 @@ class FormProduct
$return.= ''.$value.'';
$return.= '>'.measuring_units_string($key,$measuring_style).'';
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index fd6bdc2de0f..f1c740523f3 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -367,7 +367,7 @@ if ($id > 0 || ! empty($ref))
if ($user->rights->produit->creer || $user->rights->service->creer)
{
print ' | ';
- print ' | ';
+ print ' | ';
}
else{
@@ -536,7 +536,7 @@ if ($id > 0 || ! empty($ref))
if($object->is_sousproduit($id, $objp->rowid))
{
- //$addchecked = ' checked="checked"';
+ //$addchecked = ' checked';
$qty=$object->is_sousproduit_qty;
$incdec=$object->is_sousproduit_incdec;
}
@@ -554,12 +554,12 @@ if ($id > 0 || ! empty($ref))
// Inc Dec
print '';
- if ($qty) print '';
+ if ($qty) print '';
else
{
// TODO Hide field and show it when setting a qty
- print '';
- //print '';
+ print '';
+ //print '';
}
print ' | ';
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 8f05cb92697..797af35248e 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -284,7 +284,7 @@ if ($object->id)
print '' . $value . '';
}
} else if ($delauft_lang == $key) {
- print '' . $value . '';
+ print '' . $value . '';
} else {
print '' . $value . '';
}
@@ -315,11 +315,11 @@ if ($object->id)
if ($conf->global->MAIN_MULTILANGS) {
if (array_key_exists($filetoadd['name'] . '_' . $delauft_lang, $filetomerge->lines)) {
$filename = $filetoadd['name'] . ' - ' . $langs->trans('Language_' . $delauft_lang);
- $checked = ' checked="checked" ';
+ $checked = ' checked ';
}
} else {
if (array_key_exists($filetoadd['name'], $filetomerge->lines)) {
- $checked = ' checked="checked" ';
+ $checked = ' checked ';
}
}
@@ -347,4 +347,4 @@ else
llxFooter();
-$db->close();
\ No newline at end of file
+$db->close();
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index be38eda6b2d..4a93741e4e7 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -224,7 +224,7 @@ if ($resql)
$moreforfilter.=$htmlother->select_categories(0,$search_categ,'search_categ');
$moreforfilter.=' ';
}
- $moreforfilter.=$langs->trans("StockTooLow").' ';
+ $moreforfilter.=$langs->trans("StockTooLow").' ';
if ($moreforfilter)
{
print '';
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 451e4302f05..3caeadacef5 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -236,7 +236,7 @@ if ($resql)
$moreforfilter.=$htmlother->select_categories(0,$search_categ,'search_categ');
$moreforfilter.=' ';
}
- //$moreforfilter.=$langs->trans("StockTooLow").' ';
+ //$moreforfilter.=$langs->trans("StockTooLow").' ';
if ($moreforfilter)
{
print '
';
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 37f39010659..538a46cea90 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -218,7 +218,7 @@ if ($action == 'create')
print '
| '.$langs->trans("Status").' | ';
print '';
print ''.$langs->trans("WarehouseClosed").'';
- print ''.$langs->trans("WarehouseOpened").'';
+ print ''.$langs->trans("WarehouseOpened").'';
print '';
print ' |
';
@@ -552,8 +552,8 @@ else
print '| '.$langs->trans("Status").' | ';
print '';
- print 'statut == 0?'selected="selected"':'').'>'.$langs->trans("WarehouseClosed").'';
- print 'statut == 0?'':'selected="selected"').'>'.$langs->trans("WarehouseOpened").'';
+ print 'statut == 0?'selected':'').'>'.$langs->trans("WarehouseClosed").'';
+ print 'statut == 0?'':'selected').'>'.$langs->trans("WarehouseOpened").'';
print '';
print ' |
';
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index dc12f7d9042..08da8fbcf6f 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -332,7 +332,7 @@ if ($usevirtualstock)
{
$sql.= ' AND (p.seuil_stock_alerte > 0 AND (p.seuil_stock_alerte > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
$sql.= ' - ('.$sqlCommandesCli.' - '.$sqlExpeditionsCli.') + ('.$sqlCommandesFourn.' - '.$sqlReceptionFourn.')))';
- $alertchecked = 'checked="checked"';
+ $alertchecked = 'checked';
}
} else {
$sql.= ' HAVING ((p.desiredstock > 0 AND (p.desiredstock > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
@@ -341,7 +341,7 @@ if ($usevirtualstock)
if ($salert == 'on') // Option to see when stock is lower than alert
{
$sql.= ' AND (p.seuil_stock_alerte > 0 AND (p.seuil_stock_alerte > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
- $alertchecked = 'checked="checked"';
+ $alertchecked = 'checked';
}
}
@@ -542,7 +542,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
if ($stockforcompare >= $objp->desiredstock)
{
$picto = img_picto('', './img/yes', '', 1);
- $disabled = 'disabled="disabled"';
+ $disabled = 'disabled';
}
else {
$picto = img_picto('', './img/no', '', 1);
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index 6325939a01e..556e924b07d 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -71,7 +71,7 @@
{
print '';
print '| '.$langs->trans("batch_number").' | ';
- print ' 0 ? ' disabled="true"':'').' value="'.(GETPOST('batch_number')?GETPOST('batch_number'):$pdluo->batch).'">'; // If form was opened for a specific pdluoid, field is disabled
+ print ' 0 ? ' disabled':'').' value="'.(GETPOST('batch_number')?GETPOST('batch_number'):$pdluo->batch).'">'; // If form was opened for a specific pdluoid, field is disabled
print ' | ';
print '
';
print '| '.$langs->trans("l_eatby").' | ';
@@ -104,4 +104,4 @@
print '';
?>
-
\ No newline at end of file
+
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 0a6c1ae5d2d..f8f9daf8de9 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -277,7 +277,7 @@ print "";
dol_fiche_end();
print ' ';
-print '';
+print '';
print ' ';
print '';
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 11662545326..3c4884e2bbf 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -598,7 +598,7 @@ else
print ' |
| '.$langs->trans("DateStart").' | ';
print $form->select_date($object->date_start?$object->date_start:-1,'projectstart');
print ' '. $langs->trans("ProjectReportDate");
print ' |
';
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index acfd5d81566..0dbcc007db1 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -378,7 +378,7 @@ if ($id > 0 || ! empty($ref))
$formcompany->selectTypeContact($object, '', 'type','external','rowid');
print '';
print ' | ';
print '';
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index dba28538780..956bcac8b75 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -383,8 +383,8 @@ foreach ($demoprofiles as $profilearray)
$modulo=($j % $nbcolsmod);
if ($modulo == 0) print '';
print '| '.$val->getName().' ';
print '';
print ' | ';
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 8fb06cd783e..2168c295e44 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -583,7 +583,7 @@ if (! empty($conf->global->MEMBER_NEWFORM_AMOUNT)
}
else
{
- print '';
+ print '';
print '';
}
print ' '.$langs->trans("Currency".$conf->currency);
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index f7c0e31ef43..1d2d6d2d1e6 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -474,7 +474,7 @@ while ($compteur < $num)
if (empty($listofanswers[$i]['format']) || ! in_array($listofanswers[$i]['format'],array('yesno','foragainst')))
{
print '';
}
if (! empty($listofanswers[$i]['format']) && $listofanswers[$i]['format'] == 'yesno')
@@ -576,7 +576,7 @@ if ($ligneamodifier < 0 && (! isset($_SESSION['nom'])))
print '';
}
diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index ca01963e30b..4128de6fead 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -111,7 +111,7 @@ class FormResource
if ($selected > 0 && $selected == $resourcestat->lines[$i]->id)
{
- $out.= ''.$label.'';
+ $out.= ''.$label.'';
}
else
{
@@ -183,8 +183,8 @@ class FormResource
if ($format == 2) print '';
if ($format == 0) $value=($maxlength?dol_trunc($arraytypes['label'],$maxlength):$arraytypes['label']);
if ($format == 1) $value=$arraytypes['code'];
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index c5389c73452..f1472dcb2d7 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -437,10 +437,10 @@ abstract class ActionsCardCommon
// TODO create a function
$this->tpl['select_customertype'] = '';
- $this->tpl['select_customertype'].= 'object->client==2?' selected="selected"':'').'>'.$langs->trans('Prospect').'';
- $this->tpl['select_customertype'].= 'object->client==3?' selected="selected"':'').'>'.$langs->trans('ProspectCustomer').'';
- $this->tpl['select_customertype'].= 'object->client==1?' selected="selected"':'').'>'.$langs->trans('Customer').'';
- $this->tpl['select_customertype'].= 'object->client==0?' selected="selected"':'').'>'.$langs->trans('NorProspectNorCustomer').'';
+ $this->tpl['select_customertype'].= 'object->client==2?' selected':'').'>'.$langs->trans('Prospect').'';
+ $this->tpl['select_customertype'].= 'object->client==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'';
+ $this->tpl['select_customertype'].= 'object->client==1?' selected':'').'>'.$langs->trans('Customer').'';
+ $this->tpl['select_customertype'].= 'object->client==0?' selected':'').'>'.$langs->trans('NorProspectNorCustomer').'';
$this->tpl['select_customertype'].= '';
// Customer
diff --git a/htdocs/societe/canvas/company/tpl/card_create.tpl.php b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
index 24fd6ce07e8..f6b4bfeeb96 100644
--- a/htdocs/societe/canvas/company/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
@@ -28,7 +28,7 @@
control->tpl['ajax_selecttype']; ?>
trans("ThirdPartyType") ?>:
-
+
trans("Company/Fundation"); ?>
trans("Individual"); ?> (trans("ToCreateContactWithSameName") ?>)
@@ -202,4 +202,4 @@ for ($i=1; $i<=4; $i++) {
-
\ No newline at end of file
+
diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
index ee93f5c940b..b30adb43825 100644
--- a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
@@ -30,7 +30,7 @@
trans("ThirdPartyType") ?>:
trans("Company/Fundation"); ?>
- trans("Individual"); ?> (trans("ToCreateContactWithSameName") ?>)
+ trans("Individual"); ?> (trans("ToCreateContactWithSameName") ?>)
control->tpl['ajax_selectcountry']; ?>
@@ -177,4 +177,4 @@
-
\ No newline at end of file
+
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index ab52249166a..00345c87566 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -895,13 +895,13 @@ else
print $langs->trans("ThirdPartyType").': ';
print '';
print '';
- print '';
+ print '';
print ' ';
print $langs->trans("Company/Fundation");
print '';
print ' ';
print '';
- $text ='';
+ $text ='';
$text.=' ';
$text.= $langs->trans("Individual");
$htmltext=$langs->trans("ToCreateContactWithSameName");
@@ -961,10 +961,10 @@ else
print '| '.$langs->trans('ProspectCustomer').' | ';
print '';
$selected=isset($_POST['client'])?GETPOST('client'):$object->client;
- if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print ''.$langs->trans('Prospect').'';
- if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print ''.$langs->trans('ProspectCustomer').'';
- if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print ''.$langs->trans('Customer').'';
- print ''.$langs->trans('NorProspectNorCustomer').'';
+ if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print ''.$langs->trans('Prospect').'';
+ if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print ''.$langs->trans('ProspectCustomer').'';
+ if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print ''.$langs->trans('Customer').'';
+ print ''.$langs->trans('NorProspectNorCustomer').'';
print ' | ';
print ''.$langs->trans('CustomerCode').' | ';
@@ -1435,10 +1435,10 @@ else
// Prospect/Customer
print ' |
| '.$langs->trans('ProspectCustomer').' | ';
print '';
- if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print 'client==2?' selected="selected"':'').'>'.$langs->trans('Prospect').'';
- if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print 'client==3?' selected="selected"':'').'>'.$langs->trans('ProspectCustomer').'';
- if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print 'client==1?' selected="selected"':'').'>'.$langs->trans('Customer').'';
- print 'client==0?' selected="selected"':'').'>'.$langs->trans('NorProspectNorCustomer').'';
+ if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print 'client==2?' selected':'').'>'.$langs->trans('Prospect').'';
+ if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print 'client==3?' selected':'').'>'.$langs->trans('ProspectCustomer').'';
+ if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print 'client==1?' selected':'').'>'.$langs->trans('Customer').'';
+ print 'client==0?' selected':'').'>'.$langs->trans('NorProspectNorCustomer').'';
print ' | ';
print ''.$langs->trans('CustomerCode').' | ';
diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php
index e44954be545..b3484a7c008 100644
--- a/htdocs/societe/societe.php
+++ b/htdocs/societe/societe.php
@@ -380,12 +380,12 @@ if ($resql)
// Type (customer/prospect/supplier)
print ' | ';
print '';
- print ' ';
- if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print ''.$langs->trans('Customer').'';
- if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print ''.$langs->trans('Prospect').'';
- //if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print ''.$langs->trans('ProspectCustomer').'';
- print ''.$langs->trans('Supplier').'';
- print ''.$langs->trans('Others').'';
+ print ' ';
+ if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print ''.$langs->trans('Customer').'';
+ if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print ''.$langs->trans('Prospect').'';
+ //if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print ''.$langs->trans('ProspectCustomer').'';
+ print ''.$langs->trans('Supplier').'';
+ print ''.$langs->trans('Others').'';
print ' | ';
// Status
print '';
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index a1c371770ad..0320f44916e 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -699,7 +699,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print $form->selectarray('users', $liste, '', 1);
}
print ' | ';
- print '';
+ print '';
print ' |
';
print '';
@@ -1351,7 +1351,7 @@ else
{
print '| '.$langs->trans("ColorUser").' | ';
print '';
- if ($object->color) print '';
+ if ($object->color) print '';
print ' | ';
print "
\n";
}
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 860e74c5567..4f8259bc007 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -179,7 +179,7 @@ if ($action == 'edit')
print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
print '';
print 'conf->MAIN_LANG_DEFAULT)?" checked":"");
- print empty($dolibarr_main_demo)?'':' disabled="disabled"'; // Disabled for demo
+ print empty($dolibarr_main_demo)?'':' disabled'; // Disabled for demo
print '> '.$langs->trans("UsePersonalValue").' | ';
print '';
print $formadmin->select_language((! empty($fuser->conf->MAIN_LANG_DEFAULT)?$fuser->conf->MAIN_LANG_DEFAULT:''),'main_lang_default',1,null,0,0,(! empty($dolibarr_main_demo)));
@@ -190,7 +190,7 @@ if ($action == 'edit')
print ' | | '.$langs->trans("MaxSizeList").' | ';
print ''.$conf->global->MAIN_SIZE_LISTE_LIMIT.' | ';
print 'conf->MAIN_SIZE_LISTE_LIMIT)?" checked":"");
- print empty($dolibarr_main_demo)?'':' disabled="disabled"'; // Disabled for demo
+ print empty($dolibarr_main_demo)?'':' disabled'; // Disabled for demo
print '> '.$langs->trans("UsePersonalValue").' | ';
print ' |
';