vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Laurent Destailleur 2025-10-14 21:51:24 +02:00
commit 862ea4e15c
6 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
htdocs/comm/mailing/list.php
View file

@ -265,7 +265,7 @@ $num = $db->num_rows($resql);
if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
$obj = $db->fetch_object($resql);
$id = $obj->rowid;
header("Location: ".dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.$id);
header("Location: ".dol_buildpath('/comm/mailing/card.php', 1).'?id='.((int) $id));
exit;
}
@ -538,7 +538,8 @@ while ($i < $imaxinloop) {
}
// Title
print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->title).'">'.dol_escape_htmltag($obj->title).'</td>';
print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->title).'"><a href="card.php?id='.$object->id.'">'.dol_escape_htmltag($obj->title).'</a></td>';
// Date creation
print '<td class="center">';

2
htdocs/don/list.php
View file

@ -319,7 +319,7 @@ $num = $db->num_rows($resql);
if ($num == 1 && getDolGlobalInt('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
$obj = $db->fetch_object($resql);
$id = $obj->rowid;
header("Location: ".dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.((int) $id));
header("Location: ".dol_buildpath('/don/card.php', 1).'?id='.((int) $id));
exit;
}

2
htdocs/loan/list.php
View file

@ -222,7 +222,7 @@ $num = $db->num_rows($resql);
if ($num == 1 && getDolGlobalInt('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
$obj = $db->fetch_object($resql);
$id = $obj->rowid;
header("Location: ".dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.((int) $id));
header("Location: ".dol_buildpath('/loan/card.php', 1).'?id='.((int) $id));
exit;
}

3
htdocs/product/class/api_products.class.php
View file

@ -900,7 +900,8 @@ class Products extends DolibarrApi
* @return int
*
* @throws RestException 500 System error
* @throws RestException 401
* @throws RestException 404
* @throws RestException 403
*
* @url POST {id}/purchase_prices
*/

14
htdocs/reception/card.php
View file

@ -198,20 +198,6 @@ if ($reshook < 0) {
}
if (empty($reshook)) {
/*
$backurlforlist = DOL_URL_ROOT.'/reception/list.php';
if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
$backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
}
*/
if ($cancel) {
if (!empty($backtopageforcancel)) {
header("Location: ".$backtopageforcancel);

1
htdocs/ticket/class/cticketcategory.class.php
View file

@ -480,7 +480,6 @@ class CTicketCategory extends CommonObject
*/
$label = '';
//$url = dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.$this->id;
$url = '';
if ($option != 'nolink') {