diff --git a/html/style-color.css b/html/style-color.css index c4c9be815..63ab1afef 100644 --- a/html/style-color.css +++ b/html/style-color.css @@ -948,4 +948,11 @@ tr.footer{ span.remain { font-weight: bold; color:black; - } \ No newline at end of file + } +div#jrn_name_div +{ + float: right; + margin-right:150; + + +} \ No newline at end of file diff --git a/html/style-light.css b/html/style-light.css index e04e9f4c1..b0cf29eae 100644 --- a/html/style-light.css +++ b/html/style-light.css @@ -988,4 +988,16 @@ tr.footer{ span.remain { font-weight: bold; color:black; - } \ No newline at end of file + } +div#jrn_name_div +{ + float: right; + margin-right:150; + + +} +#predef_form { + margin-left:20%; + width:60%; + +} \ No newline at end of file diff --git a/html/style.css b/html/style.css index f87862a4c..09781b567 100644 --- a/html/style.css +++ b/html/style.css @@ -978,4 +978,12 @@ tr.footer{ span.remain { font-weight: bold; color:black; - } \ No newline at end of file + } + +div#jrn_name_div +{ + float: right; + margin-right:150; + + +} \ No newline at end of file diff --git a/include/ac_common.php b/include/ac_common.php index c04637b44..1b4ce99a3 100644 --- a/include/ac_common.php +++ b/include/ac_common.php @@ -841,25 +841,31 @@ function show_menu($module, $idx) * @todo add security * check if user can access this module */ - $file = $cn->get_array("select me_file,me_parameter - from menu_ref - where - me_code=$1 and - (me_file is not null or trim(me_file) <>'')", array($module[$idx])); + $file = $cn->get_array("select me_file,me_parameter + from menu_ref + where + me_code=$1 and + (me_file is not null or trim(me_file) <>'')", array($module[$idx])); - if ($file[0]['me_file'] != "") - { - if ($file[0]['me_parameter'] !== "") - { - // if there are paramter put them in superglobal - $array=compute_variable($file[0]['me_parameter']); - put_global($array); - } - echo '
| '; + $ret.= ' | ||
| '; $wDate=new IDate('e_date'); $wDate->readonly=$p_readonly; $e_date=(isset($e_date)&&trim($e_date)!='')?$e_date:''; @@ -1443,11 +1443,12 @@ class Acc_Ledger $default_pj=$this->guess_pj(); } $wPJ->value=(isset($e_pj))?$e_pj:$default_pj; - - $ret.=' | '._('Pièce').' : '.$wPJ->input(); - $ret.=HtmlInput::hidden('e_pj_suggest',$default_pj); - $ret.= ' | '; $ret.= '|
| '._('Pièce').' : '.$wPJ->input(); + $ret.=HtmlInput::hidden('e_pj_suggest',$default_pj); + $ret.= ' | ||
| '._('Libellé'); $wDescription=new IText('desc'); diff --git a/include/class_acc_ledger_fin.php b/include/class_acc_ledger_fin.php index 09d0beb8e..789d79f9a 100644 --- a/include/class_acc_ledger_fin.php +++ b/include/class_acc_ledger_fin.php @@ -181,7 +181,7 @@ class Acc_Ledger_Fin extends Acc_Ledger /*!\brief - *\param $p_array contains the value usually it is $_POST + *\param $p_array contains the value usually it is $_POST *\return string with html code *\note the form tag are not set here */ @@ -247,10 +247,10 @@ class Acc_Ledger_Fin extends Acc_Ledger // Ledger (p_jrn) //-- - - $add_js='onchange="update_pj();update_bank();get_last_date();ajax_saldo(\'first_sold\')";'; - if ( $owner->MY_DATE_SUGGEST == 'Y') + $add_js='onchange="update_pj();update_bank();get_last_date();ajax_saldo(\'first_sold\');update_name();"'; + + if ( $owner->MY_DATE_SUGGEST == 'Y') $add_js='onchange="update_pj();update_bank();get_last_date();ajax_saldo(\'first_sold\')";'; $wLedger=$this->select_ledger('FIN',2); @@ -381,7 +381,7 @@ class Acc_Ledger_Fin extends Acc_Ledger /*!\brief show the summary before inserting into the database, it *calls the function for adding a attachment. The function verify *should be called before - *\param $p_array an array usually is $_POST + *\param $p_array an array usually is $_POST *\return string with code html */ public function confirm($p_array) @@ -404,6 +404,9 @@ class Acc_Ledger_Fin extends Acc_Ledger $exercice=$pPeriode->get_exercice(); $r.=''; $r.=' | ||