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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2022-11-29 23:53:04 +01:00
commit f460a3db2b
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,12 +67,11 @@ if ($socid && $socid != $object->thirdparty->id) {
$error = 0;
/*
* Actions
*/
if ($action == 'setnote' && $user->rights->facture->paiement) {
if ($action == 'setnote' && $user->hasRight('facture', 'paiement')) {
$db->begin();
$result = $object->update_note(GETPOST('note', 'restricthtml'));
@ -142,13 +141,13 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture
$invoice = new Facture($db);
if ($invoice->fetch($objp->facid) <= 0) {
$errors++;
$error++;
setEventMessages($invoice->error, $invoice->errors, 'errors');
break;
}
if ($invoice->generateDocument($invoice->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref) < 0) {
$errors++;
$error++;
setEventMessages($invoice->error, $invoice->errors, 'errors');
break;
}
@ -159,12 +158,12 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture
$db->free($resql);
} else {
$errors++;
$error++;
setEventMessages($db->error, $db->errors, 'errors');
}
}
if (! $errors) {
if (! $error) {
header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
exit;
}

2
htdocs/product/reassortlot.php
View File

@ -635,7 +635,7 @@ while ($i < $imaxinloop) {
$product_static->status_batch = $objp->tobatch;
$product_lot_static->batch = $objp->batch;
$product_lot_static->product_id = $objp->rowid;
$product_lot_static->fk_product = $objp->rowid;
$product_lot_static->id = $objp->lotid;
$product_lot_static->eatby = $objp->eatby;
$product_lot_static->sellby = $objp->sellby;