[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 06/65: Add exception when trying to insert a
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 06/65: Add exception when trying to insert a new operation |
Date: |
Wed, 09 Sep 2015 08:27:01 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 5bbe7ffdf2cd0c30f14e29b052edf0ee8d6fca7e
Author: Dany De Bontridder <address@hidden>
Date: Sun Aug 30 00:10:39 2015 +0200
Add exception when trying to insert a new operation
---
html/do.php | 7 +++-
include/compta_ach.inc.php | 76 +++++++++++++++++++++++-------------------
include/compta_ven.inc.php | 78 +++++++++++++++++++++++++-------------------
3 files changed, 92 insertions(+), 69 deletions(-)
diff --git a/html/do.php b/html/do.php
index 552c6a5..5bd759f 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 e031fac..f4f3104 100644
--- a/include/compta_ach.inc.php
+++ b/include/compta_ach.inc.php
@@ -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()");
diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php
index 9b685bd..13029b4 100644
--- a/include/compta_ven.inc.php
+++ b/include/compta_ven.inc.php
@@ -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();"');
- [Noalyss-commit] [noalyss] branch master updated (25a649a -> 8bd21d9), Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 01/65: remove comment, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 03/65: Bug : when trying to access a event the user can't access, the javascript failed, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 04/65: Event : fix position of the modal window + filter on the last event, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 02/65: Esthetic, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 06/65: Add exception when trying to insert a new operation,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 08/65: esthetic, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 09/65: duplicate in navigator, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 12/65: avoid problem with cache for static file, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 05/65: Esthetic + the parent template is mandatory, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 07/65: Ethetic button confirm and alert, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 13/65: Manuel and reduce size logo, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 14/65: bug in redirect, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 10/65: Esthetic + upgrade db, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 16/65: order by receipt number in dashboard, Dany De Bontridder, 2015/09/09
- [Noalyss-commit] [noalyss] 11/65: Esthetic, Dany De Bontridder, 2015/09/09