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

FIX #15374 : "New" doesn't clear total amounts

Browse Source 
Invoice's total amounts where not updated because of direct lines deleting in database.
This commit is contained in:
teleassist 2020-11-30 11:22:49 +01:00 committed by GitHub
parent 4f762cf73d
commit 560194c3b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/takepos/invoice.php
View File

@ -411,17 +411,18 @@ if ($action == "delete") {
if ($result > 0 && $invoice->statut == Facture::STATUS_DRAFT) if ($result > 0 && $invoice->statut == Facture::STATUS_DRAFT)
{ {
$db->begin(); $db->begin();
// We delete the lines // We delete the lines
$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet_extrafields where fk_object = ".$placeid; $resdeletelines = 1;
$resql1 = $db->query($sql); foreach($invoice->lines as $line){
$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet where fk_facture = ".$placeid; $resdeletelines *= $invoice->deleteline($line->id);
$resql2 = $db->query($sql); }
$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]}; $sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]};
$sql .= " WHERE ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'"; $sql .= " WHERE ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
$resql3 = $db->query($sql); $resql1 = $db->query($sql);
if ($resql1 && $resql2 && $resql3) if ($resdeletelines && $resql1)
{ {
$db->commit(); $db->commit();
} }
@ -429,8 +430,8 @@ if ($action == "delete") {
{ {
$db->rollback(); $db->rollback();
} }
$invoice->fetch($placeid); $invoice->fetch($placeid);
} }
} }
} }