diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index 2269c0035b9..887e9b85b6b 100644 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -111,6 +111,7 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.t else $sql.= " AND f.type IN (0,1,2,3)"; if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; +dol_syslog("sql=".$sql); $result = $db->query($sql); if ($result) { @@ -147,7 +148,7 @@ if ($result) $compta_localtax1= (! empty($account_localtax1[2])?$account_localtax1[2]:$langs->trans("CodeNotDef")); $account_localtax2=getLocalTaxesFromRate($obj->tva_tx, 2, $mysoc); $compta_localtax2= (! empty($account_localtax2[2])?$account_localtax2[2]:$langs->trans("CodeNotDef")); - + $tabfac[$obj->rowid]["date"] = $obj->datef; $tabfac[$obj->rowid]["ref"] = $obj->ref_supplier; $tabfac[$obj->rowid]["type"] = $obj->type; @@ -239,7 +240,7 @@ foreach ($tabfac as $key => $val) print ''.($mt>=0?price($mt):'').""; print ''.($mt<0?price(-$mt):'').""; } - + print ""; } } diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index 859c1ff2ea5..f502cb79e94 100644 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -116,6 +116,7 @@ $sql.= " AND fd.product_type IN (0,1)"; if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; $sql.= " ORDER BY f.rowid"; +dol_syslog("sql=".$sql); $result = $db->query($sql); if ($result) { @@ -151,7 +152,7 @@ if ($result) $compta_localtax1= (! empty($account_localtax1[3])?$account_localtax1[3]:$langs->trans("CodeNotDef")); $account_localtax2=getLocalTaxesFromRate($obj->tva_tx, 2, $mysoc); $compta_localtax2= (! empty($account_localtax2[3])?$account_localtax2[3]:$langs->trans("CodeNotDef")); - + //la ligne facture $tabfac[$obj->rowid]["date"] = $obj->datef; $tabfac[$obj->rowid]["ref"] = $obj->facnumber; @@ -225,7 +226,7 @@ foreach ($tabfac as $key => $val) array( 'var' => $tablocaltax2[$key], 'label' => $langs->transcountry('LT2', $mysoc->country_code) - ) + ) ); foreach ($lines as $line)