";
if (empty($attr))
{
@@ -850,8 +863,12 @@ class Fiche
try
{
$this->cn->start();
-
- $Ret=$this->cn->exec_sql("insert into fiche(f_id,f_enable,fd_id) value ($1,$2,$3)",
+
+ // by default the card is available
+ if ( !isset ($p_array['f_enable'])) {
+ $p_array['f_enable']=1;
+ }
+ $Ret=$this->cn->exec_sql("insert into fiche(f_id,f_enable,fd_id) values ($1,$2,$3)",
array($fiche_id, $p_array['f_enable'],$p_fiche_def));
// parse the $p_array array
@@ -1807,6 +1824,7 @@ class Fiche
function Summary($p_search="",$p_action="",$p_sql="",$p_amount=false)
{
global $g_user;
+ $http=new HttpInput();
$bank=new Acc_Parm_Code($this->cn,'BANQUE');
$cash=new Acc_Parm_Code($this->cn,'CAISSE');
$cc=new Acc_Parm_Code($this->cn,'COMPTE_COURANT');
@@ -1827,8 +1845,8 @@ class Fiche
$all_tiers=$this->count_by_modele($this->fiche_def_ref,"",$p_sql.$filter_amount);
// Get offset and page variable
- $offset=( isset ($_REQUEST['offset'] )) ?$_REQUEST['offset']:0;
- $page=(isset($_REQUEST['page']))?$_REQUEST['page']:1;
+ $offset=$http->request("offset","number",0);
+ $page=$http->request("page","number",1);
$bar=navigation_bar($offset,$all_tiers,$_SESSION[SESSION_KEY.'g_pagesize'],$page);
// set a filter ?
@@ -2141,7 +2159,7 @@ class Fiche
{
case 'cred':
if (!isset($jrn))
- throw ('Erreur pas de valeur pour jrn');
+ throw Exception('Erreur pas de valeur pour jrn');
$filter_jrn=$this->cn->make_list("select jrn_def_fiche_cred from jrn_Def where jrn_def_id=$1",
array($jrn));
$filter_fd_id=" fd_id in (".$filter_jrn.")";
@@ -2149,7 +2167,7 @@ class Fiche
break;
case 'deb':
if (!isset($jrn))
- throw ('Erreur pas de valeur pour jrn');
+ throw Exception('Erreur pas de valeur pour jrn');
$filter_jrn=$this->cn->make_list("select jrn_def_fiche_deb from jrn_Def where jrn_def_id=$1",
array($jrn));
$filter_fd_id=" fd_id in (".$filter_jrn.")";
@@ -2157,7 +2175,7 @@ class Fiche
break;
case 'filter':
if (!isset($jrn))
- throw ('Erreur pas de valeur pour jrn');
+ throw Exception('Erreur pas de valeur pour jrn');
$filter_jrn=$this->cn->make_list("select jrn_def_fiche_deb from jrn_Def where jrn_def_id=$1",
array($jrn));
diff --git a/include/class/pre_operation.class.php b/include/class/pre_operation.class.php
index 4a6ad1805..43c1aef04 100644
--- a/include/class/pre_operation.class.php
+++ b/include/class/pre_operation.class.php
@@ -40,7 +40,7 @@ class Pre_operation
private $jrn_type; /*!< $jrn_type */
private $name; /*!< $name name of the predef. operation */
private $detail; /*!< Pre_operation_detail object */
- private $od_direct ; /*!< Compatibility for ACH in direct mode, only for ODS */
+ var $od_direct ; /*!< Compatibility for ACH in direct mode, only for ODS */
private $od_id; /*!< id of the Predefined Operation */
private $isloaded;
private $description; /*!< description of the predefined operation */
diff --git a/include/fiche.inc.php b/include/fiche.inc.php
index 39f118988..b5c547940 100644
--- a/include/fiche.inc.php
+++ b/include/fiche.inc.php
@@ -132,7 +132,7 @@ if ( $allcard == 0 ){
if ($array == null && $allcard == 0 && $histo->selected != 3 )
{
echo '';
- echo '
'._('Aucune fiche trouvée').'
';
+ echo ' '._('Aucune fiche trouvée').'
';
echo $str_add_card;
echo '';
return;
diff --git a/include/history_operation.inc.php b/include/history_operation.inc.php
index ed6f5168b..69a03599a 100644
--- a/include/history_operation.inc.php
+++ b/include/history_operation.inc.php
@@ -94,13 +94,13 @@ if (!isset($p_array['date_start']))
list($date_start, $date_end) = $per->get_date_limit();
$p_array['date_start'] = $date_start;
$p_array['date_end'] = $date_end;
- $msg=''.sprintf(_("Période %s au %s "),$date_start,$date_end).'
';
+ $msg=''.sprintf(_("Période %s au %s "),$date_start,$date_end).'
';
}
else
{
$date_start=$http->get("date_start","string","");
$date_end=$http->get("date_end","string","");
- $msg=''.sprintf(_("Période %s au %s "),$date_start,$date_end) .'
';
+ $msg=''.sprintf(_("Période %s au %s "),$date_start,$date_end) .'
';
}
/* compute the sql stmt */
diff --git a/include/template/letter_all.php b/include/template/letter_all.php
index 32f4e867e..6f51bf237 100644
--- a/include/template/letter_all.php
+++ b/include/template/letter_all.php
@@ -10,7 +10,7 @@ global $g_failed;
if ( count($this->content) == 0 ) :
?>
-
+
diff --git a/include/template/letter_prop.php b/include/template/letter_prop.php
index 558cff0f4..6489cee4d 100644
--- a/include/template/letter_prop.php
+++ b/include/template/letter_prop.php
@@ -8,7 +8,7 @@ require_once NOALYSS_INCLUDE.'/class/acc_reconciliation.class.php';
$gDossier=dossier::id();
if ( count($this->content) == 0 ) :
?>
-
+