From 3dbcb5c93339bf14b60a007dd00d06419b696fc1 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 14 Jun 2011 18:19:09 +0000
Subject: [PATCH] Fix: uniformize code
---
htdocs/expedition/class/expedition.class.php | 3 ++-
htdocs/expedition/fiche.php | 9 ++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 6cf50f2390a..058e7c04a36 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 aa249ba3e39..3d6ed3cf92b 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>';
}
}
--
GitLab