diff --git a/html/admin/setup.php b/html/admin/setup.php index e0efde526..7bdb63451 100644 --- a/html/admin/setup.php +++ b/html/admin/setup.php @@ -117,6 +117,7 @@ if ( ! file_exists ( $file) ) { "php_value memory_limit 20M", "AddDefaultCharset utf-8", "php_value error_reporting 10239", + "php_value post_max_size 15M", "php_flag short_open_tag on", "php_value upload_max_filesize 10M", "php_value session.use_trans_sid 1"); diff --git a/html/style-light.css b/html/style-light.css index c21ae7ba1..6bda521b4 100644 --- a/html/style-light.css +++ b/html/style-light.css @@ -580,14 +580,14 @@ div.popup_border_title { /*background:lightgrey;*/ z-index:10; /*border:dotted 1px black;*/ - border: 3px groove black; + border: 2px outset #201e87; background-color:#879ED4; font-size: 110% ; font-family: arial,sans-serif; font-style: italic; font-weight: bolder; text-align:center; - border-bottom: 2px solid #201e87; + /*border-bottom: 2px solid #201e87;*/ color: white; display:none; /*opacity:1; @@ -618,12 +618,12 @@ div.popup_border_notitle { div.popup_content { position:absolute; - top:5%; + top:4%; bottom:0; left:0; right:0; width:100%; - height:95%; + height:96%; overflow: auto; background-color:lightblue; font-size:10px ; diff --git a/include/ac_common.php b/include/ac_common.php index 0d3308bda..0fbe239f5 100644 --- a/include/ac_common.php +++ b/include/ac_common.php @@ -367,7 +367,7 @@ function ShowItem($p_array,$p_dir='V',$class="mtitle",$class_ref="mtitle",$defau */ function echo_warning($p_string) { - echo '

'.$p_string."

"; + echo '

'.$p_string."

"; } /*! * \brief Show the periode which found thanks its id diff --git a/include/class_database.php b/include/class_database.php index 4b5f47d6d..48a4e9020 100644 --- a/include/class_database.php +++ b/include/class_database.php @@ -450,7 +450,8 @@ de données"); if ( $r==0) return false; return true; - } /*! + } + /*! *\brief create a string containing the value separated by comma * for use in a SQL in statement *\return the string or empty if nothing is found diff --git a/include/class_fiche.php b/include/class_fiche.php index 284fc0389..55ff9c6c8 100644 --- a/include/class_fiche.php +++ b/include/class_fiche.php @@ -545,24 +545,6 @@ Array $this->cn->exec_sql($sql); continue; } - // stock - if ( $id == ATTR_DEF_STOCK ) { - $st=$this->cn->count_sql('select * from stock_goods where '. - " upper(sg_code)=upper('$value')"); - if ( $st == 0 ) { - $user=new User($this->cn); - if ( $exercice == 0 ) throw new Exception ('Veuillez choisir une période dans vos préférences ',1); - - $str_stock=sprintf('insert into stock_goods(f_id,sg_quantity,sg_comment,sg_code,sg_type,sg_exercice) '. - ' values (%d,0,\'%s\',upper(\'%s\'),\'d\',\'%s\')', - $fiche_id, - 'initial', - FormatString($value), - $exercice); - - $this->cn->exec_sql($str_stock); - } - } // name if ( $id == ATTR_DEF_NAME ) { diff --git a/include/config_file.php b/include/config_file.php index 35e77a114..6ea3b8e2f 100644 --- a/include/config_file.php +++ b/include/config_file.php @@ -25,6 +25,16 @@ */ require_once("class_itext.php"); +function is_unix() { + $inc_path=get_include_path(); + + if ( strpos($inc_path,";") != 0 ) { + $os=0; /* $os is 0 for windoz */ + } else { + $os=1; /* $os is 1 for unix */ + } + return $os; +} /*!\brief @@ -39,9 +49,10 @@ require_once("class_itext.php"); function config_file_form($p_array=null) { if ( $p_array == null ) { - /* default value */ - $ctmp='/tmp'; - $cpath='/usr/bin'; + $os=is_unix(); + /* default value */ + $ctmp=($os==1)?'/tmp':'c:\tmp'; + $cpath=($os==1)?'/usr/bin':'c:\phpcompta\postgresql\bin'; $cuser='phpcompta'; $cpasswd='dany'; $cport=5432; @@ -49,6 +60,7 @@ function config_file_form($p_array=null) } else extract ($p_array); $text=new IText(); + $text->size=25; $r=''; $r.='
'; diff --git a/include/template/card_result.php b/include/template/card_result.php index 33e219ad0..8195e02db 100644 --- a/include/template/card_result.php +++ b/include/template/card_result.php @@ -21,9 +21,9 @@ - + - +