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

FIX The backtopage

Browse Source
This commit is contained in:
Laurent Destailleur 2017-09-27 20:07:01 +02:00
parent fdc1aa2a03
commit 6bdfa99fc2
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/contact/card.php
View File

@ -396,6 +396,15 @@ if (empty($reshook))
$action = 'edit'; $action = 'edit';
} }
} }
if (! $error && empty($errors))
{
if (! empty($backtopage))
{
header("Location: ".$backtopage);
exit;
}
}
} }
} }

11
htdocs/core/lib/company.lib.php
View File

@ -52,6 +52,17 @@ function societe_prepare_head(Societe $object)
{ {
//$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external')); //$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
$nbContact = 0; // TODO $nbContact = 0; // TODO
$sql = "SELECT COUNT(p.rowid) as nb";
$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
$sql .= " WHERE p.fk_soc = ".$object->id;
$resql = $db->query($sql);
if ($resql)
{
$obj = $db->fetch_object($resql);
if ($obj) $nbContact = $obj->nb;
}
$head[$h][0] = DOL_URL_ROOT.'/societe/contact.php?socid='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/societe/contact.php?socid='.$object->id;
$head[$h][1] = $langs->trans('ContactsAddresses'); $head[$h][1] = $langs->trans('ContactsAddresses');
if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>'; if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';

6
htdocs/ecm/docfile.php
View File

@ -117,9 +117,9 @@ if (! ($result >= 0))
if ($cancel) if ($cancel)
{ {
$action =''; $action ='';
if ($backtourl) if ($backtopage)
{ {
header("Location: ".$backtourl); header("Location: ".$backtopage);
exit; exit;
} }
else else
@ -387,7 +387,7 @@ if ($action != 'edit')
{ {
print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&section='.$section.'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Edit').'</a>'; print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&section='.$section.'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Edit').'</a>';
//print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=cancel&section='.$section.'&urlfile='.urlencode($urlfile).'&backtourl='.urlencode($backtourl).'">'.$langs->trans('Cancel').'</a>'; //print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=cancel&section='.$section.'&urlfile='.urlencode($urlfile).'&backtopage='.urlencode($backtourl).'">'.$langs->trans('Cancel').'</a>';
} }
/* /*
if ($user->rights->ecm->setup) if ($user->rights->ecm->setup)