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

Merge branch 'dev7400-1' into next-release-8

Browse source
This commit is contained in:
Dany De Bontridder 2020-07-17 11:50:04 +02:00
commit b9c1bdfa3e
47 changed files with 138 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/class/acc_bilan.class.php
View file

@ -284,7 +284,7 @@ class Acc_Bilan
}
catch(Exception $Ex)
{
record_log($e->getTraceAsString());
record_log($e);
echo $Ex->getMessage();
throw $Ex;
}

12
include/class/acc_ledger.class.php
View file

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

2
include/class/acc_ledger_fin.class.php
View file

@ -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();

4
include/class/acc_ledger_info.class.php
View file

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

4
include/class/acc_ledger_purchase.class.php
View file

@ -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"));

3
include/class/acc_ledger_sold.class.php
View file

@ -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__ . ' ' .

19
include/class/acc_operation.class.php
View file

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

4
include/class/acc_report.class.php
View file

@ -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();
}

34
include/class/anc_account_table.class.php
View file

@ -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"));
}
}
}

4
include/class/anc_group_operation.class.php
View file

@ -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__.' '.

2
include/class/anc_key.class.php
View file

@ -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();
}
}

2
include/class/anc_operation.class.php
View file

@ -505,7 +505,7 @@ class Anc_Operation
}
catch (Exception $e)
{
record_log($e->getTraceAsString());
record_log($e);
}
}
/*!\brief display the form for PA

2
include/class/default_menu.class.php
View file

@ -106,7 +106,7 @@ class Default_Menu
}
} catch (Exception $e)
{
record_log($e->getTraceAsString());
record_log($e);
echo $e->getMessage();
throw $e;
}

4
include/class/document_modele.class.php
View file

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

6
include/class/document_type.class.php
View file

@ -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());
}
}

2
include/class/dossier.class.php
View file

@ -326,7 +326,7 @@ class Dossier
{
echo_warning($e->getMessage());
record_log($e->getTraceAsString());
record_log($e);
$cn->rollback();
}
}

4
include/class/fiche.class.php
View file

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

6
include/class/fiche_attr.class.php
View file

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

1
include/class/follow_up.class.php
View file

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

4
include/class/periode.class.php
View file

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

2
include/class/pre_op_ach.class.php
View file

@ -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();
}

2
include/class/pre_op_advanced.class.php
View file

@ -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();
}

2
include/class/pre_op_fin.class.php
View file

@ -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();
}

2
include/class/pre_op_ods.class.php
View file

@ -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();
}

2
include/class/pre_op_ven.class.php
View file

@ -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();
}

4
include/class/tva_rate_mtable.class.php
View file

@ -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"));