Skip to content

Commit

Permalink
Fix sql error
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Dec 18, 2017
1 parent 2204790 commit 2e87318
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion htdocs/core/modules/rapport/pdf_paiement.class.php
Expand Up @@ -218,7 +218,7 @@ function write_file($_dir, $month, $year, $outputlangs)
if (! empty($conf->banque->enabled))
$sql.= ", ba.ref as bankaccount";
$sql.= ", p.rowid as prowid";
$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn as p LEFT JOIN ON ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id AND c.entity IN (".getEntity('c_paiement').")";
$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id AND c.entity IN (".getEntity('c_paiement').")";
$sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f,";
$sql.= " ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf,";
if (! empty($conf->banque->enabled))
Expand Down
7 changes: 4 additions & 3 deletions htdocs/fourn/facture/rapport.php
Expand Up @@ -85,9 +85,10 @@

$formother=new FormOther($db);

llxHeader();

$titre=($year?$langs->trans("PaymentsReportsForYear",$year):$langs->trans("PaymentsReports"));

llxHeader('', $titre);

print load_fiche_titre($titre,'','title_accountancy.png');

// Formulaire de generation
Expand Down Expand Up @@ -152,7 +153,7 @@
{
if (preg_match('/^supplier_payment/i',$file))
{

$tfile = $dir . '/'.$year.'/'.$file;
$relativepath = $year.'/'.$file;
print "<tr ".$bc[$var].">".'<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture_fournisseur&amp;file=payments/'.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
Expand Down

0 comments on commit 2e87318

Please sign in to comment.