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

Merge pull request #8887 from atm-florian/6.0

Browse Source 
add hook on balence pages
This commit is contained in:
Laurent Destailleur 2018-05-30 10:47:59 +02:00 committed by GitHub
commit 7590df85e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
htdocs/compta/recap-compta.php
View File

@ -54,9 +54,12 @@ if (! $sortorder) $sortorder="DESC";
$arrayfields=array( $arrayfields=array(
'f.datef'=>array('label'=>"Date", 'checked'=>1), 'f.datef'=>array('label'=>"Date", 'checked'=>1),
//... //...
); );
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('supplierbalencelist','globalcard'));
/* /*
* Actions * Actions
*/ */
@ -87,13 +90,13 @@ if ($id > 0)
dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company'); dol_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company');
dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom', '', '', 0, '', '', 1); dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom', '', '', 0, '', '', 1);
dol_fiche_end(); dol_fiche_end();
if (! empty($conf->facture->enabled) && $user->rights->facture->lire) if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
{ {
// Invoice list // Invoice list
print load_fiche_titre($langs->trans("CustomerPreview")); print load_fiche_titre($langs->trans("CustomerPreview"));
print '<table class="noborder" width="100%">'; print '<table class="noborder tagtable liste" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
if (! empty($arrayfields['f.datef']['checked'])) print_liste_field_titre($arrayfields['f.datef']['label'],$_SERVER["PHP_SELF"],"f.datef","",$param,'align="center" class="nowrap"',$sortfield,$sortorder); if (! empty($arrayfields['f.datef']['checked'])) print_liste_field_titre($arrayfields['f.datef']['label'],$_SERVER["PHP_SELF"],"f.datef","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
print '<td>'.$langs->trans("Element").'</td>'; print '<td>'.$langs->trans("Element").'</td>';
@ -103,7 +106,7 @@ if ($id > 0)
print '<td align="right">'.$langs->trans("Balance").'</td>'; print '<td align="right">'.$langs->trans("Balance").'</td>';
print '<td align="right">'.$langs->trans("Author").'</td>'; print '<td align="right">'.$langs->trans("Author").'</td>';
print '</tr>'; print '</tr>';
$TData = array(); $TData = array();
$TDataSort = array(); $TDataSort = array();
@ -135,10 +138,10 @@ if ($id > 0)
continue; continue;
} }
$totalpaye = $fac->getSommePaiement(); $totalpaye = $fac->getSommePaiement();
$userstatic->id=$objf->userid; $userstatic->id=$objf->userid;
$userstatic->login=$objf->login; $userstatic->login=$objf->login;
$TData[] = array( $TData[] = array(
'date' => $fac->date, 'date' => $fac->date,
'link' => $fac->getNomUrl(1), 'link' => $fac->getNomUrl(1),
@ -168,13 +171,13 @@ if ($id > 0)
while ($j < $nump) while ($j < $nump)
{ {
$objp = $db->fetch_object($resqlp); $objp = $db->fetch_object($resqlp);
$paymentstatic = new Paiement($db); $paymentstatic = new Paiement($db);
$paymentstatic->id = $objp->rowid; $paymentstatic->id = $objp->rowid;
$userstatic->id=$objp->userid; $userstatic->id=$objp->userid;
$userstatic->login=$objp->login; $userstatic->login=$objp->login;
$TData[] = array( $TData[] = array(
'date' => $db->jdate($objp->dp), 'date' => $db->jdate($objp->dp),
'link' => $langs->trans("Payment") .' '. $paymentstatic->getNomUrl(1), 'link' => $langs->trans("Payment") .' '. $paymentstatic->getNomUrl(1),
@ -199,11 +202,11 @@ if ($id > 0)
{ {
dol_print_error($db); dol_print_error($db);
} }
if(empty($TData)) { if(empty($TData)) {
print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>'; print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
} else { } else {
// Sort array by date // Sort array by date
asort($TDataSort); asort($TDataSort);
array_multisort($TData,$TDataSort); array_multisort($TData,$TDataSort);
@ -213,37 +216,37 @@ if ($id > 0)
$balance += $data1['amount']; $balance += $data1['amount'];
$data1['balance'] += $balance; $data1['balance'] += $balance;
} }
// Reverse array to have last elements on top // Reverse array to have last elements on top
$TData = dol_sort_array($TData, 'date', $sortorder); $TData = dol_sort_array($TData, 'date', $sortorder);
$totalDebit = 0; $totalDebit = 0;
$totalCredit = 0; $totalCredit = 0;
// Display array // Display array
foreach($TData as $data) { foreach($TData as $data) {
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print "<td align=\"center\">".dol_print_date($data['date'],'day')."</td>\n"; print "<td align=\"center\">".dol_print_date($data['date'],'day')."</td>\n";
print '<td>'.$data['link']."</td>\n"; print '<td>'.$data['link']."</td>\n";
print '<td aling="left">'.$data['status'].'</td>'; print '<td aling="left">'.$data['status'].'</td>';
print '<td align="right">'.(($data['amount'] > 0) ? price(abs($data['amount'])) : '')."</td>\n"; print '<td align="right">'.(($data['amount'] > 0) ? price(abs($data['amount'])) : '')."</td>\n";
$totalDebit += ($data['amount'] > 0) ? abs($data['amount']) : 0; $totalDebit += ($data['amount'] > 0) ? abs($data['amount']) : 0;
print '<td align="right">'.(($data['amount'] > 0) ? '' : price(abs($data['amount'])))."</td>\n"; print '<td align="right">'.(($data['amount'] > 0) ? '' : price(abs($data['amount'])))."</td>\n";
$totalCredit += ($data['amount'] > 0) ? 0 : abs($data['amount']); $totalCredit += ($data['amount'] > 0) ? 0 : abs($data['amount']);
print '<td align="right">'.price($data['balance'])."</td>\n"; print '<td align="right">'.price($data['balance'])."</td>\n";
// Author // Author
print '<td class="nowrap" align="right">'; print '<td class="nowrap" align="right">';
print $data['author']; print $data['author'];
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
} }
print '<tr class="liste_total">'; print '<tr class="liste_total">';
print '<td colspan="3">&nbsp;</td>'; print '<td colspan="3">&nbsp;</td>';
print '<td align="right">'.price($totalDebit).'</td>'; print '<td align="right">'.price($totalDebit).'</td>';
@ -252,7 +255,7 @@ if ($id > 0)
print '<td></td>'; print '<td></td>';
print "</tr>\n"; print "</tr>\n";
} }
print "</table>"; print "</table>";
} }
} }

8
htdocs/fourn/recap-fourn.php
View File

@ -38,6 +38,8 @@ if ($user->societe_id > 0)
} }
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('supplierbalencelist','globalcard'));
/* /*
* View * View
@ -67,7 +69,7 @@ if ($socid > 0)
// Invoice list // Invoice list
print load_fiche_titre($langs->trans("SupplierPreview")); print load_fiche_titre($langs->trans("SupplierPreview"));
print '<table class="noborder" width="100%">'; print '<table class="noborder tagtable liste" width="100%">';
$sql = "SELECT s.nom, s.rowid as socid, f.ref_supplier, f.amount, f.datef as df,"; $sql = "SELECT s.nom, s.rowid as socid, f.ref_supplier, f.amount, f.datef as df,";
$sql.= " f.paye as paye, f.fk_statut as statut, f.rowid as facid,"; $sql.= " f.paye as paye, f.fk_statut as statut, f.rowid as facid,";
@ -114,7 +116,7 @@ if ($socid > 0)
} }
$totalpaye = $fac->getSommePaiement(); $totalpaye = $fac->getSommePaiement();
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print "<td align=\"center\">".dol_print_date($fac->date)."</td>\n"; print "<td align=\"center\">".dol_print_date($fac->date)."</td>\n";
@ -182,7 +184,7 @@ if ($socid > 0)
{ {
dol_print_error($db); dol_print_error($db);
} }
print "</table>"; print "</table>";
} }
} }