mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Clean code
This commit is contained in:
parent
98cc1acbec
commit
2049d56cdd
|
|
@ -100,7 +100,7 @@ $hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules
|
|||
$formaccounting = new FormAccounting($db);
|
||||
$form = new Form($db);
|
||||
|
||||
if (empty($search_date_start) && !GETPOSTISSET('formfilteraction')) {
|
||||
if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('formfilteraction')) {
|
||||
$sql = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
|
||||
$sql .= " WHERE date_start < '".$db->idate(dol_now())."' AND date_end > '".$db->idate(dol_now())."'";
|
||||
$sql .= $db->plimit(1);
|
||||
|
|
@ -157,17 +157,17 @@ if (empty($reshook)) {
|
|||
$show_subgroup = '';
|
||||
$search_date_start = '';
|
||||
$search_date_end = '';
|
||||
$search_date_startyear = '';
|
||||
$search_date_startmonth = '';
|
||||
$search_date_startday = '';
|
||||
$search_date_endyear = '';
|
||||
$search_date_endmonth = '';
|
||||
$search_date_endday = '';
|
||||
$search_accountancy_code_start = '';
|
||||
$search_accountancy_code_end = '';
|
||||
$search_not_reconciled = '';
|
||||
$search_ledger_code = array();
|
||||
$filter = array();
|
||||
unset($_SESSION['DOLDATE_search_date_start_accountancy_day']);
|
||||
unset($_SESSION['DOLDATE_search_date_start_accountancy_month']);
|
||||
unset($_SESSION['DOLDATE_search_date_start_accountancy_year']);
|
||||
unset($_SESSION['DOLDATE_search_date_end_accountancy_day']);
|
||||
unset($_SESSION['DOLDATE_search_date_end_accountancy_month']);
|
||||
unset($_SESSION['DOLDATE_search_date_end_accountancy_year']);
|
||||
}
|
||||
|
||||
// Must be after the remove filter action, before the export.
|
||||
|
|
|
|||
|
|
@ -257,44 +257,14 @@ if (empty($reshook)) {
|
|||
$search_mvt_label = '';
|
||||
$search_direction = '';
|
||||
$search_ledger_code = array();
|
||||
$search_date_startyear = '';
|
||||
$search_date_startmonth = '';
|
||||
$search_date_startday = '';
|
||||
$search_date_endyear = '';
|
||||
$search_date_endmonth = '';
|
||||
$search_date_endday = '';
|
||||
$search_date_start = '';
|
||||
$search_date_end = '';
|
||||
$search_date_creation_startyear = '';
|
||||
$search_date_creation_startmonth = '';
|
||||
$search_date_creation_startday = '';
|
||||
$search_date_creation_endyear = '';
|
||||
$search_date_creation_endmonth = '';
|
||||
$search_date_creation_endday = '';
|
||||
$search_date_creation_start = '';
|
||||
$search_date_creation_end = '';
|
||||
$search_date_modification_startyear = '';
|
||||
$search_date_modification_startmonth = '';
|
||||
$search_date_modification_startday = '';
|
||||
$search_date_modification_endyear = '';
|
||||
$search_date_modification_endmonth = '';
|
||||
$search_date_modification_endday = '';
|
||||
$search_date_modification_start = '';
|
||||
$search_date_modification_end = '';
|
||||
$search_date_export_startyear = '';
|
||||
$search_date_export_startmonth = '';
|
||||
$search_date_export_startday = '';
|
||||
$search_date_export_endyear = '';
|
||||
$search_date_export_endmonth = '';
|
||||
$search_date_export_endday = '';
|
||||
$search_date_export_start = '';
|
||||
$search_date_export_end = '';
|
||||
$search_date_validation_startyear = '';
|
||||
$search_date_validation_startmonth = '';
|
||||
$search_date_validation_startday = '';
|
||||
$search_date_validation_endyear = '';
|
||||
$search_date_validation_endmonth = '';
|
||||
$search_date_validation_endday = '';
|
||||
$search_date_validation_start = '';
|
||||
$search_date_validation_end = '';
|
||||
// Due date start
|
||||
|
|
@ -313,6 +283,12 @@ if (empty($reshook)) {
|
|||
$search_not_reconciled = '';
|
||||
$search_import_key = '';
|
||||
$toselect = array();
|
||||
unset($_SESSION['DOLDATE_search_date_start_accountancy_day']);
|
||||
unset($_SESSION['DOLDATE_search_date_start_accountancy_month']);
|
||||
unset($_SESSION['DOLDATE_search_date_start_accountancy_year']);
|
||||
unset($_SESSION['DOLDATE_search_date_end_accountancy_day']);
|
||||
unset($_SESSION['DOLDATE_search_date_end_accountancy_month']);
|
||||
unset($_SESSION['DOLDATE_search_date_end_accountancy_year']);
|
||||
}
|
||||
|
||||
// Must be after the remove filter action, before the export.
|
||||
|
|
|
|||
|
|
@ -315,6 +315,12 @@ if (empty($reshook)) {
|
|||
$search_not_reconciled = '';
|
||||
$search_import_key = '';
|
||||
$toselect = array();
|
||||
unset($_SESSION['DOLDATE_search_date_start_accountancy_day']);
|
||||
unset($_SESSION['DOLDATE_search_date_start_accountancy_month']);
|
||||
unset($_SESSION['DOLDATE_search_date_start_accountancy_year']);
|
||||
unset($_SESSION['DOLDATE_search_date_end_accountancy_day']);
|
||||
unset($_SESSION['DOLDATE_search_date_end_accountancy_month']);
|
||||
unset($_SESSION['DOLDATE_search_date_end_accountancy_year']);
|
||||
}
|
||||
|
||||
if (!empty($socid)) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user