Fix: Correction typographique
Utilisation traduction de NoOtherDeliveryAddress plus courte pour viter formulaire tronqu/surcharg. New: Conditionnement de la gestion des adresses de livraisons sur activation du module commande ou expedition.
This commit is contained in:
Laurent Destailleur
parent
0fea24bf22
commit
5f3cc714e6
@ -192,7 +192,7 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
|
||||
$livraison->pays=$obj->libelle;
|
||||
}
|
||||
|
||||
print_titre($langs->trans("NewDeliveryAdress"));
|
||||
print_titre($langs->trans("NewDeliveryAddress"));
|
||||
print "<br>\n";
|
||||
|
||||
if ($livraison->error)
|
||||
@ -208,7 +208,7 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
|
||||
|
||||
print '<table class="border" width="100%">';
|
||||
|
||||
print '<tr><td>'.$langs->trans('DeliveryAdressLabel').'</td><td><input type="text" size="30" name="label" value="'.$livraison->label.'"></td></tr>';
|
||||
print '<tr><td>'.$langs->trans('DeliveryAddressLabel').'</td><td><input type="text" size="30" name="label" value="'.$livraison->label.'"></td></tr>';
|
||||
print '<tr><td>'.$langs->trans('Name').'</td><td><input type="text" size="30" name="nom" value="'.$livraison->nom.'"></td></tr>';
|
||||
|
||||
print '<tr><td>'.$langs->trans('Address').'</td><td colspan="3"><textarea name="adresse" cols="40" rows="3" wrap="soft">';
|
||||
@ -242,7 +242,7 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create')
|
||||
print '</textarea></td></tr>';
|
||||
|
||||
print '<tr><td colspan="4" align="center">';
|
||||
print '<input type="submit" class="button" value="'.$langs->trans('AddDeliveryAdress').'"></td></tr>'."\n";
|
||||
print '<input type="submit" class="button" value="'.$langs->trans('AddDeliveryAddress').'"></td></tr>'."\n";
|
||||
|
||||
print '</table>'."\n";
|
||||
print '</form>'."\n";
|
||||
@ -310,7 +310,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
|
||||
|
||||
print '<table class="border" width="100%">';
|
||||
|
||||
print '<tr><td>'.$langs->trans('DeliveryAdressLabel').'</td><td colspan="3"><input type="text" size="40" name="label" value="'.$livraison->label.'"></td></tr>';
|
||||
print '<tr><td>'.$langs->trans('DeliveryAddressLabel').'</td><td colspan="3"><input type="text" size="40" name="label" value="'.$livraison->label.'"></td></tr>';
|
||||
print '<tr><td>'.$langs->trans('Name').'</td><td colspan="3"><input type="text" size="40" name="nom" value="'.$livraison->nom.'"></td></tr>';
|
||||
|
||||
print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3"><textarea name="adresse" cols="40" rows="3" wrap="soft">';
|
||||
@ -367,7 +367,7 @@ else
|
||||
if ($_GET["action"] == 'delete')
|
||||
{
|
||||
$html = new Form($db);
|
||||
$html->form_confirm("adresse_livraison.php?socid=".$livraison->socid."&idl=".$_GET["idl"],$langs->trans("DeleteDeliveryAdress"),$langs->trans("ConfirmDeleteDeliveryAdress"),"confirm_delete");
|
||||
$html->form_confirm("adresse_livraison.php?socid=".$livraison->socid."&idl=".$_GET["idl"],$langs->trans("DeleteDeliveryAddress"),$langs->trans("ConfirmDeleteDeliveryAdress"),"confirm_delete");
|
||||
print "<br />\n";
|
||||
}
|
||||
|
||||
@ -384,7 +384,7 @@ else
|
||||
|
||||
print '<table class="border" width="100%">';
|
||||
|
||||
print '<tr><td width="20%">'.$langs->trans('DeliveryAdressLabel').'</td><td colspan="3">'.$livraison->lignes[$i]->label.'</td>';
|
||||
print '<tr><td width="20%">'.$langs->trans('DeliveryAddressLabel').'</td><td colspan="3">'.$livraison->lignes[$i]->label.'</td>';
|
||||
print '<td valign="top" colspan="2" width="50%" rowspan="7">'.$langs->trans('Note').' :<br>'.nl2br($livraison->lignes[$i]->note).'</td></tr>';
|
||||
print '<tr><td width="20%">'.$langs->trans('Name').'</td><td colspan="3">'.$livraison->lignes[$i]->nom.'</td></tr>';
|
||||
|
||||
|
||||
@ -328,33 +328,35 @@ if ($socidp > 0)
|
||||
}
|
||||
|
||||
// adresse de livraison
|
||||
|
||||
if ($conf->expedition->enabled || $conf->commande->enabled)
|
||||
{
|
||||
print '<tr><td nowrap>';
|
||||
print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
|
||||
print $langs->trans("DeliveryAdress");
|
||||
print $langs->trans("DeliveryAddress");
|
||||
print '<td><td align="right">';
|
||||
print '<a href="'.DOL_URL_ROOT.'/comm/adresse_livraison.php?socid='.$objsoc->id.'">'.img_edit($langs->trans("Modify")).'</a>';
|
||||
print '</td></tr></table>';
|
||||
print '</td><td colspan="3">';
|
||||
|
||||
$sql = "SELECT count(rowid) as nb";
|
||||
$sql.= " FROM ".MAIN_DB_PREFIX."societe_adresse_livraison";
|
||||
$sql.= " WHERE fk_societe =".$objsoc->id;
|
||||
|
||||
$resql = $db->query($sql);
|
||||
if ($resql)
|
||||
{
|
||||
$num = $db->num_rows($resql);
|
||||
$objal = $db->fetch_object($resql);
|
||||
print $objal->nb?($objal->nb):$langs->trans("NoOtherDeliveryAdress");
|
||||
}
|
||||
else
|
||||
{
|
||||
dolibarr_print_error($db);
|
||||
}
|
||||
|
||||
$sql = "SELECT count(rowid) as nb";
|
||||
$sql.= " FROM ".MAIN_DB_PREFIX."societe_adresse_livraison";
|
||||
$sql.= " WHERE fk_societe =".$objsoc->id;
|
||||
|
||||
$resql = $db->query($sql);
|
||||
if ($resql)
|
||||
{
|
||||
$num = $db->num_rows($resql);
|
||||
$objal = $db->fetch_object($resql);
|
||||
print $objal->nb?($objal->nb):$langs->trans("NoOtherDeliveryAddress");
|
||||
}
|
||||
else
|
||||
{
|
||||
dolibarr_print_error($db);
|
||||
}
|
||||
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
}
|
||||
|
||||
print "</table>";
|
||||
|
||||
|
||||
@ -148,10 +148,10 @@ DolibarrLogin=Dolibarr login
|
||||
NoDolibarrAccess=No Dolibarr access
|
||||
ExportDataset_company_1=Companies/fundations and properties
|
||||
ExportDataset_company_2=Contacts and properties
|
||||
DeliveryAdress=Delivery adress
|
||||
DeliveryAdressLabel=Delivery adress label
|
||||
DeleteDeliveryAdress=Delete a delivery adress
|
||||
ConfirmDeletedeliveryAdress=Are you sure you want to delete this delivery adress?
|
||||
NewDeliveryAdress=New delivery adress
|
||||
AddDeliveryAdress=Add adress
|
||||
NoOtherDeliveryAdress=No other delivery adress
|
||||
DeliveryAddress=Delivery address
|
||||
DeliveryAddressLabel=Delivery address label
|
||||
DeleteDeliveryAddress=Delete a delivery address
|
||||
ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address?
|
||||
NewDeliveryAddress=New delivery address
|
||||
AddDeliveryAddress=Add address
|
||||
NoOtherDeliveryAddress=No alternative delivery address defined
|
||||
@ -149,10 +149,10 @@ NoDolibarrAccess=Pas d'acc
|
||||
ExportDataset_company_1=Sociétés/associations et caractéristiques
|
||||
ExportDataset_company_2=Contacts et caractéristiques
|
||||
PriceLevel=Niveau de prix
|
||||
DeliveryAdress=Adresse(s) de livraison
|
||||
DeliveryAdressLabel=Libellé de l'adresse
|
||||
DeleteDeliveryAdress=Supprimer une adresse de livraison
|
||||
ConfirmDeletedeliveryAdress=Êtes-vous sûr de vouloir supprimer cette adresse de livraison ?
|
||||
NewDeliveryAdress=Nouvelle adresse de livraison
|
||||
AddDeliveryAdress=Ajouter l'adresse
|
||||
NoOtherDeliveryAdress=Pas d'autre(s) adresse(s) de livraison définie(s)
|
||||
DeliveryAddress=Adresse(s) de livraison
|
||||
DeliveryAddressLabel=Libellé de l'adresse
|
||||
DeleteDeliveryAddress=Supprimer une adresse de livraison
|
||||
ConfirmDeleteDeliveryAddress=Êtes-vous sûr de vouloir supprimer cette adresse de livraison ?
|
||||
NewDeliveryAddress=Nouvelle adresse de livraison
|
||||
AddDeliveryAddress=Ajouter l'adresse
|
||||
NoOtherDeliveryAddress=Pas d'adresses alternatives définies
|
||||
Loading…
Reference in New Issue
Block a user