lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: bug #33123

Browse Source
This commit is contained in:
Laurent Destailleur 2011-05-28 12:19:49 +00:00
parent 91432e8d63
commit b1bcd94b3b
1 changed files with 422 additions and 418 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/compta/resultat/clientfourn.php
View File

@ -35,7 +35,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");
$langs->load("bills"); $langs->load("bills");
// Security check // Security check
$socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; $socid = GETPOST("socid");
if ($user->societe_id > 0) $socid = $user->societe_id; if ($user->societe_id > 0) $socid = $user->societe_id;
if (!$user->rights->compta->resultat->lire && !$user->rights->accounting->comptarapport->lire) if (!$user->rights->compta->resultat->lire && !$user->rights->accounting->comptarapport->lire)
accessforbidden(); accessforbidden();
@ -63,6 +63,8 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
// We define date_start and date_end // We define date_start and date_end
$year_end=$year_start; $year_end=$year_start;
$month_start=GETPOST("month")?GETPOST("month"):($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1); $month_start=GETPOST("month")?GETPOST("month"):($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
if (! GETPOST('month'))
{
if ($month_start > $month_current) if ($month_start > $month_current)
{ {
$year_start--; $year_start--;
@ -71,6 +73,8 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
$month_end=$month_start-1; $month_end=$month_start-1;
if ($month_end < 1) $month_end=12; if ($month_end < 1) $month_end=12;
else $year_end++; else $year_end++;
}
else $month_end=$month_start;
$date_start=dol_get_first_day($year_start,$month_start,false); $date_end=dol_get_last_day($year_end,$month_end,false); $date_start=dol_get_first_day($year_start,$month_start,false); $date_end=dol_get_last_day($year_end,$month_end,false);
} }
if ($q==1) { $date_start=dol_get_first_day($year_start,1,false); $date_end=dol_get_last_day($year_start,3,false); } if ($q==1) { $date_start=dol_get_first_day($year_start,1,false); $date_end=dol_get_last_day($year_start,3,false); }
@ -162,19 +166,19 @@ $sql.= " GROUP BY s.nom, s.rowid";
$sql.= " ORDER BY s.nom"; $sql.= " ORDER BY s.nom";
/* /*
print dol_print_date($date_end,'dayhour',true).'<br>'; print dol_print_date($date_end,'dayhour',true).'<br>';
print $db->idate($date_end).'<br>'; print $db->idate($date_end).'<br>';
print adodb_get_gmt_diff(); print adodb_get_gmt_diff();
print adodb_date('Y-d-m H:i',$date_end,true).'<br>'; print adodb_date('Y-d-m H:i',$date_end,true).'<br>';
print adodb_date('Y-d-m H:i',$date_end,false).'<br>'; print adodb_date('Y-d-m H:i',$date_end,false).'<br>';
$date_end=0; $date_end=0;
print dol_print_date($date_end,'dayhour',true).'<br>'; print dol_print_date($date_end,'dayhour',true).'<br>';
print $db->idate($date_end).'<br>'; print $db->idate($date_end).'<br>';
print adodb_gmstrftime('%Y-%d-%m %H:%M',$date_end).'<br>'; print adodb_gmstrftime('%Y-%d-%m %H:%M',$date_end).'<br>';
print $sql; print $sql;
*/ */
dol_syslog("get customer invoices sql=".$sql); dol_syslog("get customer invoices sql=".$sql);
$result = $db->query($sql); $result = $db->query($sql);