diff --git a/html/style-color.css b/html/style-color.css index df85e298d..9b3a3d53d 100644 --- a/html/style-color.css +++ b/html/style-color.css @@ -899,4 +899,16 @@ div#div_jrn{ } div.divinfo -{ color:red;text-align:right;display:block;width:30em;height:13;} \ No newline at end of file +{ color:red;text-align:right;display:block;width:30em;height:13;} + +div#search_form +{ + position:absolute; + border:1px solid black; + top:15%;left:100; + margin-left:25% + z-index:2; + width:50%; + display:none; + background-color:#e4e7ed; +} \ No newline at end of file diff --git a/html/style-light.css b/html/style-light.css index 9599f0771..21bd55901 100644 --- a/html/style-light.css +++ b/html/style-light.css @@ -929,3 +929,16 @@ div#div_jrn{ div.divinfo { color:red;text-align:right;display:block;width:30em;height:13;font-weight:bold} + + +div#search_form +{ + position:absolute; + border:1px solid black; + top:15%;left:100; + margin-left:25% + z-index:2; + width:50%; + display:none; + background-color:#e4e7ed; +} \ No newline at end of file diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php index 70b8e5509..445559331 100644 --- a/include/class_acc_ledger.php +++ b/include/class_acc_ledger.php @@ -2449,15 +2449,9 @@ class Acc_Ledger $type=$this->type; if ( $type=="" || $this->id==0) $type='ALL'; - if ( isset($_GET['amount_min']) ) - { - $display='block'; - } - else - { - $display='none'; - } - $r.='
'; + $r.=''; - $r.=$button->input(); + $r.='
'; + $button=new IButton('tfs'); + $button->label=_("Filtrer"); + $button->javascript="toggleHideShow('search_form','tfs');"; + + $r.=$button->input(); + $r.='
'; return $r; } diff --git a/include/class_html_input.php b/include/class_html_input.php index 84be6bd82..ef63d7d1e 100755 --- a/include/class_html_input.php +++ b/include/class_html_input.php @@ -417,6 +417,35 @@ class HtmlInput $r.=''; return $r; } + /** + * button Html with an action in the top + *@param $action action action to perform (message) + *@param $javascript javascript of the DIV to close + *@see Acc_Ledger::display_search_form + *@note not protected against html + *@param $div_name is the name of the div to remove + */ + static function button_action($action,$javascript) + { + + + } + /** + * Return a html string with an anchor looking like anchor_button in the right corner + *@param $action action action to perform (message) + *@param $javascript javascript + *@note not protected against html + *@see Acc_Ledger::display_search_form + */ + static function anchor_action($action,$javascript) + { + $r=''; + $r.='
'; + $r.= ''.$action.''; + $r.='
'; + return $r; + } + /** * Javascript to print the current window */ diff --git a/include/quick_writing.inc.php b/include/quick_writing.inc.php index 9ec1cde99..6dfe889fa 100644 --- a/include/quick_writing.inc.php +++ b/include/quick_writing.inc.php @@ -35,17 +35,6 @@ require_once('class_periode.php'); require_once('function_javascript.php'); require_once('class_ipopup.php'); -echo ICard::ipopup('ipopcard'); -echo ICard::ipopup('ipop_newcard'); -echo IPoste::ipopup('ipop_account'); -$search_card=new IPopup('ipop_card'); -$search_card->title=_('Recherche de fiche'); -$search_card->value=''; -echo $search_card->input(); -$pop_tva=new IPopup('popup_tva'); -$pop_tva->title=_('Choix TVA'); -$pop_tva->value=''; -echo $pop_tva->input(); $cn=new Database(dossier::id()); @@ -165,6 +154,7 @@ if ($sa == 'l' && $id != -1) show_qw_menu(1); echo '
'; $Ledger=new Acc_Ledger($cn,$id); + $type=$Ledger->get_type(); $href=basename($_SERVER['PHP_SELF']); @@ -176,6 +166,7 @@ if ($sa == 'l' && $id != -1) echo $Ledger->search_form($type,0); echo HtmlInput::submit("qwlist",_("Recherche")); echo ''; + $array=$_GET; list($sql,$where)=$Ledger->build_search_sql($array);