diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 1ff84f9ed29..dbc56bc6394 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -692,7 +692,7 @@ if ($action == 'edit') // Physique-Moral $morphys["phy"] = $langs->trans("Physical"); $morphys["mor"] = $langs->trans("Morale"); - print "".$langs->trans("Person").'*'; + print ''.$langs->trans("Person").''; $html->select_array("morphy", $morphys, $adh->morphy); print ""; @@ -700,7 +700,7 @@ if ($action == 'edit') print ''.$langs->trans("Company").''; // Nom - print ''.$langs->trans("Lastname").'*'; + print ''.$langs->trans("Lastname").''; // Photo print ''; @@ -716,17 +716,17 @@ if ($action == 'edit') print ''; // Prenom - print ''.$langs->trans("Firstname").'*'; + print ''.$langs->trans("Firstname").''; print ''; // Login - print ''.$langs->trans("Login").'*'; + print ''.$langs->trans("Login").''; // Password - print ''.$langs->trans("Password").'*'; + print ''.$langs->trans("Password").''; // Type - print ''.$langs->trans("Type").'*'; + print ''.$langs->trans("Type").''; if ($user->rights->adherent->creer) { $html->select_array("typeid", $adht->liste_array(), $adh->typeid); @@ -760,7 +760,7 @@ if ($action == 'edit') print ''.$langs->trans("PhoneMobile").''; // EMail - print ''.$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'*':'').''; + print ''.($conf->global->ADHERENT_MAIL_REQUIRED?'':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'':'').''; // Date naissance print "".$langs->trans("Birthday")."\n"; @@ -844,7 +844,7 @@ if ($action == 'create') // Moral-Physique $morphys["phy"] = "Physique"; $morphys["mor"] = "Morale"; - print "".$langs->trans("Person")."*\n"; + print ''.$langs->trans("Person")."\n"; $html->select_array("morphy", $morphys, $adh->morphy, 1); print "\n"; @@ -852,15 +852,15 @@ if ($action == 'create') print ''.$langs->trans("Company").''; // Nom - print ''.$langs->trans("Lastname").'*'; + print ''.$langs->trans("Lastname").''; print ''; // Prenom - print ''.$langs->trans("Firstname").'*'; + print ''.$langs->trans("Firstname").''; print ''; // Login - print ''.$langs->trans("Login").'*'; + print ''.$langs->trans("Login").''; // Mot de passe $generated_password=''; @@ -873,12 +873,12 @@ if ($action == 'create') $genhandler=new $nomclass($db,$conf,$langs,$user); $generated_password=$genhandler->getNewGeneratedPassword(); } - print ''.$langs->trans("Password").'*'; + print ''.$langs->trans("Password").''; print ''; print ''; // Type - print ''.$langs->trans("MemberType").'*'; + print ''.$langs->trans("MemberType").''; $listetype=$adht->liste_array(); if (sizeof($listetype)) { @@ -888,7 +888,7 @@ if ($action == 'create') } print "\n"; - // Adresse + // Address print ''.$langs->trans("Address").''; print ''; @@ -910,7 +910,7 @@ if ($action == 'create') print ''.$langs->trans("PhoneMobile").''; // EMail - print ''.$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'*':'').''; + print ''.($conf->global->ADHERENT_MAIL_REQUIRED?'':'').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED?'':'').''; // Date naissance print "".$langs->trans("Birthday")."\n"; diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index d2dfa7338c3..03be6951ccc 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -112,7 +112,7 @@ print "\n"; // DN Pour les contacts $var=!$var; -print ''.$langs->trans("LDAPContactDn").picto_required().''; +print ''.$langs->trans("LDAPContactDn").''; print ''; print ''.$langs->trans("LDAPContactDnExample").''; print ' '; @@ -120,7 +120,7 @@ print ''; // List of object class used to define attributes in structure $var=!$var; -print ''.$langs->trans("LDAPContactObjectClassList").picto_required().''; +print ''.$langs->trans("LDAPContactObjectClassList").''; print ''; print ''.$langs->trans("LDAPContactObjectClassListExample").''; print ' '; diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index 6415b449564..d3ef9c12a4f 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -104,7 +104,7 @@ print "\n"; // DN pour les groupes $var=!$var; -print ''.$langs->trans("LDAPGroupDn").picto_required().''; +print ''.$langs->trans("LDAPGroupDn").''; print ''; print ''.$langs->trans("LDAPGroupDnExample").''; print ' '; @@ -112,7 +112,7 @@ print ''; // List of object class used to define attributes in structure $var=!$var; -print ''.$langs->trans("LDAPGroupObjectClassList").picto_required().''; +print ''.$langs->trans("LDAPGroupObjectClassList").''; print ''; print ''.$langs->trans("LDAPGroupObjectClassListExample").''; print ' '; @@ -132,7 +132,7 @@ print "\n"; // Filtre /* $var=!$var; -print ''.$langs->trans("LDAPFilterConnection").picto_required().''; +print ''.$langs->trans("LDAPFilterConnection").''; print ''; print ''.$langs->trans("LDAPFilterConnectionExample").''; print ''; diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index 6f41480e583..32e42609a30 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -127,7 +127,7 @@ print "\n"; // DN Pour les adherents $var=!$var; -print ''.$langs->trans("LDAPMemberDn").picto_required().''; +print ''.$langs->trans("LDAPMemberDn").''; print ''; print ''.$langs->trans("LDAPMemberDnExample").''; print ' '; @@ -135,7 +135,7 @@ print ''; // List of object class used to define attributes in structure $var=!$var; -print ''.$langs->trans("LDAPMemberObjectClassList").picto_required().''; +print ''.$langs->trans("LDAPMemberObjectClassList").''; print ''; print ''.$langs->trans("LDAPMemberObjectClassListExample").''; print ' '; @@ -155,7 +155,7 @@ print "\n"; // Filtre /* $var=!$var; -print ''.$langs->trans("LDAPFilterConnection").picto_required().''; +print ''.$langs->trans("LDAPFilterConnection").''; print ''; print ''.$langs->trans("LDAPFilterConnectionExample").''; print ''; diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index 59c37b0b361..39cdfcb1187 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -115,7 +115,7 @@ print "\n"; // DN Pour les utilisateurs $var=!$var; -print ''.$langs->trans("LDAPUserDn").picto_required().''; +print ''.$langs->trans("LDAPUserDn").''; print ''; print ''.$langs->trans("LDAPUserDnExample").''; print ' '; @@ -123,7 +123,7 @@ print ''; // List of object class used to define attributes in structure $var=!$var; -print ''.$langs->trans("LDAPUserObjectClassList").picto_required().''; +print ''.$langs->trans("LDAPUserObjectClassList").''; print ''; print ''.$langs->trans("LDAPUserObjectClassListExample").''; print ' '; diff --git a/htdocs/admin/paybox.php b/htdocs/admin/paybox.php index f89c85f1146..0ca81c631a6 100644 --- a/htdocs/admin/paybox.php +++ b/htdocs/admin/paybox.php @@ -125,28 +125,28 @@ print ''; $var=!$var; print ''; -print $langs->trans("PAYBOX_CGI_URL_V2").'*'; +print ''.$langs->trans("PAYBOX_CGI_URL_V2").''; print ''; print '
'.$langs->trans("Example").': http://mysite/cgi-bin/modulev2_redhat72.cgi'; print ''; $var=!$var; print ''; -print $langs->trans("PAYBOX_PBX_SITE").'*'; +print ''.$langs->trans("PAYBOX_PBX_SITE").''; print ''; print '
'.$langs->trans("Example").': 1999888 ('.$langs->trans("Test").')'; print ''; $var=!$var; print ''; -print $langs->trans("PAYBOX_PBX_RANG").'*'; +print ''.$langs->trans("PAYBOX_PBX_RANG").''; print ''; print '
'.$langs->trans("Example").': 99 ('.$langs->trans("Test").')'; print ''; $var=!$var; print ''; -print $langs->trans("PAYBOX_PBX_IDENTIFIANT").'*'; +print ''.$langs->trans("PAYBOX_PBX_IDENTIFIANT").''; print ''; print '
'.$langs->trans("Example").': 2 ('.$langs->trans("Test").')'; print ''; diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 6e103f6354e..3417ac63096 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -455,7 +455,7 @@ if ($_GET["action"] == 'create') print ''; // Type d'action actifs - print '
'.$langs->trans("Type").'*'; + print '
'.$langs->trans("Type").''; if ($_GET["actioncode"]) { print ''."\n"; @@ -537,7 +537,7 @@ if ($_GET["action"] == 'create') } // Date start - print '
'.$langs->trans("DateActionStart").'*'; + print '
'.$langs->trans("DateActionStart").''; if ($_REQUEST["afaire"] == 1) $html->select_date($actioncomm->datep,'ap',1,1,0,"action",1,1); else if ($_REQUEST["afaire"] == 2) $html->select_date($actioncomm->datep,'ap',1,1,1,"action",1,1); else $html->select_date($actioncomm->datep,'ap',1,1,1,"action",1,1); diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index a4fffd54ec5..416cdb91801 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2007 Franky Van Liedekerke * @@ -274,17 +274,17 @@ if ($_GET['action'] == 'create' || $_POST['action'] == 'confirm_paiement' || $_P print ''; - print '\n"; + print '\n"; // Date payment - print ''; print ''; - print '\n"; @@ -294,8 +294,8 @@ if ($_GET['action'] == 'create' || $_POST['action'] == 'confirm_paiement' || $_P print ''; if ($conf->banque->enabled) { - if ($facture->type != 2) print ''; - if ($facture->type == 2) print ''; + if ($facture->type != 2) print ''; + if ($facture->type == 2) print ''; print ''; diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 1d241058100..e942be72bfc 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -494,16 +494,16 @@ if ($_GET["action"] == 'create') print ''; // Commercial suivi - print ''; // Commercial signature - print ''; - print '"; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 6745e213364..a72d6009418 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -848,7 +848,7 @@ if ($step == 4 && $datatoimport) $more=''; if (preg_match('/\*$/',$label)) { - $text=''.$text.'*'; + $text=''.$text.''; $more=((! empty($valforsourcefieldnb[$i]) && $valforsourcefieldnb[$i] <= sizeof($fieldssource)) ? '' : img_warning($langs->trans("FieldNeedSource"))); if ($mandatoryfieldshavesource) $mandatoryfieldshavesource=(! empty($valforsourcefieldnb[$i]) && ($valforsourcefieldnb[$i] <= sizeof($fieldssource))); //print 'xx'.($i).'-'.$valforsourcefieldnb[$i].'-'.$mandatoryfieldshavesource; diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index d9d4ebdd324..4eafc97c777 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -2719,7 +2719,7 @@ function create_exdir($dir) */ function picto_required() { - return '*'; + return '*'; } diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index de4a26f8f51..eee1341bdcb 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -265,10 +265,10 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer) } // Ref - print ''; + print ''; // Label - print ''; + print ''; // Customer print ''; + print ''; print ''; print ''; print ''; @@ -420,12 +420,12 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create') } else { - print ''; + print ''; print ''; } // Prospect/Customer - print ''; - print ''; print '
'.$langs->trans('Company').''.$facture->client->getNomUrl(4)."
'.$langs->trans('Company').''.$facture->client->getNomUrl(4)."
'.$langs->trans('Date').''; + print '
'.$langs->trans('Date').''; $datepayment = dol_mktime(12, 0 , 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); $datepayment= ($datepayment == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0) : $datepayment); $html->select_date($datepayment,'','','',0,"add_paiement"); print ''.$langs->trans('Comments').'
'.$langs->trans('PaymentMode').''; + print '
'.$langs->trans('PaymentMode').''; $html->select_types_paiements(empty($_POST['paiementid'])?'':$_POST['paiementid'],'paiementid'); print "
'.$langs->trans('AccountToCredit').''.$langs->trans('AccountToDebit').''.$langs->trans('AccountToCredit').''.$langs->trans('AccountToDebit').''; $html->select_comptes(empty($_POST['accountid'])?'':$_POST['accountid'],'accountid',0,'',1); print '
'.$langs->trans("TypeContact_contrat_internal_SALESREPFOLL").'*'; + print '
'.$langs->trans("TypeContact_contrat_internal_SALESREPFOLL").''; print $form->select_users($_REQUEST["commercial_suivi_id"],'commercial_suivi_id',1,''); print '
'.$langs->trans("TypeContact_contrat_internal_SALESREPSIGN").'*'; + print '
'.$langs->trans("TypeContact_contrat_internal_SALESREPSIGN").''; print $form->select_users($_REQUEST["commercial_signature_id"],'commercial_signature_id',1,''); print '
'.$langs->trans("Date").'*'; + print '
'.$langs->trans("Date").''; $form->select_date($datecontrat,'',0,0,'',"contrat"); print "
'.$langs->trans("Ref").'*
'.$langs->trans("Ref").'
'.$langs->trans("Label").'*
'.$langs->trans("Label").'
'.$langs->trans("Company").''; diff --git a/htdocs/soc.php b/htdocs/soc.php index 77a82226a12..daf38f74d62 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -410,7 +410,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create') if ($soc->particulier) { - print '
'.$langs->trans('LastName').'
'.$langs->trans('LastName').''.$langs->trans('Prefix').'
'.$langs->trans('FirstName').' 
'.$langs->trans('Name').'
'.$langs->trans('Name').''.$langs->trans('Prefix').'
'.$langs->trans('ProspectCustomer').'
'.$langs->trans('ProspectCustomer').'
'.$langs->trans('Supplier').''; + print ''.$langs->trans('Supplier').''; print $form->selectyesno("fournisseur",$soc->fournisseur,1); print ''.$langs->trans('SupplierCode').''; @@ -739,7 +739,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit') print ''; // Name - print ''; + print ''; // Prefix print ''; // Prospect/Customer - print ''; - print ''; print ''; // Nom - print ''; + print ''; print ''; // Login - print ''; + print ''; print ''; // Nom - print "".''; + print "".''; print ''; // Prenom - print "".''; + print "".''; print ''; // Login - print "".''; + print "".''; print '
'.$langs->trans('Name').'
'.$langs->trans('Name').'
'.$langs->trans("Prefix").''; @@ -756,7 +756,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit') print '
'.$langs->trans('ProspectCustomer').'
'.$langs->trans('ProspectCustomer').'
'.$langs->trans('Supplier').''; + print ''.$langs->trans('Supplier').''; print $form->selectyesno("fournisseur",$soc->fournisseur,1); print ''.$langs->trans('SupplierCode').''; diff --git a/htdocs/theme/auguria/auguria.css.php b/htdocs/theme/auguria/auguria.css.php index a2f90db6049..d9862bf77e6 100644 --- a/htdocs/theme/auguria/auguria.css.php +++ b/htdocs/theme/auguria/auguria.css.php @@ -913,6 +913,8 @@ a.impayee:hover { font-weight: bold; color: #550000; } * Other */ +.fieldrequired { font-weight: bold; color: #000055; } + #pictotitle { browser->phone)?'display: none;':''; ?> } diff --git a/htdocs/theme/bluelagoon/bluelagoon.css.php b/htdocs/theme/bluelagoon/bluelagoon.css.php index 147fdbf2826..22344ed8674 100644 --- a/htdocs/theme/bluelagoon/bluelagoon.css.php +++ b/htdocs/theme/bluelagoon/bluelagoon.css.php @@ -628,6 +628,8 @@ a.impayee:hover { font-weight: bold; color: #550000; } * Other */ +.fieldrequired { font-weight: bold; color: #000055; } + #pictotitle { browser->phone)?'display: none;':''; ?> } diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php index a0d461054fa..2835cb1b731 100644 --- a/htdocs/theme/eldy/eldy.css.php +++ b/htdocs/theme/eldy/eldy.css.php @@ -1011,6 +1011,8 @@ a.impayee:hover { font-weight: bold; color: #550000; } * Other */ +.fieldrequired { font-weight: bold; color: #000055; } + #pictotitle { browser->phone)?'display: none;':''; ?> } diff --git a/htdocs/theme/freelug/freelug.css.php b/htdocs/theme/freelug/freelug.css.php index d3ce0237c76..40fa12f478d 100644 --- a/htdocs/theme/freelug/freelug.css.php +++ b/htdocs/theme/freelug/freelug.css.php @@ -727,6 +727,8 @@ a.impayee:hover { font-weight: bold; color: #550000; } * Other */ +.fieldrequired { font-weight: bold; color: #000055; } + #pictotitle { browser->phone)?'display: none;':''; ?> } diff --git a/htdocs/theme/yellow/yellow.css.php b/htdocs/theme/yellow/yellow.css.php index ebebabf68a0..e369f1de082 100644 --- a/htdocs/theme/yellow/yellow.css.php +++ b/htdocs/theme/yellow/yellow.css.php @@ -717,6 +717,8 @@ a.impayee:hover { font-weight: bold; color: #550000; } * Other */ +.fieldrequired { font-weight: bold; color: #442200; } + #pictotitle { browser->phone)?'display: none;':''; ?> } diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index b45f63f881a..02de3862d31 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -512,7 +512,7 @@ if (($action == 'create') || ($action == 'adduserldap')) print '
'.$langs->trans("Lastname").'*'.$langs->trans("Lastname").''; if ($ldap_nom) { @@ -540,7 +540,7 @@ if (($action == 'create') || ($action == 'adduserldap')) print '
'.$langs->trans("Login").'*
'.$langs->trans("Login").''; if ($ldap_login) { @@ -1290,7 +1290,7 @@ else print '
'.$langs->trans("Name").'*
'.$langs->trans("Name").''; if ($caneditfield && !$fuser->ldap_sid) { @@ -1304,7 +1304,7 @@ else print '
'.$langs->trans("Firstname").'
'.$langs->trans("Firstname").''; if ($caneditfield && !$fuser->ldap_sid) { @@ -1318,7 +1318,7 @@ else print '
'.$langs->trans("Login").'*
'.$langs->trans("Login").''; if ($user->admin && !$fuser->ldap_sid) { diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php index bdfe1814c83..d707496e605 100644 --- a/scripts/emailings/mailing-send.php +++ b/scripts/emailings/mailing-send.php @@ -78,9 +78,7 @@ if ($resql) $replyto = $obj->email_replyto; $errorsto = $obj->email_errorsto; - // Le message est-il en html - $msgishtml=-1; // Inconnu par defaut - if (preg_match('/[\s\t]*/i',$message)) $msgishtml=1; + $msgishtml=-1; $i++; }