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

NEW : add margin in paiement/card.php

Browse Source
This commit is contained in:
Jay Yeo 2021-12-17 14:31:06 +07:00
parent f9e4266007
commit 4c4d362348
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/compta/paiement/card.php
View File

@ -35,6 +35,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
if (!empty($conf->banque->enabled)) {
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
}
if (!empty($conf->margin->enabled)) {
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';
}
// Load translation files required by the page
$langs->loadLangs(array('bills', 'banks', 'companies'));
@ -359,10 +362,15 @@ if ($resql) {
print '<tr class="liste_titre">';
print '<td>'.$langs->trans('Bill').'</td>';
print '<td>'.$langs->trans('Company').'</td>';
if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)) {
print '<td>'.$langs->trans('Entity').'</td>';
}
//Add Margin
if (!empty($conf->margin->enabled)) {
print '<td class="right">'.$langs->trans('Margin').'</td>';
}
print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
print '<td class="right">'.$langs->trans('RemainderToPay').'</td>';
@ -378,6 +386,14 @@ if ($resql) {
$invoice = new Facture($db);
$invoice->fetch($objp->facid);
// Add Margin
if (!empty($conf->margin->enabled)) {
$formmargin = new FormMargin($db);
$marginInfo = array();
$invoice->fetch_lines();
$marginInfo = $formmargin->getMarginInfosArray($invoice);
}
$paiement = $invoice->getSommePaiement();
$creditnotes = $invoice->getSumCreditNotesUsed();
$deposits = $invoice->getSumDepositsUsed();
@ -403,6 +419,12 @@ if ($resql) {
print $mc->label;
print '</td>';
}
// Add margin
if (!empty($conf->margin->enabled)) {
print '<td class="right">'.price($marginInfo['total_margin']).'</td>';
}
// Expected to pay
print '<td class="right"><span class="amount">'.price($objp->total_ttc).'</span></td>';