Patch de normalisation
This commit is contained in:
parent
b860afcc35
commit
2534becb53
@ -147,7 +147,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit')
|
|||||||
print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeList").'</td><td><input class="flat" name="size_liste_limit" size="4" value="' . SIZE_LISTE_LIMIT . '"></td></tr>';
|
print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeList").'</td><td><input class="flat" name="size_liste_limit" size="4" value="' . SIZE_LISTE_LIMIT . '"></td></tr>';
|
||||||
|
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
print '<tr '.$bc[$var].'"><td width="35%">'.$langs->trans("ShowBugtrakLink").'</td><td>';
|
print '<tr '.$bc[$var].'"><td width="35%">'.$langs->trans("ShowBugTrackLink").'</td><td>';
|
||||||
$html->selectyesnonum('bugtrack',MAIN_SHOW_BUGTRACK_LINK);
|
$html->selectyesnonum('bugtrack',MAIN_SHOW_BUGTRACK_LINK);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
@ -220,7 +220,7 @@ else
|
|||||||
print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeList").'</td><td>' . $conf->global->SIZE_LISTE_LIMIT . '</td></tr>';
|
print '<tr '.$bc[$var].'><td>'.$langs->trans("DefaultMaxSizeList").'</td><td>' . $conf->global->SIZE_LISTE_LIMIT . '</td></tr>';
|
||||||
|
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
print '<tr '.$bc[$var].'"><td width="35%">'.$langs->trans("ShowBugtrakLink").'</td><td>';
|
print '<tr '.$bc[$var].'"><td width="35%">'.$langs->trans("ShowBugTrackLink").'</td><td>';
|
||||||
print (MAIN_SHOW_BUGTRACK_LINK?$langs->trans("yes"):$langs->trans("no"))."</td></tr>";
|
print (MAIN_SHOW_BUGTRACK_LINK?$langs->trans("yes"):$langs->trans("no"))."</td></tr>";
|
||||||
|
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
|
|||||||
@ -206,10 +206,10 @@ if ($conf->societe->enabled)
|
|||||||
print '<td>'.$langs->trans("WebCalAddEventOnCreateActions").'</td>';
|
print '<td>'.$langs->trans("WebCalAddEventOnCreateActions").'</td>';
|
||||||
print '<td>';
|
print '<td>';
|
||||||
print '<select name="phpwebcalendar_syncro" class="flat">';
|
print '<select name="phpwebcalendar_syncro" class="flat">';
|
||||||
print '<option value="always"'.($conf->global->PHPWEBCALENDAR_SYNCRO=='always'?' selected':'').'>'.$langs->trans("WebCalAllways").'</option>';
|
print '<option value="always"'.($conf->global->PHPWEBCALENDAR_SYNCRO=='always'?' selected="true"':'').'>'.$langs->trans("WebCalAllways").'</option>';
|
||||||
print '<option value="yesbydefault"'.($conf->global->PHPWEBCALENDAR_SYNCRO=='yesbydefault'?' selected':'').'>'.$langs->trans("WebCalYesByDefault").'</option>';
|
print '<option value="yesbydefault"'.($conf->global->PHPWEBCALENDAR_SYNCRO=='yesbydefault'?' selected="true"':'').'>'.$langs->trans("WebCalYesByDefault").'</option>';
|
||||||
print '<option value="nobydefault"'.((! $conf->global->PHPWEBCALENDAR_SYNCRO || $conf->global->PHPWEBCALENDAR_SYNCRO=='nobydefault')?' selected':'').'>'.$langs->trans("WebCalNoByDefault").'</option>';
|
print '<option value="nobydefault"'.((! $conf->global->PHPWEBCALENDAR_SYNCRO || $conf->global->PHPWEBCALENDAR_SYNCRO=='nobydefault')?' selected="true"':'').'>'.$langs->trans("WebCalNoByDefault").'</option>';
|
||||||
print '<option value="never"'.($conf->global->PHPWEBCALENDAR_SYNCRO=='never'?' selected':'').'>'.$langs->trans("WebCalNever").'</option>';
|
print '<option value="never"'.($conf->global->PHPWEBCALENDAR_SYNCRO=='never'?' selected="true"':'').'>'.$langs->trans("WebCalNever").'</option>';
|
||||||
print '</select>';
|
print '</select>';
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
@ -220,8 +220,8 @@ if ($conf->societe->enabled)
|
|||||||
print '<td>'.$langs->trans("WebCalAddEventOnCreateCompany").'</td>';
|
print '<td>'.$langs->trans("WebCalAddEventOnCreateCompany").'</td>';
|
||||||
print '<td>';
|
print '<td>';
|
||||||
print '<select name="phpwebcalendar_companycreate" class="flat">';
|
print '<select name="phpwebcalendar_companycreate" class="flat">';
|
||||||
print '<option value="always"'.($conf->global->PHPWEBCALENDAR_COMPANYCREATE=='always'?' selected':'').'>'.$langs->trans("WebCalAllways").'</option>';
|
print '<option value="always"'.($conf->global->PHPWEBCALENDAR_COMPANYCREATE=='always'?' selected="true"':'').'>'.$langs->trans("WebCalAllways").'</option>';
|
||||||
print '<option value="never"'.(! $conf->global->PHPWEBCALENDAR_COMPANYCREATE || $conf->global->PHPWEBCALENDAR_COMPANYCREATE=='never'?' selected':'').'>'.$langs->trans("WebCalNever").'</option>';
|
print '<option value="never"'.(! $conf->global->PHPWEBCALENDAR_COMPANYCREATE || $conf->global->PHPWEBCALENDAR_COMPANYCREATE=='never'?' selected="true"':'').'>'.$langs->trans("WebCalNever").'</option>';
|
||||||
print '</select>';
|
print '</select>';
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
@ -232,8 +232,8 @@ if ($conf->contrat->enabled)
|
|||||||
print '<td>'.$langs->trans("WebCalAddEventOnStatusContract").'</td>';
|
print '<td>'.$langs->trans("WebCalAddEventOnStatusContract").'</td>';
|
||||||
print '<td>';
|
print '<td>';
|
||||||
print '<select name="phpwebcalendar_contractstatus" class="flat">';
|
print '<select name="phpwebcalendar_contractstatus" class="flat">';
|
||||||
print '<option value="always"'.($conf->global->PHPWEBCALENDAR_CONTRACTSTATUS=='always'?' selected':'').'>'.$langs->trans("WebCalAllways").'</option>';
|
print '<option value="always"'.($conf->global->PHPWEBCALENDAR_CONTRACTSTATUS=='always'?' selected="true"':'').'>'.$langs->trans("WebCalAllways").'</option>';
|
||||||
print '<option value="never"'.(! $conf->global->PHPWEBCALENDAR_CONTRACTSTATUS || $conf->global->PHPWEBCALENDAR_CONTRACTSTATUS=='never'?' selected':'').'>'.$langs->trans("WebCalNever").'</option>';
|
print '<option value="never"'.(! $conf->global->PHPWEBCALENDAR_CONTRACTSTATUS || $conf->global->PHPWEBCALENDAR_CONTRACTSTATUS=='never'?' selected="true"':'').'>'.$langs->trans("WebCalNever").'</option>';
|
||||||
print '</select>';
|
print '</select>';
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
@ -244,8 +244,8 @@ if ($conf->facture->enabled)
|
|||||||
print '<td>'.$langs->trans("WebCalAddEventOnStatusBill").'</td>';
|
print '<td>'.$langs->trans("WebCalAddEventOnStatusBill").'</td>';
|
||||||
print '<td>';
|
print '<td>';
|
||||||
print '<select name="phpwebcalendar_billstatus" class="flat">';
|
print '<select name="phpwebcalendar_billstatus" class="flat">';
|
||||||
print '<option value="always"'.($conf->global->PHPWEBCALENDAR_BILLSTATUS=='always'?' selected':'').'>'.$langs->trans("WebCalAllways").'</option>';
|
print '<option value="always"'.($conf->global->PHPWEBCALENDAR_BILLSTATUS=='always'?' selected="true"':'').'>'.$langs->trans("WebCalAllways").'</option>';
|
||||||
print '<option value="never"'.(! $conf->global->PHPWEBCALENDAR_BILLSTATUS || $conf->global->PHPWEBCALENDAR_BILLSTATUS=='never'?' selected':'').'>'.$langs->trans("WebCalNever").'</option>';
|
print '<option value="never"'.(! $conf->global->PHPWEBCALENDAR_BILLSTATUS || $conf->global->PHPWEBCALENDAR_BILLSTATUS=='never'?' selected="true"':'').'>'.$langs->trans("WebCalNever").'</option>';
|
||||||
print '</select>';
|
print '</select>';
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
|||||||
@ -70,9 +70,9 @@ print '<tr><td valign="top" width="30%">';
|
|||||||
echo "<option value='$i' ";//creation d'une valeur dans la liste
|
echo "<option value='$i' ";//creation d'une valeur dans la liste
|
||||||
|
|
||||||
if ($_REQUEST['choix'] == $i)
|
if ($_REQUEST['choix'] == $i)
|
||||||
echo "selected='selected'"; // permet de rendre le choix toujours selectionne
|
echo 'selected="true"'; // permet de rendre le choix toujours selectionne
|
||||||
else if (!isset ($_REQUEST['choix']) && $i == $nbcats) // nombre de catégories mères par défaut.
|
else if (!isset ($_REQUEST['choix']) && $i == $nbcats) // nombre de catégories mères par défaut.
|
||||||
echo "selected='selected'";
|
echo 'selected="true"';
|
||||||
|
|
||||||
echo ">$i</option>";
|
echo ">$i</option>";
|
||||||
}
|
}
|
||||||
@ -96,7 +96,7 @@ print '<tr><td valign="top" width="30%">';
|
|||||||
echo "<option value='$id' id='$id'";
|
echo "<option value='$id' id='$id'";
|
||||||
|
|
||||||
if ($_REQUEST['catsMeres'][$i] == $id)
|
if ($_REQUEST['catsMeres'][$i] == $id)
|
||||||
echo " selected='selected'";
|
echo ' selected="true"';
|
||||||
|
|
||||||
echo ">".$cat->label."</option>\n";
|
echo ">".$cat->label."</option>\n";
|
||||||
}
|
}
|
||||||
|
|||||||
@ -85,7 +85,7 @@ print '<tr><td valign="top" width="30%">';
|
|||||||
echo "<option value='$i' ";//creation d'une valeur dans la liste
|
echo "<option value='$i' ";//creation d'une valeur dans la liste
|
||||||
|
|
||||||
if ($i == $nbcats)
|
if ($i == $nbcats)
|
||||||
echo "selected='selected'"; // permet de rendre le choix toujours selectionne
|
echo 'selected="true"'; // permet de rendre le choix toujours selectionne
|
||||||
|
|
||||||
echo ">$i</option>";
|
echo ">$i</option>";
|
||||||
}
|
}
|
||||||
@ -112,7 +112,7 @@ print '<tr><td valign="top" width="30%">';
|
|||||||
echo "<option value='$id' id='$id'";
|
echo "<option value='$id' id='$id'";
|
||||||
|
|
||||||
if ($cats_meres[$i] == $id)
|
if ($cats_meres[$i] == $id)
|
||||||
echo " selected='selected'";
|
echo ' selected="true"';
|
||||||
|
|
||||||
echo ">".$cat->label."</option>\n";
|
echo ">".$cat->label."</option>\n";
|
||||||
}
|
}
|
||||||
|
|||||||
@ -178,7 +178,7 @@ if ($action == 'create')
|
|||||||
print '<option value="'.$objopt->rowid.'"';
|
print '<option value="'.$objopt->rowid.'"';
|
||||||
if (defined("FACTURE_RIB_NUMBER") && FACTURE_RIB_NUMBER == $objopt->rowid)
|
if (defined("FACTURE_RIB_NUMBER") && FACTURE_RIB_NUMBER == $objopt->rowid)
|
||||||
{
|
{
|
||||||
print ' selected';
|
print ' selected="true"';
|
||||||
}
|
}
|
||||||
print '>'.$objopt->label.'</option>';
|
print '>'.$objopt->label.'</option>';
|
||||||
$i++;
|
$i++;
|
||||||
|
|||||||
@ -264,6 +264,8 @@ CompanyName=Company/foundation name
|
|||||||
CompanyAddress=Company/foundation address
|
CompanyAddress=Company/foundation address
|
||||||
CompanyCurrency=Company/foundation currency
|
CompanyCurrency=Company/foundation currency
|
||||||
DoNotShow=Do not show
|
DoNotShow=Do not show
|
||||||
|
ShowBugTrackLink=Show link "Report a bug"
|
||||||
|
ShowWorkBoard=Show "work board" on home page
|
||||||
##### Users setup #####
|
##### Users setup #####
|
||||||
UserGroupSetup=Users and groups module setup
|
UserGroupSetup=Users and groups module setup
|
||||||
GeneratePassword=Générer mot de passe
|
GeneratePassword=Générer mot de passe
|
||||||
|
|||||||
@ -264,6 +264,8 @@ CompanyName=Nom/Enseigne de la soci
|
|||||||
CompanyAddress=Adresse de la société/association
|
CompanyAddress=Adresse de la société/association
|
||||||
CompanyCurrency=Devise de la société/association
|
CompanyCurrency=Devise de la société/association
|
||||||
DoNotShow=Ne pas afficher
|
DoNotShow=Ne pas afficher
|
||||||
|
ShowBugTrackLink=Afficher le lien "Signaler un bug"
|
||||||
|
ShowWorkBoard=Affiche le tableau de bord de travail sur page accueil
|
||||||
##### Users setup #####
|
##### Users setup #####
|
||||||
UserGroupSetup=Configuration module utilisateurs et groupes
|
UserGroupSetup=Configuration module utilisateurs et groupes
|
||||||
GeneratePassword=Générer mot de passe
|
GeneratePassword=Générer mot de passe
|
||||||
|
|||||||
@ -346,8 +346,8 @@ else
|
|||||||
|
|
||||||
print '<tr><td width="20%">'.$langs->trans("Status").'</td><td colspan="3">';
|
print '<tr><td width="20%">'.$langs->trans("Status").'</td><td colspan="3">';
|
||||||
print '<select name="statut">';
|
print '<select name="statut">';
|
||||||
print '<option value="0" '.($entrepot->statut == 0?"selected":"").'>'.$langs->trans("WarehouseClosed").'</option>';
|
print '<option value="0" '.($entrepot->statut == 0?'selected="true"':'').'>'.$langs->trans("WarehouseClosed").'</option>';
|
||||||
print '<option value="1" '.($entrepot->statut == 0?"":"selected").'>'.$langs->trans("WarehouseOpened").'</option>';
|
print '<option value="1" '.($entrepot->statut == 0?'':'selected="true"').'>'.$langs->trans("WarehouseOpened").'</option>';
|
||||||
print '</select>';
|
print '</select>';
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
|
|||||||
@ -240,9 +240,9 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
|
|||||||
|
|
||||||
// Client / Prospect
|
// Client / Prospect
|
||||||
print '<tr><td width="25%">'.$langs->trans('ProspectCustomer').'</td><td width="25%"><select class="flat" name="client">';
|
print '<tr><td width="25%">'.$langs->trans('ProspectCustomer').'</td><td width="25%"><select class="flat" name="client">';
|
||||||
print '<option value="2"'.($soc->client==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
|
print '<option value="2"'.($soc->client==2?' selected="true"':'').'>'.$langs->trans('Prospect').'</option>';
|
||||||
print '<option value="1"'.($soc->client==1?' selected':'').'>'.$langs->trans('Customer').'</option>';
|
print '<option value="1"'.($soc->client==1?' selected="true"':'').'>'.$langs->trans('Customer').'</option>';
|
||||||
print '<option value="0"'.($soc->client==0?' selected':'').'>Ni client, ni prospect</option>';
|
print '<option value="0"'.($soc->client==0?' selected="true"':'').'>Ni client, ni prospect</option>';
|
||||||
print '</select></td>';
|
print '</select></td>';
|
||||||
print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">';
|
print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">';
|
||||||
print '<input type="text" name="code_client" size="16" value="'.$soc->code_client.'" maxlength="15">';
|
print '<input type="text" name="code_client" size="16" value="'.$soc->code_client.'" maxlength="15">';
|
||||||
@ -459,9 +459,9 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
|
|||||||
|
|
||||||
// Client / Prospect
|
// Client / Prospect
|
||||||
print '<tr><td width="25%">'.$langs->trans('ProspectCustomer').'</td><td width="25%"><select class="flat" name="client">';
|
print '<tr><td width="25%">'.$langs->trans('ProspectCustomer').'</td><td width="25%"><select class="flat" name="client">';
|
||||||
print '<option value="2"'.($soc->client==2?' selected':'').'>'.$langs->trans('Prospect').'</option>';
|
print '<option value="2"'.($soc->client==2?' selected="true"':'').'>'.$langs->trans('Prospect').'</option>';
|
||||||
print '<option value="1"'.($soc->client==1?' selected':'').'>'.$langs->trans('Customer').'</option>';
|
print '<option value="1"'.($soc->client==1?' selected="true"':'').'>'.$langs->trans('Customer').'</option>';
|
||||||
print '<option value="0"'.($soc->client==0?' selected':'').'>Ni client, ni prospect</option>';
|
print '<option value="0"'.($soc->client==0?' selected="true"':'').'>Ni client, ni prospect</option>';
|
||||||
print '</select></td>';
|
print '</select></td>';
|
||||||
print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">';
|
print '<td width="25%">'.$langs->trans('CustomerCode').'</td><td width="25%">';
|
||||||
if ($soc->codeclient_modifiable == 1)
|
if ($soc->codeclient_modifiable == 1)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user