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

pay whole contract

Browse Source
This commit is contained in:
tnegre 2023-04-21 15:51:25 +02:00
parent 5c5bb6ec7c
commit 53d2f8eaee
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/public/payment/paymentok.php
View File

@ -1579,7 +1579,7 @@ if ($ispaymentok) {
$postactionmessages[] = 'Invoice paid '.$tmptag['ATT'].' was not found'; $postactionmessages[] = 'Invoice paid '.$tmptag['ATT'].' was not found';
$ispostactionok = -1; $ispostactionok = -1;
} }
} elseif (array_key_exists('CON', $tmptag) && array_key_exists('COL', $tmptag) && $tmptag['CON'] > 0 && $tmptag['COL'] > 0) { } elseif (array_key_exists('CON', $tmptag) && $tmptag['CON'] > 0) {
include_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php'; include_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
$object = new Contrat($db); $object = new Contrat($db);
$result = $object->fetch((int) $tmptag['CON']); $result = $object->fetch((int) $tmptag['CON']);
@ -1613,13 +1613,14 @@ if ($ispaymentok) {
} }
$currencyCodeType = $_SESSION['currencyCodeType']; $currencyCodeType = $_SESSION['currencyCodeType'];
$contract_lines = (array_key_exists('COL', $tmptag) && $tmptag['COL'] > 0) ? $tmptag['COL'] : null;
// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time) // Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
if (isModEnabled('facture')) { if (isModEnabled('facture')) {
if (!empty($FinalPaymentAmt) && $paymentTypeId > 0 ) { if (!empty($FinalPaymentAmt) && $paymentTypeId > 0 ) {
include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
$invoice = new Facture($db); $invoice = new Facture($db);
$result = $invoice->createFromContract($object, $user, array((int) $tmptag['COL'])); $result = $invoice->createFromContract($object, $user, array((int) $contract_lines));
if ($result > 0) { if ($result > 0) {
// $object->classifyBilled($user); // $object->classifyBilled($user);
$invoice->validate($user); $invoice->validate($user);
@ -1685,11 +1686,13 @@ if ($ispaymentok) {
$db->rollback(); $db->rollback();
} }
} else { } else {
$postactionmessages[] = 'Failed to create invoice form contract ' . $tmptag['CON'] . ' and col '. $tmptag['COL'] .'.'; $msg = 'Failed to create invoice form contract ' . $tmptag['CON'];
if (!empty($cols)) $msg .= ' and col '. $cols .'.';
$postactionmessages[] = $msg;
$ispostactionok = -1; $ispostactionok = -1;
} }
} else { } else {
$postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type id" (' . $paymentTypeId . ') to record the payment of contract ' . $tmptag['CON'] . ' and col '. $tmptag['COL'] .'. Maybe payment was already recorded.'; $postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type id" (' . $paymentTypeId . ') to record the payment of contract ' . $tmptag['CON'] .'. Maybe payment was already recorded.';
$ispostactionok = -1; $ispostactionok = -1;
} }
} else { } else {
@ -1697,7 +1700,9 @@ if ($ispaymentok) {
$ispostactionok = -1; $ispostactionok = -1;
} }
} else { } else {
$postactionmessages[] = 'Contract paid ' . $tmptag['CON'] . ' was not found for col '. $tmptag['COL'] .'.'; $msg = 'Contract paid ' . $tmptag['CON'] . ' was not found';
if (!empty($cols)) $msg .= ' for col '.$tmptag['COL'] .'.';
$postactionmessages[] = $msg;
$ispostactionok = -1; $ispostactionok = -1;
} }
} }