diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php index 8c7865cbcf2..175be658927 100644 --- a/htdocs/margin/tabs/thirdpartyMargins.php +++ b/htdocs/margin/tabs/thirdpartyMargins.php @@ -39,9 +39,10 @@ $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit; $sortfield = GETPOST('sortfield', 'aZ09comma'); $sortorder = GETPOST('sortorder', 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page"); -if (empty($page) || $page == -1) { +if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { + // If $page is not defined, or '' or -1 or if we click on clear filters $page = 0; -} // If $page is not defined, or '' or -1 +} $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; @@ -77,7 +78,48 @@ if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } +$search_invoice_date_start = ''; +$search_invoice_date_end = ''; +if (GETPOSTINT('search_invoice_date_start_month')) { + $search_invoice_date_start = dol_mktime(0, 0, 0, GETPOSTINT('search_invoice_date_start_month'), GETPOSTINT('search_invoice_date_start_day'), GETPOSTINT('search_invoice_date_start_year')); +} +if (GETPOSTINT('search_invoice_date_end_month')) { + $search_invoice_date_end = dol_mktime(23, 59, 59, GETPOSTINT('search_invoice_date_end_month'), GETPOSTINT('search_invoice_date_end_day'), GETPOSTINT('search_invoice_date_end_year')); +} +// Purge search criteria +if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers + $search_invoice_date_start = ''; + $search_invoice_date_end = ''; +} + +// set default dates from fiscal year +if (empty($search_invoice_date_start) && empty($search_invoice_date_end) && !GETPOSTISSET('restore_lastsearch_values')) { + $query = "SELECT date_start, date_end"; + $query .= " FROM ".MAIN_DB_PREFIX."accounting_fiscalyear"; + $query .= " WHERE date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."' limit 1"; + $res = $db->query($query); + + if ($res && $db->num_rows($res) > 0) { + $fiscalYear = $db->fetch_object($res); + $search_invoice_date_start = strtotime($fiscalYear->date_start); + $search_invoice_date_end = strtotime($fiscalYear->date_end); + } else { + $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1); + $year_start = dol_print_date(dol_now(), '%Y'); + if (dol_print_date(dol_now(), '%m') < $month_start) { + $year_start--; // If current month is lower that starting fiscal month, we start last year + } + $year_end = $year_start + 1; + $month_end = $month_start - 1; + if ($month_end < 1) { + $month_end = 12; + $year_end--; + } + $search_invoice_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start); + $search_invoice_date_end = dol_get_last_day($year_end, $month_end); + } +} /* * View @@ -93,6 +135,17 @@ if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; llxHeader('', $title, $help_url); +$param = "&socid=".$socid; +if ($limit > 0 && $limit != $conf->liste_limit) { + $param .= '&limit='.((int) $limit); +} +if ($search_invoice_date_start) { + $param .= '&search_invoice_date_start_day='.dol_print_date($search_invoice_date_start, '%d').'&search_invoice_date_start_month='.dol_print_date($search_invoice_date_start, '%m').'&search_invoice_date_start_year='.dol_print_date($search_invoice_date_start, '%Y'); +} +if ($search_invoice_date_end) { + $param .= '&search_invoice_date_end_day='.dol_print_date($search_invoice_date_end, '%d').'&search_invoice_date_end_month='.dol_print_date($search_invoice_date_end, '%m').'&search_invoice_date_end_year='.dol_print_date($search_invoice_date_end, '%Y'); +} + if ($socid > 0) { $object = new Societe($db); $object->fetch($socid); @@ -189,43 +242,152 @@ if ($socid > 0) { if (getDolGlobalInt('ForceBuyingPriceIfNull') == 2) { $sql .= " AND d.buy_price_ht <> 0"; } + if (!empty($search_invoice_date_start)) { + $sql .= " AND f.datef >= '".$db->idate($search_invoice_date_start)."'"; + } + if (!empty($search_invoice_date_end)) { + $sql .= " AND f.datef <= '".$db->idate($search_invoice_date_end)."'"; + } $sql .= " GROUP BY s.nom, s.rowid, s.code_client, f.rowid, f.ref, f.total_ht, f.datef, f.paye, f.fk_statut, f.type"; - $sql .= $db->order($sortfield, $sortorder); + // TODO: calculate total to display then restore pagination - //$sql.= $db->plimit($conf->liste_limit +1, $offset); + + $sql .= $db->order($sortfield, $sortorder); + if ($limit) { + $sql .= $db->plimit($limit + 1, $offset); + } dol_syslog('margin:tabs:thirdpartyMargins.php', LOG_DEBUG); $result = $db->query($sql); if ($result) { $num = $db->num_rows($result); + print '
'; print '