Merge branch 'dev7400-1' into next-release-8
This commit is contained in:
commit
b9c1bdfa3e
47 changed files with 138 additions and 82 deletions
|
|
@ -19,8 +19,8 @@ div.calendar { position: relative; z-index:13; }
|
|||
border-radius: 0px;
|
||||
}
|
||||
|
||||
.calendar .nav {
|
||||
background: #778 url(menuarrow.gif) no-repeat 100% 100%;
|
||||
.calendar .nav1 {
|
||||
#background: #778 url(menuarrow.gif) no-repeat 100% 100%;
|
||||
}
|
||||
|
||||
.calendar thead .title { /* This holds the current "month, year" */
|
||||
|
|
|
|||
|
|
@ -879,7 +879,6 @@ function reverseOperation(obj)
|
|||
{
|
||||
var qs = $(obj).serialize()+ "&op=ledger";
|
||||
g('ext' + obj.divname).style.display = 'none';
|
||||
g('bext' + obj.divname).style.display = 'none';
|
||||
waiting_box();
|
||||
new Ajax.Request(
|
||||
"ajax_misc.php",
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ Calendar._SDN = new Array
|
|||
("Dim",
|
||||
"Lun",
|
||||
"Mar",
|
||||
"Mar",
|
||||
"Mer",
|
||||
"Jeu",
|
||||
"Ven",
|
||||
"Sam",
|
||||
|
|
|
|||
|
|
@ -28,6 +28,11 @@ require_once NOALYSS_INCLUDE.'/class/acc_ledger.class.php';
|
|||
require_once NOALYSS_INCLUDE.'/class/acc_ledger_search.class.php';
|
||||
require_once NOALYSS_INCLUDE.'/lib/icon_action.class.php';
|
||||
require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
|
||||
if ( ! isset ($_SESSION['g_theme']))
|
||||
{
|
||||
echo "<h2>"._('Vous êtes déconnecté')."</h2>";
|
||||
die();
|
||||
}
|
||||
|
||||
html_page_start($_SESSION['g_theme']);
|
||||
|
||||
|
|
@ -69,7 +74,7 @@ window.onload=function ()
|
|||
{
|
||||
create_anchor_up();
|
||||
init_scroll();
|
||||
sorttable.init
|
||||
sorttable.init();
|
||||
}
|
||||
</script>
|
||||
<?php
|
||||
|
|
@ -118,10 +123,17 @@ if ( isset ($_GET['viewsearch']))
|
|||
/*
|
||||
* Export to csv
|
||||
*/
|
||||
$r=HtmlInput::get_to_hidden(array('l','date_start','date_end','desc','amount_min','amount_max','qcode','accounting','unpaid','gDossier','ledger_type'));
|
||||
$r=HtmlInput::get_to_hidden(array('l','date_start','date_end','desc','amount_min','amount_max',
|
||||
'qcode','accounting','unpaid','gDossier','ledger_type'));
|
||||
if (isset($_GET['r_jrn'])) {
|
||||
foreach ($_GET['r_jrn'] as $k=>$v)
|
||||
$r.=HtmlInput::hidden('r_jrn['.$k.']',$v);
|
||||
$http=new HttpInput();
|
||||
$a_rjrn=$http->get("r_jrn","array");
|
||||
foreach ($a_rjrn as $k=>$v) {
|
||||
// Protect : check that $k and $v are numeric
|
||||
if (isNumber($k)&&isNumber($v)) {
|
||||
$r.=HtmlInput::hidden('r_jrn['.$k.']',$v);
|
||||
}
|
||||
}
|
||||
}
|
||||
echo '<form action="export.php" method="get">';
|
||||
echo $r;
|
||||
|
|
|
|||
|
|
@ -1539,6 +1539,7 @@ div.box {
|
|||
float:left;
|
||||
font-size:14px;
|
||||
font-size:0.90rem;
|
||||
border-radius:5px;
|
||||
}
|
||||
@media only screen and (max-width: 1426px) {
|
||||
div.box {
|
||||
|
|
@ -2471,4 +2472,4 @@ span.title_tab_row {
|
|||
background-color: #000066 !important;
|
||||
color : white !important;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ if ($sub_action == "update")
|
|||
$act->get();
|
||||
$act->fromArray($_POST);
|
||||
$error_id=$e->getCode();
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
}
|
||||
}
|
||||
//----------------------------------------------------------------------
|
||||
|
|
@ -296,7 +296,7 @@ if ($sub_action == "save_action_st2")
|
|||
echo '</span>';
|
||||
$sub_action="add_action";
|
||||
$error_id=$e->getCode();
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
}
|
||||
}
|
||||
//--------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ case 'rmfa':
|
|||
{
|
||||
$cn->rollback();
|
||||
record_log($e->getMessage());
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
echo $e->getMessage();
|
||||
}
|
||||
$html=ob_get_contents();
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ try {
|
|||
}catch (Exception $e )
|
||||
{
|
||||
record_log($e->getMessage());
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ case 'rmop':
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
$e->getMessage();
|
||||
$cn->rollback();
|
||||
}
|
||||
|
|
@ -207,7 +207,7 @@ case 'de':
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
echo Icon_Action::close($div);
|
||||
echo '<h2 class="error">'._("Désolé il y a une erreur").'</h2>';
|
||||
}
|
||||
|
|
@ -512,7 +512,7 @@ case 'save':
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
if ( DEBUG ) echo $e->getMessage();
|
||||
alert(_( "Changement impossible: on ne peut pas changer la date dans une période fermée"));
|
||||
}
|
||||
|
|
@ -570,7 +570,7 @@ case 'reverseop':
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
echo $e->getMessage();
|
||||
$cn->rollback();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ switch ($act)
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
$html=$e->getTrace();
|
||||
throw $e;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ try
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ switch ($op)
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
echo span($e->getMessage(), ' class="notice"');
|
||||
Anc_Key::display_list();
|
||||
Anc_Key::key_add();
|
||||
|
|
|
|||
|
|
@ -145,8 +145,8 @@ if ($sa=="pa_detail")
|
|||
$accounting->add_json_param("pa_id", $pa_id);
|
||||
$accounting->set_sort_column("po_name");
|
||||
ob_start();
|
||||
$accounting->display_table(" where pa_id = $1 order by po_name ",array($pa_id));
|
||||
$accounting->create_js_script();
|
||||
$accounting->display_table(" where pa_id = $1 order by po_name ",array($pa_id));
|
||||
$ret.=ob_get_clean();
|
||||
$ret.= '</div>';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ if ( isset($_POST['save']))
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
alert($e->getMessage());
|
||||
$cn->rollback();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ if ( $action_frm == 'update')
|
|||
} catch (Exception $e)
|
||||
{
|
||||
record_log($e->getMessage());
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
alert($e->getMessage());
|
||||
}
|
||||
}
|
||||
|
|
@ -88,7 +88,7 @@ if ($action_frm == 'delete' )
|
|||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getMessage());
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
alert ($e->getMessage());
|
||||
}
|
||||
|
||||
|
|
@ -111,7 +111,7 @@ if (isset($_POST['add']))
|
|||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getMessage());
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
alert($e->getMessage());
|
||||
}
|
||||
}
|
||||
|
|
@ -146,7 +146,7 @@ switch ($sa)
|
|||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getMessage());
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
alert($e->getMessage());
|
||||
}
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -284,7 +284,7 @@ class Acc_Bilan
|
|||
}
|
||||
catch(Exception $Ex)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
echo $Ex->getMessage();
|
||||
throw $Ex;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -389,7 +389,7 @@ class Acc_Ledger extends jrn_def_sql
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
$this->db->rollback();
|
||||
throw $e;
|
||||
}
|
||||
|
|
@ -869,7 +869,7 @@ class Acc_Ledger extends jrn_def_sql
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
if ($e->getCode()==1)
|
||||
{
|
||||
echo _("Aucune période ouverte");
|
||||
|
|
@ -1503,7 +1503,7 @@ class Acc_Ledger extends jrn_def_sql
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
$this->db->rollback();
|
||||
echo _('OPERATION ANNULEE ');
|
||||
echo '<hr>';
|
||||
|
|
@ -2307,7 +2307,7 @@ class Acc_Ledger extends jrn_def_sql
|
|||
catch (Exception $e)
|
||||
{
|
||||
$cn->rollback();
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
}
|
||||
$cn->commit();
|
||||
}
|
||||
|
|
@ -2576,7 +2576,7 @@ class Acc_Ledger extends jrn_def_sql
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
throw $e;
|
||||
}
|
||||
}
|
||||
|
|
@ -2850,7 +2850,7 @@ class Acc_Ledger extends jrn_def_sql
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
throw $e;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1076,7 +1076,7 @@ class Acc_Ledger_Fin extends Acc_Ledger
|
|||
__FILE__ . ':' . __LINE__ . ' ' .
|
||||
$e->getMessage();
|
||||
$this->db->rollback();
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
throw new Exception($r);
|
||||
}
|
||||
$this->db->commit();
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ class Acc_Ledger_Info
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
echo "Echec sauvegarde info additionnelles";
|
||||
throw $e;
|
||||
}
|
||||
|
|
@ -86,7 +86,7 @@ class Acc_Ledger_Info
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
$this->cn->rollback();
|
||||
echo "Echec sauvegarde info additionnelles";
|
||||
throw $e;
|
||||
|
|
|
|||
|
|
@ -1041,7 +1041,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
|
|||
}//end try
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
echo '<span class="error">'.
|
||||
'Erreur dans l\'enregistrement '.
|
||||
__FILE__.':'.__LINE__.' '.
|
||||
|
|
@ -1149,7 +1149,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
if ($e->getCode() == 1 )
|
||||
{
|
||||
throw new Exception( _("Aucune période ouverte"));
|
||||
|
|
|
|||
|
|
@ -716,8 +716,7 @@ class Acc_Ledger_Sold extends Acc_Ledger {
|
|||
}
|
||||
}
|
||||
} catch (Exception $e) {
|
||||
record_log($e->getMessage());
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
echo '<span class="error">' .
|
||||
'Erreur dans l\'enregistrement ' .
|
||||
__FILE__ . ':' . __LINE__ . ' ' .
|
||||
|
|
|
|||
|
|
@ -609,8 +609,8 @@ class Acc_Operation
|
|||
$ret=new Acc_Fin($this->db,$this->jr_id);
|
||||
break;
|
||||
default:
|
||||
$ret=new Acc_Misc($this->db,$this->jr_id);
|
||||
break;
|
||||
$ret=new Acc_Misc($this->db,$this->jr_id);
|
||||
break;
|
||||
}
|
||||
$ret->get();
|
||||
if ( empty($ret->det->array))
|
||||
|
|
@ -791,9 +791,20 @@ class Acc_Operation
|
|||
}
|
||||
|
||||
$r.="</p>";
|
||||
$r.=HtmlInput::simple_array_to_hidden($array);
|
||||
|
||||
//
|
||||
// For Misc Operation , if a card is given then there is no accounting
|
||||
if ( $operation->signature==="ODS") {
|
||||
$nb_array=count($array);
|
||||
for ($i=0;$i<$nb_array;$i++) {
|
||||
if (isset ($array["qc_".$i] ) && $array["qc_".$i] != "" ) {
|
||||
$array["poste".$i]="";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// transform the operation into hidden element
|
||||
$r.=HtmlInput::simple_array_to_hidden($array);
|
||||
|
||||
$r.=HtmlInput::submit(uniqid(), _("Dupliquer"));
|
||||
$r.='</form>';
|
||||
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ class Acc_Report
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
$this->db->rollback();
|
||||
echo $e->getMessage();
|
||||
}
|
||||
|
|
@ -258,7 +258,7 @@ class Acc_Report
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
$this->db->rollback();
|
||||
echo $e->getMessage();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ class Anc_Account_Table extends Manage_Table_SQL
|
|||
$table->po_name=str_replace(">", '', $table->po_name);
|
||||
|
||||
// po_name must be uniq in the Analytic Plan
|
||||
if ( $cn->get_value("select count(*) from poste_analytique where pa_id=$1 and po_name=$2 and po_id != $3",
|
||||
if ( $cn->get_value("select count(*) from poste_analytique where pa_id=$1 and po_name=upper($2) and po_id != $3",
|
||||
array($table->pa_id,$table->po_name,$table->po_id)) > 0)
|
||||
{
|
||||
$is_error++;
|
||||
|
|
@ -90,4 +90,36 @@ class Anc_Account_Table extends Manage_Table_SQL
|
|||
if ($is_error==0)return TRUE;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief display a data row in the table, with the order defined
|
||||
* in a_order and depending of the visibility of the column
|
||||
*/
|
||||
function display_row($p_row)
|
||||
{
|
||||
$cn=Dossier::connect();
|
||||
$count=$cn->get_value("select count(*) from public.operation_analytique where po_id=$1",[$p_row["po_id"]]);
|
||||
$p_row["po_name"]=sprintf("%s (%d)",$p_row['po_name'],$count);
|
||||
parent::display_row($p_row);
|
||||
}
|
||||
|
||||
/**
|
||||
* Before deleting , we check that nothing is in a closed periode
|
||||
*/
|
||||
function delete() {
|
||||
$cn=Dossier::connect();
|
||||
$count_closed=$cn->get_value(" select count(*)
|
||||
from jrnx as jx1
|
||||
join jrn jn1 on (jx1.j_grpt = jn1.jr_grpt_id )
|
||||
join jrn_def as jf1 on (jn1.jr_def_id =jf1.jrn_def_id )
|
||||
join jrn_periode as je1 on (jf1.jrn_def_id =je1.jrn_def_id )
|
||||
join operation_analytique as oa on (oa.j_id =jx1.j_id )
|
||||
where
|
||||
je1.status = 'CL' and oa.po_id=$1 ",[$this->table->po_id]);
|
||||
if ( $count_closed > 0 ) {
|
||||
throw new \Exception(_("Effacement impossible : le poste est utilisé dans une période fermée"));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ class Anc_Group_Operation
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
echo $e->getTrace();
|
||||
$this->db->rollback();
|
||||
throw new Exception($e);
|
||||
|
|
@ -260,7 +260,7 @@ class Anc_Group_Operation
|
|||
}
|
||||
catch (Exception $ex)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
echo '<span class="error">'.
|
||||
'Erreur dans l\'enregistrement '.
|
||||
__FILE__.':'.__LINE__.' '.
|
||||
|
|
|
|||
|
|
@ -268,7 +268,7 @@ class Anc_Key
|
|||
{
|
||||
|
||||
if ( DEBUG ) { echo $e->getTraceAsString(); } else { echo _('erreur').$e->getMessage();}
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
$cn->rollback();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -505,7 +505,7 @@ class Anc_Operation
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
}
|
||||
}
|
||||
/*!\brief display the form for PA
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ class Default_Menu
|
|||
}
|
||||
} catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
echo $e->getMessage();
|
||||
throw $e;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ class Document_modele
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
rollback($this->cn);
|
||||
return ;
|
||||
}
|
||||
|
|
@ -360,7 +360,7 @@ class Document_modele
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
rollback($this->cn);
|
||||
return ;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ class Document_type
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
alert(j(_("Impossible d'ajouter [$p_value] ") . $e->getMessage()));
|
||||
}
|
||||
}
|
||||
|
|
@ -120,7 +120,7 @@ class Document_type
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
alert(" Erreur " . $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
|
@ -133,7 +133,7 @@ class Document_type
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
alert("Erreur " . $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -326,7 +326,7 @@ class Dossier
|
|||
{
|
||||
|
||||
echo_warning($e->getMessage());
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
$cn->rollback();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -937,7 +937,7 @@ class Fiche
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e->getMessage()." ".$e->getTraceAsString());
|
||||
$this->cn->rollback();
|
||||
throw ($e);
|
||||
return;
|
||||
|
|
@ -1133,7 +1133,7 @@ class Fiche
|
|||
$e->getMessage().
|
||||
'</span>';
|
||||
record_log($e->getMessage());
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
$this->cn->rollback();
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ class Fiche_Attr
|
|||
$this->cn->exec_sql($this->ad_extra);
|
||||
}catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
throw new Exception ("La requête SQL ".h($this->ad_extra)." est invalide ");
|
||||
}
|
||||
}
|
||||
|
|
@ -161,7 +161,7 @@ class Fiche_Attr
|
|||
);
|
||||
} catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
throw $e;
|
||||
}
|
||||
|
||||
|
|
@ -185,7 +185,7 @@ class Fiche_Attr
|
|||
);
|
||||
}catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
throw $e;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -104,6 +104,7 @@ class Follow_Up
|
|||
$this->aAction_detail=array();
|
||||
$this->operation="";
|
||||
$this->action="";
|
||||
$this->f_dest_id=0;
|
||||
}
|
||||
/**
|
||||
* Create a filter based on the current user,
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@ class Periode
|
|||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getMessage()." - ".$e->getCode());
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
$this->cn->rollback();
|
||||
throw $e;
|
||||
}
|
||||
|
|
@ -495,7 +495,7 @@ class Periode
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
$this->cn->rollback();
|
||||
throw $e;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ class Pre_op_ach extends Pre_operation_detail
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
echo ($e->getMessage());
|
||||
$this->db->rollback();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ class Pre_Op_Advanced extends Pre_operation_detail
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
echo ($e->getMessage());
|
||||
$this->db->rollback();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ class Pre_op_fin extends Pre_operation_detail
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
echo ($e->getMessage());
|
||||
$this->db->rollback();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ class Pre_op_ods extends Pre_operation_detail
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
echo ($e->getMessage());
|
||||
$this->db->rollback();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ class Pre_op_ven extends Pre_operation_detail
|
|||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
record_log($e->getTraceAsString());
|
||||
record_log($e);
|
||||
echo ($e->getMessage());
|
||||
$this->db->rollback();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,8 +53,8 @@ class Tva_Rate_MTable extends Manage_Table_SQL
|
|||
$this->set_col_label("tva_purchase", _("TVA Achat (D)"));
|
||||
$this->set_col_type("tva_both_side", "select",
|
||||
array(
|
||||
["value"=>0, "label"=>_("Normal")],
|
||||
["value"=>1, "label"=>_("Autoliquidation")]
|
||||
["value"=>0, "label"=>_("Non")],
|
||||
["value"=>1, "label"=>_("Oui")]
|
||||
));
|
||||
$this->set_property_updatable("tva_id", FALSE);
|
||||
$this->set_col_label("tva_payment_purchase",_("Exigible achat"));
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@ define ("noalyss_psql_host","localhost");
|
|||
// If you change the NOALYSS_ADMINISTRATOR , you will need to rerun http://..../noalyss/html/install.php
|
||||
// But it doesn't change the password
|
||||
define ("NOALYSS_ADMINISTRATOR","admin");
|
||||
// used only for install
|
||||
define ("NOALYSS_ADMIN_PASSWORD","");
|
||||
define ("LOCALE",1);
|
||||
define ("domaine","");
|
||||
define ("MULTI",1);
|
||||
|
|
|
|||
|
|
@ -1331,9 +1331,8 @@ function is_msie()
|
|||
*/
|
||||
function record_log($p_message)
|
||||
{
|
||||
error_log("noalyss".$p_message,0);
|
||||
error_log("noalyss GET [".var_export($_GET, true)."]",0);
|
||||
error_log( "noalyss POST [".var_export($_POST, true)."]",0);
|
||||
error_log("noalyss".print_r($p_message,true),0);
|
||||
error_log("noalyss GET [".var_export($_GET, true)."] POST [".var_export($_POST, true)."]",0);
|
||||
}
|
||||
if(!function_exists('tracedebug')) {
|
||||
function tracedebug($file,$var, $label = NULL) {
|
||||
|
|
|
|||
|
|
@ -1037,7 +1037,7 @@ function check()
|
|||
{
|
||||
$s1=$xml->createElement("status", "NOK");
|
||||
$s2=$xml->createElement("ctl_row",
|
||||
$this->object_name+"_"+$this->table->get_pk_value());
|
||||
$this->object_name."_".$this->table->get_pk_value());
|
||||
$s4=$xml->createElement("ctl", $this->object_name);
|
||||
$s3=$xml->createElement("html", $ex->getTraceAsString());
|
||||
$root=$xml->createElement("data");
|
||||
|
|
@ -1113,7 +1113,7 @@ function check()
|
|||
$s1=$xml->createElement("status", "NOK");
|
||||
$s3=$xml->createElement("ctl", $this->object_name);
|
||||
$s2=$xml->createElement("ctl_row",
|
||||
$this->object_name+"_"+$this->table->get_pk_value());
|
||||
$this->object_name."_".$this->table->get_pk_value());
|
||||
$s4=$xml->createElement("html", $ex->getTraceAsString());
|
||||
|
||||
$root=$xml->createElement("data");
|
||||
|
|
|
|||
|
|
@ -74,8 +74,8 @@ content[40]="<?php echo escape_xml(_("Laissez à 0 pour ne pas changer le numér
|
|||
content[41]="<?php echo escape_xml(_("Mettez le pourcentage <br> à zéro pour effacer la ligne"))?>";
|
||||
content[42]="<?php echo escape_xml(_("Selectionnez le plan qui vous intéresse avant de cliquer sur Recherche"))?>";
|
||||
content[43]="<?php echo escape_xml(_("Autoliquidation : Utilisé en même temps au crédit et au débit"))?>";
|
||||
content[44]="<?php echo escape_xml(_("Ne donner pas ce poste comptable si ce code n'est pas utilisé à l'achat"))?>";
|
||||
content[45]="<?php echo escape_xml(_("Ne donner pas ce poste comptable si ce code n'est pas utilisé à la vente"))?>";
|
||||
content[44]="<?php echo escape_xml(_("Ne donnez pas ce poste comptable si ce code n'est pas utilisé à l'achat"))?>";
|
||||
content[45]="<?php echo escape_xml(_("Ne donnez pas ce poste comptable si ce code n'est pas utilisé à la vente"))?>";
|
||||
content[46]="<?php echo escape_xml(_("Un instant svp"))?>";
|
||||
content[47]="<?php echo escape_xml(_("Vous confirmez ?"))?>";
|
||||
content[48]="<?php echo escape_xml(_("Echec "))?>";
|
||||
|
|
@ -107,4 +107,4 @@ content[73]="<?php echo _("Mettre à oui pour un journal dédié uniquement aux
|
|||
content[74]="<?php echo _('TVA due ou récupérable quand l\'opération est payée ou exécutée')?>";
|
||||
content[75]="<?php echo _('Journaux Achat ou vente en mode simple, TVA ou détaillé')?>";
|
||||
content[76]="<?php echo _('Il est conseillé d\'avoir un quickcode de moins de 9 car.')?>";
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -1257,7 +1257,7 @@ function _dochecks()
|
|||
if(ini_get('mbstring.func_overload') & 2)
|
||||
$this->Error('mbstring overloading must be disabled');
|
||||
// Ensure runtime magic quotes are disabled
|
||||
if(get_magic_quotes_runtime())
|
||||
if(version_compare(PHP_VERSION, '7.3.0','<') && get_magic_quotes_runtime())
|
||||
@set_magic_quotes_runtime(0);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@ operation_currency
|
|||
join jrnx using (j_id)
|
||||
group by f_id,j_id;
|
||||
|
||||
commit ;
|
||||
commit ;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue