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

Works on address function

Browse Source
This commit is contained in:
Regis Houssin 2010-08-07 11:52:53 +00:00
parent e07491e261
commit c1fa8287ed
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/propal.php
View File

@ -223,7 +223,7 @@ if ($_POST['action'] == 'setdate_livraison')
if ($result < 0) dol_print_error($db,$propal->error); if ($result < 0) dol_print_error($db,$propal->error);
} }
if ($_POST['action'] == 'setdeliveryadress' && $user->rights->propale->creer) if ($_POST['action'] == 'setaddress' && $user->rights->propale->creer)
{ {
$propal = new Propal($db); $propal = new Propal($db);
$propal->fetch($_GET["id"]); $propal->fetch($_GET["id"]);
@ -1247,11 +1247,11 @@ if ($id > 0 || ! empty($ref))
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;socid='.$propal->socid.'&amp;id='.$propal->id.'">'.img_edit($langs->trans('SetDeliveryAddress'),1).'</a></td>'; if ($_GET['action'] != 'editdelivery_address' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdelivery_address&amp;socid='.$propal->socid.'&amp;id='.$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">';
if ($_GET['action'] == 'editdelivery_adress') if ($_GET['action'] == 'editdelivery_address')
{ {
$html->form_address($_SERVER['PHP_SELF'].'?id='.$propal->id,$propal->fk_delivery_address,$_GET['socid'],'fk_address','propal',$propal->id); $html->form_address($_SERVER['PHP_SELF'].'?id='.$propal->id,$propal->fk_delivery_address,$_GET['socid'],'fk_address','propal',$propal->id);
} }

2
htdocs/commande/fiche.php
View File

@ -311,7 +311,7 @@ if ($_POST['action'] == 'setdate_livraison' && $user->rights->commande->creer)
} }
} }
if ($_POST['action'] == 'setdeliveryadress' && $user->rights->commande->creer) if ($_POST['action'] == 'setaddress' && $user->rights->commande->creer)
{ {
$commande = new Commande($db); $commande = new Commande($db);
$commande->fetch($_GET['id']); $commande->fetch($_GET['id']);

2
htdocs/compta/commande/fiche.php
View File

@ -93,7 +93,7 @@ if ($_POST['action'] == 'setdate_livraison' && $user->rights->commande->creer)
} }
} }
if ($_POST['action'] == 'setdeliveryadress' && $user->rights->commande->creer) if ($_POST['action'] == 'setaddress' && $user->rights->commande->creer)
{ {
$commande = new Commande($db); $commande = new Commande($db);
$commande->fetch($_GET['id']); $commande->fetch($_GET['id']);

4
htdocs/core/class/html.form.class.php
View File

@ -2097,7 +2097,7 @@ class Form
} }
/** /**
* \brief Affiche formulaire de selection de l'adresse de livraison * \brief Affiche formulaire de selection de l'adresse
* \param page Page * \param page Page
* \param selected Id condition pre-selectionne * \param selected Id condition pre-selectionne
* \param htmlname Nom du formulaire select * \param htmlname Nom du formulaire select
@ -2110,7 +2110,7 @@ class Form
if ($htmlname != "none") if ($htmlname != "none")
{ {
print '<form method="post" action="'.$page.'">'; print '<form method="post" action="'.$page.'">';
print '<input type="hidden" name="action" value="setdeliveryadress">'; print '<input type="hidden" name="action" value="setaddress">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">'; print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
print '<tr><td>'; print '<tr><td>';