lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

possibilit de dfinir l'adresse de livraison dans la propale si la constante PROPAL_ADD_DELIVERY_ADDRESS

Browse Source 
est dfinie
This commit is contained in:
Regis Houssin 2006-04-24 13:59:58 +00:00
parent 7a871fa21c
commit 64f908a26d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/comm/adresse_livraison.php
View File

@ -107,6 +107,11 @@ if ($_POST["action"] == 'add' || $_POST["action"] == 'update')
Header("Location: ../commande/fiche.php?action=editdelivery_adress&socid=".$socid."&id=".$originid); Header("Location: ../commande/fiche.php?action=editdelivery_adress&socid=".$socid."&id=".$originid);
exit; exit;
} }
elseif ($origin == propal)
{
Header("Location: ../comm/propal.php?action=editdelivery_adress&socidp=".$socid."&propalid=".$originid);
exit;
}
else else
{ {
Header("Location: adresse_livraison.php?socid=".$socid); Header("Location: adresse_livraison.php?socid=".$socid);
@ -131,9 +136,13 @@ if ($_POST["action"] == 'add' || $_POST["action"] == 'update')
{ {
if ($origin == commande) if ($origin == commande)
{ {
Header("Location: ../commande/fiche.php?&id=".$originid); Header("Location: ../commande/fiche.php?id=".$originid);
exit; exit;
} }
elseif ($origin == propal)
{
Header("Location: ../comm/propal.php?propalid=".$originid);
exit;
else else
{ {
Header("Location: adresse_livraison.php?socid=".$socid); Header("Location: adresse_livraison.php?socid=".$socid);

2
htdocs/comm/propal.php
View File

@ -661,7 +661,7 @@ if ($_GET['propalid'] > 0)
print $langs->trans('DeliveryAddress'); print $langs->trans('DeliveryAddress');
print '</td>'; print '</td>';
if ($_GET['action'] != 'editdelivery_adress' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdelivery_adress&amp;socidp='.$propal->socidp.'&amp;id='.$propal->id.'">'.img_edit($langs->trans('SetDeliveryAddress'),1).'</a></td>'; if ($_GET['action'] != 'editdelivery_adress' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdelivery_adress&amp;socidp='.$propal->socidp.'&amp;propalid='.$propal->id.'">'.img_edit($langs->trans('SetDeliveryAddress'),1).'</a></td>';
print '</tr></table>'; print '</tr></table>';
print '</td><td colspan="3">'; print '</td><td colspan="3">';