From 9cb7fec6a19fc0cfd674e737f7e9c8015c41c224 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 16 Feb 2010 08:57:07 +0000
Subject: [PATCH] New: Add link to other invoices
---
htdocs/compta/facture.php | 5 +++--
htdocs/fourn/facture/fiche.php | 8 +++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 720d9bd5d2b..558f1607dd5 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1547,7 +1547,7 @@ if ($_GET['action'] == 'create')
}
print '</select></td></tr>';
}
- $db->free();
+ $db->free($resql);
}
else
{
@@ -2291,7 +2291,8 @@ else
// Third party
print '<tr><td>'.$langs->trans('Company').'</td>';
- print '<td colspan="5">'.$soc->getNomUrl(1,'compta').'</td>';
+ print '<td colspan="5">'.$soc->getNomUrl(1,'compta');
+ print ' (<a href="'.DOL_URL_ROOT.'/compta/facture.php?socid='.$fac->socid.'">'.$langs->trans('OtherBills').'</a>)</td>';
print '</tr>';
// Type
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 3a594a9cf75..f113fd4e4b6 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -700,7 +700,9 @@ else
print '</tr>';
// Third party
- print '<tr><td>'.$langs->trans('Supplier').'</td><td colspan="4">'.$societe->getNomUrl(1).' (<a href="index.php?socid='.$fac->socid.'">'.$langs->trans('OtherBills').'</a>)</td></tr>';
+ print '<tr><td>'.$langs->trans('Supplier').'</td><td colspan="4">'.$societe->getNomUrl(1);
+ print ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?socid='.$fac->socid.'">'.$langs->trans('OtherBills').'</a>)</td>';
+ print '</tr>';
// Type
print '<tr><td>'.$langs->trans('Type').'</td><td colspan="4">';
@@ -754,7 +756,7 @@ else
if ($conf->projet->enabled) $nbrows++;
print '<td rowspan="'.$nbrows.'" valign="top">';
- $sql = 'SELECT '.$db->pdate('datep').' as dp, pf.amount,';
+ $sql = 'SELECT datep as dp, pf.amount,';
$sql .= ' c.libelle as paiement_type, p.num_paiement, p.rowid';
$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as p';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
@@ -784,7 +786,7 @@ else
$objp = $db->fetch_object($result);
$var=!$var;
print '<tr '.$bc[$var].'>';
- print '<td nowrap><a href="'.DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans('Payment'),'payment').'</a> '.dol_print_date($objp->dp,'day')."</td>\n";
+ print '<td nowrap><a href="'.DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans('ShowPayment'),'payment').' '.dol_print_date($db->jdate($objp->dp),'day')."</a></td>\n";
print '<td>'.$objp->paiement_type.' '.$objp->num_paiement.'</td>';
print '<td align="right">'.price($objp->amount).'</td><td> '.$langs->trans('Currency'.$conf->monnaie).'</td>';
--
GitLab