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

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

Browse Source 
Conflicts:
	htdocs/fourn/commande/list.php
	htdocs/takepos/invoice.php
	htdocs/user/list.php
This commit is contained in:
Laurent Destailleur 2020-12-01 10:04:51 +01:00
commit e689df8359
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/fourn/commande/list.php
View File

@ -512,14 +512,14 @@ if ($socid > 0)
$title .= ' - '.$fourn->name; $title .= ' - '.$fourn->name;
} }
if ($search_status) /*if ($search_status)
{ {
if ($search_status == '1,2') $title .= ' - '.$langs->trans("SuppliersOrdersToProcess"); if ($search_status == '1,2') $title .= ' - '.$langs->trans("SuppliersOrdersToProcess");
elseif ($search_status == '3,4') $title .= ' - '.$langs->trans("SuppliersOrdersAwaitingReception"); elseif ($search_status == '3,4') $title .= ' - '.$langs->trans("SuppliersOrdersAwaitingReception");
elseif ($search_status == '1,2,3') $title .= ' - '.$langs->trans("StatusOrderToProcessShort"); elseif ($search_status == '1,2,3') $title .= ' - '.$langs->trans("StatusOrderToProcessShort");
elseif ($search_status == '6,7') $title .= ' - '.$langs->trans("StatusOrderCanceled"); elseif ($search_status == '6,7') $title .= ' - '.$langs->trans("StatusOrderCanceled");
elseif (is_numeric($search_status)) $title .= ' - '.$commandestatic->LibStatut($search_status); elseif (is_numeric($search_status) && $search_status >= 0) $title .= ' - '.$commandestatic->LibStatut($search_status);
} }*/
if ($search_billed > 0) $title .= ' - '.$langs->trans("Billed"); if ($search_billed > 0) $title .= ' - '.$langs->trans("Billed");
//$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes"; //$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";

34
htdocs/takepos/invoice.php
View File

@ -582,22 +582,28 @@ 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) {
$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]}; $resdeletelines = 0;
$sql .= " WHERE ref='(PROV-POS".$db->escape($_SESSION["takeposterminal"])."-".$db->escape($place).")'"; break;
$resql3 = $db->query($sql); }
$invoice->update_price(1);
if ($resql1 && $resql2 && $resql3)
{
$db->commit();
} else {
$db->rollback();
} }
$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]};
$sql .= " WHERE ref='(PROV-POS".$db->escape($_SESSION["takeposterminal"]."-".$place).")'";
$resql1 = $db->query($sql);
if ($resdeletelines && $resql1)
{
$db->commit();
}
else
{
$db->rollback();
}
$invoice->fetch($placeid); $invoice->fetch($placeid);
} }
} }