diff --git a/include/cfgledger.inc.php b/include/cfgledger.inc.php index 48fc3b694..1d4dbe57c 100644 --- a/include/cfgledger.inc.php +++ b/include/cfgledger.inc.php @@ -165,11 +165,13 @@ switch ($sa) // Display list of ledgers ////////////////////////////////////////////////////////////////////////// if ( $show_menu == 1 ) { + echo ''; echo HtmlInput::anchor_action(_("Tout"), 'show_all_row(\'cfgledger_table_id\')','ledger_all_bt','smallbutton '); echo HtmlInput::anchor_action(_("Financier"), 'show_only_row(\'cfgledger_table_id\',\'ledger_type\',\'FIN\')','ledger_fin_bt','smallbutton '); echo HtmlInput::anchor_action(_("Achat"), 'show_only_row(\'cfgledger_table_id\',\'ledger_type\',\'ACH\')','ledger_ach_bt','smallbutton '); echo HtmlInput::anchor_action(_("Opérations Diverses"), 'show_only_row(\'cfgledger_table_id\',\'ledger_type\',\'ODS\')','ledger_ods_bt','smallbutton '); echo HtmlInput::anchor_action(_("Vente"), 'show_only_row(\'cfgledger_table_id\',\'ledger_type\',\'VEN\')','ledger_ven_bt','smallbutton '); + echo ''; echo '
'; echo $ledger->listing(); echo '
'; diff --git a/include/lib/http_input.class.php b/include/lib/http_input.class.php index 5dd1a33ca..35922702a 100644 --- a/include/lib/http_input.class.php +++ b/include/lib/http_input.class.php @@ -108,7 +108,8 @@ class HttpInput if (array_key_exists($p_name,$this->array) ) { $this->check_type($p_name, $p_type); - return strip_tags($this->array[$p_name]); + if ( is_string($this->array[$p_name]) ) return strip_tags($this->array[$p_name]); + return $this->array[$p_name]; } else { @@ -121,7 +122,8 @@ class HttpInput EXC_PARAM_VALUE); } $this->check_type($p_name, $p_type); - return strip_tags($this->array[$p_name]); + if ( is_string($this->array[$p_name]) ) return strip_tags($this->array[$p_name]); + return $this->array[$p_name]; } catch (Exception $e) { diff --git a/sql/upgrade.sql b/sql/upgrade.sql index 5449b5083..5334158e8 100644 --- a/sql/upgrade.sql +++ b/sql/upgrade.sql @@ -1,4 +1,3 @@ --- Bug in 7004 : the amount qp_dep_priv was not saved CREATE OR REPLACE FUNCTION comptaproc.insert_quant_purchase(p_internal text, p_j_id numeric, p_fiche character varying, p_quant numeric, p_price numeric, p_vat numeric, p_vat_code integer, p_nd_amount numeric, p_nd_tva numeric, p_nd_tva_recup numeric, p_dep_priv numeric, p_client character varying, p_tva_sided numeric, p_price_unit numeric) RETURNS void LANGUAGE plpgsql @@ -53,4 +52,5 @@ begin p_price_unit); return; end; + $function$ $function$ \ No newline at end of file