diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 6cf50f2390a2f3351686d8eb871528f9927661a2..058e7c04a362122509f50facfe1815dd8076eed4 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -54,7 +54,8 @@ class Expedition extends CommonObject var $origin; var $origin_id; var $lines=array(); - var $expedition_method_id; + var $expedition_method_id; // TODO deprecated + var $shipping_method_id; var $statut; var $trueWeight; diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index aa249ba3e39455161014e49d1647e90ab355c4b0..3d6ed3cf92b0e36067892ff34f2f221eade5baff 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -200,14 +200,13 @@ if ($action == 'reopen' && $user->rights->expedition->valider) if ($action == 'setdate_livraison' && $user->rights->expedition->creer) { //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year']; - $datelivraison=dol_mktime($_POST['liv_hour'], $_POST['liv_min'], 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']); + $datedelivery=dol_mktime($_POST['liv_hour'], $_POST['liv_min'], 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']); - $shipping = new Expedition($db); - $shipping->fetch($id); - $result=$shipping->set_date_livraison($user,$datelivraison); + $object->fetch($id); + $result=$object->set_date_livraison($user,$datedelivery); if ($result < 0) { - $mesg='<div class="error">'.$shipping->error.'</div>'; + $mesg='<div class="error">'.$object->error.'</div>'; } }