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

Merge pull request #15580 from teleassist/teleassist-12.0Fix15374

Browse Source 
FIX #15374 : "New" doesn't clear total amounts
This commit is contained in:
Laurent Destailleur 2020-11-30 15:40:19 +01:00 committed by GitHub
commit 627d09d75e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/takepos/invoice.php
View File

@ -412,16 +412,21 @@ if ($action == "delete") {
{ {
$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; $tmpres = $invoice->deleteline($line->id);
$resql2 = $db->query($sql); if ($tmpres < 0) {
$resdeletelines = 0;
break;
}
}
$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();
} }
@ -430,7 +435,7 @@ if ($action == "delete") {
$db->rollback(); $db->rollback();
} }
$invoice->fetch($placeid); $invoice->fetch($placeid);
} }
} }
} }