diff --git a/html/do.php b/html/do.php
index 552c6a56a..5bd759f23 100644
--- a/html/do.php
+++ b/html/do.php
@@ -207,7 +207,12 @@ if (isset($_REQUEST['ac']))
show_menu( $amenu_id[0]['pm_id_v2']);
show_menu($amenu_id[0]['pm_id_v1']);
} catch (Exception $e) {
- if ( $e->getCode() == 10 ) alert(_('Accès menu impossible'));
+ if ( $e->getCode() == 10 ) {
+ alert(_('Accès menu impossible'));
+ }
+ else {
+ alert($e->getTraceAsString());
+ }
}
}
else
diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php
index e031facea..f4f310487 100644
--- a/include/compta_ach.inc.php
+++ b/include/compta_ach.inc.php
@@ -249,44 +249,52 @@ else
echo '
';
echo '
'.$p_msg.'
';
-echo "
";
}
-else
+catch (Exception $e)
{
- echo $Ledger->input($array);
- echo HtmlInput::hidden("p_action", "ach");
- echo HtmlInput::hidden("sa", "p");
- echo '
';
- echo $Ledger->input_paid();
- echo '
';
- echo '';
+ alert($e->getMessage());
+ return;
}
-echo '
';
-echo HtmlInput::button('act', _('Actualiser'), 'onClick="compute_all_ledger();"');
-echo HtmlInput::submit("view_invoice", _("Enregistrer"));
-echo HtmlInput::reset(_('Effacer '));
-echo '
';
-echo "";
-
if (!isset($_POST['e_date']) && $g_parameter->MY_DATE_SUGGEST=='Y')
echo create_script(" get_last_date()");
echo create_script(" update_name()");
diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php
index 9b685bdca..13029b4fb 100644
--- a/include/compta_ven.inc.php
+++ b/include/compta_ven.inc.php
@@ -235,40 +235,43 @@ if ( is_msie() == 0 )
else
echo '
';
- if ( !isset($_REQUEST ['p_jrn']) )
+if (!isset($_REQUEST ['p_jrn']))
+{
+ $def_ledger=$Ledger->get_first('ven', 2);
+ if (empty($def_ledger))
{
- $def_ledger=$Ledger->get_first('ven',2);
- if (empty($def_ledger))
- {
- exit('Pas de journal disponible');
- }
- $Ledger->id=$def_ledger['jrn_def_id'];
+ exit('Pas de journal disponible');
}
- else
- $Ledger->id=$_REQUEST ['p_jrn'];
- if (isset ($_REQUEST['p_jrn_predef'])){
- $Ledger->id=$_REQUEST['p_jrn_predef'];
- }
+ $Ledger->id=$def_ledger['jrn_def_id'];
+}
+else
+ $Ledger->id=$_REQUEST ['p_jrn'];
+if (isset($_REQUEST['p_jrn_predef']))
+{
+ $Ledger->id=$_REQUEST['p_jrn_predef'];
+}
- echo '
';
- echo HtmlInput::hidden('p_jrn_predef', $Ledger->id);
- $op=new Pre_op_ven($cn);
- $op->set('ledger',$Ledger->id);
- $op->set('ledger_type',"VEN");
- $op->set('direct','f');
- $url=http_build_query(array('p_jrn_predef'=>$Ledger->id,'ac'=>$_REQUEST['ac'],'gDossier'=>dossier::id()));
- echo $op->form_get('do.php?'.$url);
- echo '
';
+echo '
';
+echo HtmlInput::hidden('p_jrn_predef', $Ledger->id);
+$op=new Pre_op_ven($cn);
+$op->set('ledger',$Ledger->id);
+$op->set('ledger_type',"VEN");
+$op->set('direct','f');
+$url=http_build_query(array('p_jrn_predef'=>$Ledger->id,'ac'=>$_REQUEST['ac'],'gDossier'=>dossier::id()));
+echo $op->form_get('do.php?'.$url);
+echo '
';
- echo '
';
- echo '
'.$p_msg.'
';
- echo "