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

Fix: Bad link to delivery address

Browse Source
This commit is contained in:
Laurent Destailleur 2009-07-21 11:37:40 +00:00
parent 8268b840ec
commit 1af71edc1d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/expedition/fiche.php
View File

@ -288,8 +288,7 @@ if ($_GET["action"] == 'create')
print '<td colspan="3">'; print '<td colspan="3">';
if (!empty($object->fk_delivery_address)) if (!empty($object->fk_delivery_address))
{ {
$object->fetch_adresse_livraison($object->fk_delivery_address); $html->form_adresse_livraison($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$_GET['socid'],'none','commande',$object->id);
print '<a href='.DOL_URL_ROOT.'/comm/adresse_livraison.php?socid='.$expedition->deliveryaddress->socid.'&id='.$expedition->deliveryaddress->id.'&action=edit&origin='.$origin.'&originid='.$origin_id.'>'.$expedition->deliveryaddress->label.'</a>';
} }
print '</td></tr>'."\n"; print '</td></tr>'."\n";
@ -653,8 +652,7 @@ else
print '<td colspan="3">'; print '<td colspan="3">';
if (!empty($expedition->fk_delivery_address)) if (!empty($expedition->fk_delivery_address))
{ {
$expedition->fetch_adresse_livraison($expedition->fk_delivery_address); $html->form_adresse_livraison($_SERVER['PHP_SELF'].'?id='.$expedition->id,$expedition->fk_delivery_address,$expedition->deliveryaddress->socid,'none','shipment',$expedition->id);
print '<a href='.DOL_URL_ROOT.'/comm/adresse_livraison.php?socid='.$expedition->deliveryaddress->socid.'&id='.$expedition->deliveryaddress->id.'&action=edit&origin=shipment&originid='.$expedition->id.'>'.$expedition->deliveryaddress->label.'</a>';
} }
print '</td></tr>'."\n"; print '</td></tr>'."\n";

2
htdocs/html.form.class.php
View File

@ -1986,7 +1986,7 @@ class Form
{ {
require_once(DOL_DOCUMENT_ROOT ."/comm/adresse_livraison.class.php"); require_once(DOL_DOCUMENT_ROOT ."/comm/adresse_livraison.class.php");
$livraison=new AdresseLivraison($this->db); $livraison=new AdresseLivraison($this->db);
$livraison->fetch_adresse($selected); $result=$livraison->fetch_adresse($selected);
print '<a href='.DOL_URL_ROOT.'/comm/adresse_livraison.php?socid='.$livraison->socid.'&id='.$livraison->id.'&action=edit&origin='.$origin.'&originid='.$originid.'>'.$livraison->label.'</a>'; print '<a href='.DOL_URL_ROOT.'/comm/adresse_livraison.php?socid='.$livraison->socid.'&id='.$livraison->id.'&action=edit&origin='.$origin.'&originid='.$originid.'>'.$livraison->label.'</a>';
} }
else else