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

FIX compatibility for ticket number sharing

Browse Source
This commit is contained in:
Regis Houssin 2022-04-21 16:02:41 +02:00
parent 8878eb6d76
commit 2a5c54d4e4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/ticket/mod_ticket_simple.php
View File

@ -129,7 +129,7 @@ class mod_ticket_simple extends ModeleNumRefTicket
$sql .= " FROM ".MAIN_DB_PREFIX."ticket"; $sql .= " FROM ".MAIN_DB_PREFIX."ticket";
$search = $this->prefix."____-%"; $search = $this->prefix."____-%";
$sql .= " WHERE ref LIKE '".$db->escape($search)."'"; $sql .= " WHERE ref LIKE '".$db->escape($search)."'";
$sql .= " AND entity = ".$conf->entity; $sql .= " AND entity IN (".getEntity('ticketnumber', 1, $ticket).")";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) { if ($resql) {

5
htdocs/core/modules/ticket/mod_ticket_universal.php
View File

@ -134,8 +134,11 @@ class mod_ticket_universal extends ModeleNumRefTicket
return 0; return 0;
} }
// Get entities
$entity = getEntity('ticketnumber', 1, $ticket);
$date = empty($ticket->datec) ? dol_now() : $ticket->datec; $date = empty($ticket->datec) ? dol_now() : $ticket->datec;
$numFinal = get_next_value($db, $mask, 'ticket', 'ref', '', $objsoc->code_client, $date); $numFinal = get_next_value($db, $mask, 'ticket', 'ref', '', $objsoc->code_client, $date, 'next', false, null, $entity);
return $numFinal; return $numFinal;
} }