|
@@ -75,6 +75,8 @@ if (! $sortfield) $sortfield="p.rowid";
|
|
|
$hookmanager->initHooks(array('paymentlist'));
|
|
|
$extrafields = new ExtraFields($db);
|
|
|
|
|
|
+$arrayfields=array();
|
|
|
+
|
|
|
|
|
|
/*
|
|
|
* Actions
|
|
@@ -131,7 +133,7 @@ else
|
|
|
$sql.= " p.statut, p.num_paiement,";
|
|
|
$sql.= " c.code as paiement_code,";
|
|
|
$sql.= " ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.fk_accountancy_journal as accountancy_journal,";
|
|
|
- $sql.= " s.rowid as socid, s.nom as name";
|
|
|
+ $sql.= " s.rowid as socid, s.nom as name, s.email";
|
|
|
// Add fields for extrafields
|
|
|
foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
|
|
|
// Add fields from hooks
|
|
@@ -209,8 +211,8 @@ if ($resql)
|
|
|
$i = 0;
|
|
|
|
|
|
$param='';
|
|
|
- if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
|
|
|
- if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
|
|
|
+ if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
|
|
|
+ if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
|
|
|
$param.=(GETPOST("orphelins")?"&orphelins=1":"");
|
|
|
$param.=($search_ref?"&search_ref=".urlencode($search_ref):"");
|
|
|
$param.=($search_company?"&search_company=".urlencode($search_company):"");
|
|
@@ -296,11 +298,12 @@ if ($resql)
|
|
|
{
|
|
|
$objp = $db->fetch_object($resql);
|
|
|
|
|
|
+ $paymentstatic->id=$objp->rowid;
|
|
|
+ $paymentstatic->ref=$objp->ref;
|
|
|
+
|
|
|
print '<tr class="oddeven">';
|
|
|
|
|
|
print '<td>';
|
|
|
- $paymentstatic->id=$objp->rowid;
|
|
|
- $paymentstatic->ref=$objp->ref;
|
|
|
print $paymentstatic->getNomUrl(1);
|
|
|
print '</td>';
|
|
|
|
|
@@ -311,10 +314,12 @@ if ($resql)
|
|
|
|
|
|
// Thirdparty
|
|
|
print '<td>';
|
|
|
- if ($objp->socid)
|
|
|
+ if ($objp->socid > 0)
|
|
|
{
|
|
|
$companystatic->id=$objp->socid;
|
|
|
$companystatic->name=$objp->name;
|
|
|
+ $companystatic->email=$objp->email;
|
|
|
+
|
|
|
print $companystatic->getNomUrl(1,'',24);
|
|
|
}
|
|
|
else print ' ';
|