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

Merge tag 'rel6816'

Browse source 
Conflicts:
	include/constant.php
This commit is contained in:
Dany De Bontridder 2015-08-21 18:07:14 +02:00
commit 5650459a5d
7 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
html/index.php
View file

@ -219,7 +219,7 @@ if (defined("RECOVER") && isset ($_REQUEST['recover']) )
}
echo '
<span style="background-color:#879ed4;color:white;padding-left:4px;padding-right:4px;">
version 6.8.1.5 - '.$my_domain.'
version 6.8.1.6 - '.$my_domain.'
</span>
<BR>
<BR>

4
include/class_acc_ledger.php
View file

@ -2387,7 +2387,7 @@ class Acc_Ledger extends jrn_def_sql
return true;
if ($g_parameter->MY_STRICT == 'N')
return false;
throw Exception("Valeur invalid " . __FILE__ . ':' . __LINE__);
throw new Exception("Valeur invalid " . __FILE__ . ':' . __LINE__);
}
/**
@ -2403,7 +2403,7 @@ class Acc_Ledger extends jrn_def_sql
return true;
if ($g_parameter->MY_CHECK_PERIODE == 'N')
return false;
throw Exception("Valeur invalid " . __FILE__ . ':' . __LINE__);
throw new Exception("Valeur invalid " . __FILE__ . ':' . __LINE__);
}
/**

6
include/class_acc_ledger_fin.php
View file

@ -292,7 +292,7 @@ class Acc_Ledger_Fin extends Acc_Ledger
{
if ($e->getCode() == 1)
{
throw Exception(_("Aucune période ouverte"));
throw new Exception(_("Aucune période ouverte"));
}
}
@ -967,7 +967,7 @@ class Acc_Ledger_Fin extends Acc_Ledger
__FILE__ . ':' . __LINE__ . ' ' .
$e->getMessage();
$this->db->rollback();
throw Exception($r);
throw new Exception($r);
}
$this->db->commit();
$r = "";
@ -1012,7 +1012,7 @@ class Acc_Ledger_Fin extends Acc_Ledger
$wLedger = $this->select_ledger('fin', 3);
if ($wLedger == null)
throw Exception(_('Pas de journal disponible'));
throw new Exception(_('Pas de journal disponible'));
if (count($wLedger->value) > 1)
{

6
include/class_acc_ledger_info.php
View file

@ -51,7 +51,7 @@ class Acc_Ledger_Info
{
echo 'Appel incorrecte '.__FILE__.__LINE__;
var_dump($this);
throw Exception(_('appel incorrect'));
throw new Exception(_('appel incorrect'));
}
try
{
@ -75,7 +75,7 @@ class Acc_Ledger_Info
{
echo 'Appel incorrecte '.__FILE__.__LINE__;
var_dump($this);
throw Exception('appel incorrect');
throw new Exception('appel incorrect');
}
try
{
@ -136,7 +136,7 @@ class Acc_Ledger_Info
if ( ! isset ($this->jr_id) )
{
echo "jr_id is not set ".__FILE__.__LINE__;
throw Exception('Error : jr_id not set');
throw new Exception('Error : jr_id not set');
}
$sql="select ji_id from jrn_info where jr_id=".$this->jr_id;

4
include/class_acc_ledger_purchase.php
View file

@ -1017,7 +1017,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
{
if ($e->getCode() == 1 )
{
throw Exception( _("Aucune période ouverte"));
throw new Exception( _("Aucune période ouverte"));
}
}
@ -1042,7 +1042,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$add_js.='update_row("sold_item");';
$wLedger=$this->select_ledger('ACH',2);
if ($wLedger == null) throw Exception(_('Pas de journal disponible'));
if ($wLedger == null) throw new Exception(_('Pas de journal disponible'));
$wLedger->javascript="onChange='update_predef(\"ach\",\"f\",\"".$_REQUEST['ac']."\");$add_js'";
$wLedger->table=1;
$f_jrn=$wLedger->input();

4
include/class_acc_ledger_sold.php
View file

@ -1057,7 +1057,7 @@ EOF;
$l_form_per = $period->input();
} catch (Exception $e) {
if ($e->getCode() == 1) {
throw Exception( _("Aucune période ouverte") );
throw new Exception( _("Aucune période ouverte") );
}
}
$label = HtmlInput::infobulle(3);
@ -1077,7 +1077,7 @@ EOF;
$wLedger = $this->select_ledger('VEN', 2);
if ($wLedger == null)
throw Exception(_('Pas de journal disponible'));
throw new Exception(_('Pas de journal disponible'));
$wLedger->table = 1;
$wLedger->javascript = "onChange='update_predef(\"ven\",\"f\",\"".$_REQUEST['ac']."\");$add_js'";
$wLedger->label = " Journal " . HtmlInput::infobulle(2);

2
include/class_anc_key.php
View file

@ -137,7 +137,7 @@ class Anc_Key
$a_percent=$p_array['percent'];
if (count($a_percent)==0)
{
throw Exception(_('Aucune répartition'));
throw new Exception(_('Aucune répartition'));
}
$tot_percent=0;
bcscale(4);