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

Fix: uniformize code

Browse Source
This commit is contained in:
Regis Houssin 2011-06-14 18:19:09 +00:00
parent 18c9abe630
commit 3dbcb5c933
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/expedition/class/expedition.class.php
View File

@ -54,7 +54,8 @@ class Expedition extends CommonObject
var $origin; var $origin;
var $origin_id; var $origin_id;
var $lines=array(); var $lines=array();
var $expedition_method_id; var $expedition_method_id; // TODO deprecated
var $shipping_method_id;
var $statut; var $statut;
var $trueWeight; var $trueWeight;

9
htdocs/expedition/fiche.php
View File

@ -200,14 +200,13 @@ if ($action == 'reopen' && $user->rights->expedition->valider)
if ($action == 'setdate_livraison' && $user->rights->expedition->creer) if ($action == 'setdate_livraison' && $user->rights->expedition->creer)
{ {
//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year']; //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); $object->fetch($id);
$shipping->fetch($id); $result=$object->set_date_livraison($user,$datedelivery);
$result=$shipping->set_date_livraison($user,$datelivraison);
if ($result < 0) if ($result < 0)
{ {
$mesg='<div class="error">'.$shipping->error.'</div>'; $mesg='<div class="error">'.$object->error.'</div>';
} }
} }