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

Merge pull request #1 from Dolibarr/develop

Browse Source 
Fix status was not refreshed
This commit is contained in:
Conspir3D 2018-01-19 11:11:53 +01:00 committed by GitHub
commit 15e1c5d1ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/compta/prelevement/card.php
View File

@ -240,13 +240,13 @@ if ($id > 0 || $ref)
print '<form method="post" name="userfile" action="card.php?id='.$object->id.'" enctype="multipart/form-data">'; print '<form method="post" name="userfile" action="card.php?id='.$object->id.'" enctype="multipart/form-data">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="infotrans">'; print '<input type="hidden" name="action" value="infotrans">';
print '<table class="border" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("NotifyTransmision").'</td></tr>'; print '<td colspan="3">'.$langs->trans("NotifyTransmision").'</td></tr>';
print '<tr '.$bc[false].'><td width="20%">'.$langs->trans("TransData").'</td><td>'; print '<tr class="oddeven"><td>'.$langs->trans("TransData").'</td><td>';
print $form->select_date('','','','','',"userfile",1,1); print $form->select_date('','','','','',"userfile",1,1);
print '</td></tr>'; print '</td></tr>';
print '<tr '.$bc[false].'><td width="20%">'.$langs->trans("TransMetod").'</td><td>'; print '<tr class="oddeven"><td>'.$langs->trans("TransMetod").'</td><td>';
print $form->selectarray("methode",$object->methodes_trans); print $form->selectarray("methode",$object->methodes_trans);
print '</td></tr>'; print '</td></tr>';
/* print '<tr><td width="20%">'.$langs->trans("File").'</td><td>'; /* print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
@ -256,6 +256,7 @@ if ($id > 0 || $ref)
print '</table><br>'; print '</table><br>';
print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("SetToStatusSent")).'"></div>'; print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("SetToStatusSent")).'"></div>';
print '</form>'; print '</form>';
print '<br>';
} }
if (! empty($object->date_trans) && $object->date_credit == 0 && $user->rights->prelevement->bons->credit && $action=='setcredited') if (! empty($object->date_trans) && $object->date_credit == 0 && $user->rights->prelevement->bons->credit && $action=='setcredited')
@ -263,16 +264,17 @@ if ($id > 0 || $ref)
print '<form name="infocredit" method="post" action="card.php?id='.$object->id.'">'; print '<form name="infocredit" method="post" action="card.php?id='.$object->id.'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="infocredit">'; print '<input type="hidden" name="action" value="infocredit">';
print '<table class="border" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("NotifyCredit").'</td></tr>'; print '<td colspan="3">'.$langs->trans("NotifyCredit").'</td></tr>';
print '<tr '.$bc[false].'><td>'.$langs->trans('CreditDate').'</td><td>'; print '<tr class="oddeven"><td>'.$langs->trans('CreditDate').'</td><td>';
print $form->select_date('','','','','',"infocredit",1,1); print $form->select_date('','','','','',"infocredit",1,1);
print '</td></tr>'; print '</td></tr>';
print '</table>'; print '</table>';
print '<br>'.$langs->trans("ThisWillAlsoAddPaymentOnInvoice"); print '<br>'.$langs->trans("ThisWillAlsoAddPaymentOnInvoice");
print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("ClassCredited")).'"></div>'; print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("ClassCredited")).'"></div>';
print '</form>'; print '</form>';
print '<br>';
} }

8
htdocs/compta/prelevement/class/bonprelevement.class.php
View File

@ -519,6 +519,9 @@ class BonPrelevement extends CommonObject
*/ */
if ($error == 0) if ($error == 0)
{ {
$this->date_credit = $date;
$this->statut = 1;
$this->db->commit(); $this->db->commit();
return 0; return 0;
} }
@ -584,13 +587,16 @@ class BonPrelevement extends CommonObject
// TODO Call trigger to create a notification using notification module // TODO Call trigger to create a notification using notification module
} }
else else
{ {
$error++; $error++;
} }
if ($error == 0) if ($error == 0)
{ {
$this->date_trans = $date;
$this->statut = 1;
$this->db->commit(); $this->db->commit();
return 0; return 0;
} }
else else