Merge branch 'master' into r700-currency
This commit is contained in:
commit
958b30a758
14 changed files with 4318 additions and 1939 deletions
|
|
@ -309,10 +309,12 @@ if (isset($_REQUEST['ac']))
|
|||
echo '<a class="button" href="do.php?'.Dossier::get().'">';
|
||||
echo _('Retour');
|
||||
echo '</a>';
|
||||
return;
|
||||
}
|
||||
else {
|
||||
alert($e->getMessage());
|
||||
record_log($e->getTraceAsString());
|
||||
throw $e;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -343,6 +345,7 @@ else
|
|||
{
|
||||
echo $exc->getMessage();
|
||||
record_log($exc->getTraceAsString());
|
||||
throw $e;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue