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

NEW Auto set invoice paid when adding credit not and remain to pay is 0

Browse Source
This commit is contained in:
Laurent Destailleur 2022-03-30 18:41:45 +02:00
parent 7422fd9b07
commit 97a7450f10
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
htdocs/compta/facture/card.php
View File

@ -156,12 +156,12 @@ if (!empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
} }
// Security check // Security check
$fieldid = (!empty($ref) ? 'ref' : 'rowid');
if ($user->socid) { if ($user->socid) {
$socid = $user->socid; $socid = $user->socid;
} }
$isdraft = (($object->statut == Facture::STATUS_DRAFT) ? 1 : 0); $isdraft = (($object->statut == Facture::STATUS_DRAFT) ? 1 : 0);
$result = restrictedArea($user, 'facture', $object->id, '', '', 'fk_soc', $fieldid, $isdraft);
$result = restrictedArea($user, 'facture', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
/* /*
@ -546,7 +546,8 @@ if (empty($reshook)) {
$object->fetch($id); $object->fetch($id);
$result = $object->setDiscount($user, price2num(GETPOST('remise_percent'), '', 2)); $result = $object->setDiscount($user, price2num(GETPOST('remise_percent'), '', 2));
} elseif ($action == "setabsolutediscount" && $usercancreate) { } elseif ($action == "setabsolutediscount" && $usercancreate) {
// POST[remise_id] or POST[remise_id_for_payment] // We have POST[remise_id] or POST[remise_id_for_payment]
$db->begin();
// We use the credit to reduce amount of invoice // We use the credit to reduce amount of invoice
if (GETPOST("remise_id", 'int') > 0) { if (GETPOST("remise_id", 'int') > 0) {
@ -557,7 +558,8 @@ if (empty($reshook)) {
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
} }
} else { } else {
dol_print_error($db, $object->error); $error++;
setEventMessages($object->error, $object->errors, 'errors');
} }
} }
// We use the credit to reduce remain to pay // We use the credit to reduce remain to pay
@ -568,7 +570,8 @@ if (empty($reshook)) {
//var_dump($object->getRemainToPay(0)); //var_dump($object->getRemainToPay(0));
//var_dump($discount->amount_ttc);exit; //var_dump($discount->amount_ttc);exit;
if (price2num($discount->amount_ttc) > price2num($object->getRemainToPay(0))) { $remaintopay = $object->getRemainToPay(0);
if (price2num($discount->amount_ttc) > price2num($remaintopay)) {
// TODO Split the discount in 2 automatically // TODO Split the discount in 2 automatically
$error++; $error++;
setEventMessages($langs->trans("ErrorDiscountLargerThanRemainToPaySplitItBefore"), null, 'errors'); setEventMessages($langs->trans("ErrorDiscountLargerThanRemainToPaySplitItBefore"), null, 'errors');
@ -577,12 +580,26 @@ if (empty($reshook)) {
if (!$error) { if (!$error) {
$result = $discount->link_to_invoice(0, $id); $result = $discount->link_to_invoice(0, $id);
if ($result < 0) { if ($result < 0) {
$error++;
setEventMessages($discount->error, $discount->errors, 'errors'); setEventMessages($discount->error, $discount->errors, 'errors');
} }
} }
if (!$error) {
$newremaintopay = $object->getRemainToPay(0);
if ($newremaintopay == 0) {
$object->setPaid($user);
}
}
} }
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { if (!$error) {
$db->commit();
} else {
$db->rollback();
}
if (empty($error) && empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
$outputlangs = $langs; $outputlangs = $langs;
$newlang = ''; $newlang = '';
if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) { if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {