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

Fix: When closing shipment, status was not visible until refresh.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-10-18 16:27:15 +02:00
parent 0193b31a37
commit 9c69ab966f
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/expedition/card.php
View File

@ -1042,7 +1042,7 @@ else if ($id || $ref)
} }
/* /*
* Confirmation de l'annulation * Confirmation de l'annulation
*/ */
if ($action == 'annuler') if ($action == 'annuler')
{ {
print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('CancelSending'),$langs->trans("ConfirmCancelSending",$object->ref),'confirm_cancel','',0,1); print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('CancelSending'),$langs->trans("ConfirmCancelSending",$object->ref),'confirm_cancel','',0,1);

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

@ -1547,10 +1547,14 @@ class Expedition extends CommonObject
global $conf; global $conf;
$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut=2'; $sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut=2';
$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0 ;'; $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
if ($this->db->query($sql) )
$resql=$this->db->query($sql);
if ($resql)
{ {
//TODO: Option to set order billed if 100% of order is shipped //TODO: Option to set order billed if 100% of order is shipped
$this->statut=2;
$this->billed=1;
return 1; return 1;
} }
else else