diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php index 2fe49b785..e04ce3600 100644 --- a/include/class_acc_ledger.php +++ b/include/class_acc_ledger.php @@ -2033,8 +2033,10 @@ function get_last_date() } else { $period=$user->get_periode(); $per=new Periode($this->db,$period); - list($date_start,$date_end)=$per->get_date_limit(); - $f_date_start->value=$date_start; + $exercice=$per->get_exercice(); + list($per_start,$per_end)=$per->get_limit($exercice); + $f_date_start->value=$per_start->first_day(); + $date_end=$per_end->last_day(); } /* widget for date_end */ diff --git a/include/user_action_gl.php b/include/user_action_gl.php index d61cb335b..99de44831 100644 --- a/include/user_action_gl.php +++ b/include/user_action_gl.php @@ -28,14 +28,6 @@ include_once("class_user.php"); require_once("class_iselect.php"); require_once('class_acc_ledger.php'); $cn=new Database($gDossier); -echo js_include('accounting_item.js'); -echo js_include('prototype.js'); -echo js_include('scriptaculous.js'); -echo js_include('effects.js'); -echo js_include('controls.js'); -echo js_include('dragdrop.js'); -echo js_include('acc_ledger.js'); -echo js_include('scripts.js'); echo JS_INFOBULLE; require_once('class_iposte.php'); require_once('class_ipopup.php'); @@ -43,7 +35,7 @@ $search_card=new IPopup('ipop_card'); $search_card->title=_('Recherche de fiche'); $search_card->value=''; echo $search_card->input(); -echo JS_CARD; + echo IPoste::ipopup('ipop_account'); echo '
';