admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add exception when trying to insert a new operation

Browse source
This commit is contained in:
Dany De Bontridder 2015-08-30 00:10:39 +02:00
parent de04ef10ba
commit 5bbe7ffdf2
3 changed files with 92 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

7
html/do.php
View file

@ -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

76
include/compta_ach.inc.php
View file

@ -249,44 +249,52 @@ else
echo '<div class="content">';
echo '<p class="notice">'.$p_msg.'</p>';
echo "<FORM class=\"print\"NAME=\"form_detail\" METHOD=\"POST\" >";
/* request for a predefined operation */
if ( isset($_REQUEST['pre_def']) && !isset($_POST['correct']))
try
{
// used a predefined operation
//
$op = new Pre_op_ach($cn);
$op->set_od_id($_REQUEST['pre_def']);
$p_post = $op->compute_array();
$Ledger->id = $_REQUEST ['p_jrn_predef'];
$p_post['p_jrn'] = $Ledger->id;
echo $Ledger->input($p_post);
echo '<div class="content">';
echo $Ledger->input_paid();
echo '</div>';
echo '<script>';
echo 'compute_all_ledger();';
echo '</script>';
echo "<FORM class=\"print\"NAME=\"form_detail\" METHOD=\"POST\" >";
/* request for a predefined operation */
if (isset($_REQUEST['pre_def'])&&!isset($_POST['correct']))
{
// used a predefined operation
//
$op=new Pre_op_ach($cn);
$op->set_od_id($_REQUEST['pre_def']);
$p_post=$op->compute_array();
$Ledger->id=$_REQUEST ['p_jrn_predef'];
$p_post['p_jrn']=$Ledger->id;
echo $Ledger->input($p_post);
echo '<div class="content">';
echo $Ledger->input_paid();
echo '</div>';
echo '<script>';
echo 'compute_all_ledger();';
echo '</script>';
}
else
{
echo $Ledger->input($array);
echo HtmlInput::hidden("p_action", "ach");
echo HtmlInput::hidden("sa", "p");
echo '<div class="content">';
echo $Ledger->input_paid();
echo '</div>';
echo '<script>';
echo 'compute_all_ledger();';
echo '</script>';
}
echo '<div class="content">';
echo HtmlInput::button('act', _('Actualiser'),
'onClick="compute_all_ledger();"');
echo HtmlInput::submit("view_invoice", _("Enregistrer"));
echo HtmlInput::reset(_('Effacer '));
echo '</div>';
echo "</FORM>";
}
else
catch (Exception $e)
{
echo $Ledger->input($array);
echo HtmlInput::hidden("p_action", "ach");
echo HtmlInput::hidden("sa", "p");
echo '<div class="content">';
echo $Ledger->input_paid();
echo '</div>';
echo '<script>';
echo 'compute_all_ledger();';
echo '</script>';
alert($e->getMessage());
return;
}
echo '<div class="content">';
echo HtmlInput::button('act', _('Actualiser'), 'onClick="compute_all_ledger();"');
echo HtmlInput::submit("view_invoice", _("Enregistrer"));
echo HtmlInput::reset(_('Effacer '));
echo '</div>';
echo "</FORM>";
if (!isset($_POST['e_date']) && $g_parameter->MY_DATE_SUGGEST=='Y')
echo create_script(" get_last_date()");
echo create_script(" update_name()");

78
include/compta_ven.inc.php
View file

@ -235,40 +235,43 @@ if ( is_msie() == 0 )
else
echo '<div class="content">';
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 '<div id="predef_form">';
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 '</div>';
echo '<div id="predef_form">';
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 '</div>';
echo '<div class="content">';
echo '<p class="notice">'.$p_msg.'</p>';
echo "<FORM class=\"print\" NAME=\"form_detail\" METHOD=\"POST\" >";
echo '<div class="content">';
echo '<p class="notice">'.$p_msg.'</p>';
try
{
echo "<FORM class=\"print\" NAME=\"form_detail\" METHOD=\"POST\" >";
/* request for a predefined operation */
if ( isset($_REQUEST['pre_def']) && ! isset($_POST['correct']) )
if (isset($_REQUEST['pre_def'])&&!isset($_POST['correct']))
{
// used a predefined operation
//
$op=new Pre_op_ven($cn);
$op=new Pre_op_ven($cn);
$op->set_od_id($_REQUEST['pre_def']);
$p_post=$op->compute_array();
$Ledger->id=$_REQUEST ['p_jrn_predef'];
@ -281,12 +284,12 @@ else
echo 'compute_all_ledger();';
echo '</script>';
}
else if ( isset ($_GET['create_invoice']))
else if (isset($_GET['create_invoice']))
{
$array=$Ledger->convert_from_follow($_GET ['ag_id']);
echo HtmlInput::hidden("ledger_type","VEN");
echo HtmlInput::hidden("ac",$_REQUEST['ac']);
echo HtmlInput::hidden("sa","p");
echo HtmlInput::hidden("ledger_type", "VEN");
echo HtmlInput::hidden("ac", $_REQUEST['ac']);
echo HtmlInput::hidden("sa", "p");
echo $Ledger->input($array);
echo '<div class="content">';
echo $Ledger->input_paid();
@ -297,9 +300,10 @@ else
}
else
{
echo HtmlInput::hidden("ledger_type","VEN");
echo HtmlInput::hidden("ac",$_REQUEST['ac']);
echo HtmlInput::hidden("sa","p");
echo HtmlInput::hidden("ledger_type", "VEN");
echo HtmlInput::hidden("ac", $_REQUEST['ac']);
echo HtmlInput::hidden("sa", "p");
echo $Ledger->input($array);
echo '<div class="content">';
echo $Ledger->input_paid();
@ -308,7 +312,13 @@ else
echo 'compute_all_ledger();';
echo '</script>';
}
echo '<div class="content">';
}
catch (Exception $e)
{
alert($e->getMessage());
return;
}
echo '<div class="content">';
echo HtmlInput::button('act',_('Actualiser'),'onClick="compute_all_ledger();"');