diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php index 39dac0352e6..4fb3cfa41aa 100644 --- a/htdocs/compta/paiement/card.php +++ b/htdocs/compta/paiement/card.php @@ -36,6 +36,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php'; if (isModEnabled("banque")) { 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')); @@ -432,6 +435,10 @@ if ($resql) { if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)) { print ''.$langs->trans('Entity').''; } + //Add Margin + if (!empty($conf->margin->enabled) && getDolGlobalInt('MARGIN_SHOW_MARGIN_ON_PAYMENT')) { + print ''.$langs->trans('Margin').''; + } print ''.$langs->trans('ExpectedToPay').''; print ''.$langs->trans('PayedByThisPayment').''; print ''.$langs->trans('RemainderToPay').''; @@ -447,6 +454,14 @@ if ($resql) { $invoice = new Facture($db); $invoice->fetch($objp->facid); + // Add Margin + if (!empty($conf->margin->enabled) && getDolGlobalInt('MARGIN_SHOW_MARGIN_ON_PAYMENT')) { + $formmargin = new FormMargin($db); + $marginInfo = array(); + $invoice->fetch_lines(); + $marginInfo = $formmargin->getMarginInfosArray($invoice); + } + $paiement = $invoice->getSommePaiement(); $creditnotes = $invoice->getSumCreditNotesUsed(); $deposits = $invoice->getSumDepositsUsed(); @@ -472,6 +487,12 @@ if ($resql) { print $mc->label; print ''; } + + // Add margin + if (!empty($conf->margin->enabled) && getDolGlobalInt('MARGIN_SHOW_MARGIN_ON_PAYMENT')) { + print ''.price($marginInfo['total_margin']).''; + } + // Expected to pay print ''.price($objp->total_ttc).'';