Fix: Lien bouton créer action incorrect

This commit is contained in:
Laurent Destailleur 2006-08-21 01:08:03 +00:00
parent df548dc35f
commit b62a24549d
2 changed files with 549 additions and 583 deletions

View File

@ -628,7 +628,7 @@ if ($socidp > 0)
if ($conf->propal->enabled && $user->rights->propale->creer) if ($conf->propal->enabled && $user->rights->propale->creer)
{ {
$langs->load("propal"); $langs->load("propal");
print '<a class="butAction" href="addpropal.php?socidp='.$objsoc->id.'&amp;action=create">'.$langs->trans("AddProp").'</a>'; print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/addpropal.php?socidp='.$objsoc->id.'&amp;action=create">'.$langs->trans("AddProp").'</a>';
} }
if ($conf->commande->enabled && $user->rights->commande->creer) if ($conf->commande->enabled && $user->rights->commande->creer)
@ -646,10 +646,10 @@ if ($socidp > 0)
if ($conf->fichinter->enabled && $user->rights->ficheinter->creer) if ($conf->fichinter->enabled && $user->rights->ficheinter->creer)
{ {
$langs->load("fichinter"); $langs->load("fichinter");
print '<a class="butAction" href="../fichinter/fiche.php?socidp='.$objsoc->id.'&amp;action=create">'.$langs->trans("AddIntervention").'</a>'; print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/fiche.php?socidp='.$objsoc->id.'&amp;action=create">'.$langs->trans("AddIntervention").'</a>';
} }
print '<a class="butAction" href="action/fiche.php?action=create&socid='.$objsoc->id.'">'.$langs->trans("AddAction").'</a>'; print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&socid='.$objsoc->id.'">'.$langs->trans("AddAction").'</a>';
if ($user->rights->societe->contact->creer) if ($user->rights->societe->contact->creer)
{ {
@ -659,22 +659,6 @@ if ($socidp > 0)
print '</div>'; print '</div>';
print '<br>'; print '<br>';
if ($action == 'changevalue')
{
print "<hr noshade>";
print "<form action=\"index.php?socid=$objsoc->id\" method=\"post\">";
print "<input type=\"hidden\" name=\"action\" value=\"cabrecrut\">";
print "Cette société est un cabinet de recrutement : ";
print "<select name=\"selectvalue\">";
print "<option value=\"\">";
print "<option value=\"t\">Oui";
print "<option value=\"f\">Non";
print "</select>";
print "<input type=\"submit\" value=\"".$langs->trans("Valid")."\">";
print "</form>\n";
}
else
{
/* /*
* *
* Liste des contacts * Liste des contacts
@ -863,7 +847,9 @@ if ($socidp > 0)
} }
$db->free($result); $db->free($result);
} else { }
else
{
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print "</table>"; print "</table>";
@ -991,11 +977,12 @@ if ($socidp > 0)
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print "</table>";
} print "</table>";
} else { }
dolibarr_print_error($db); else
{
dolibarr_print_error($db,'Bad value for socid parameter');
} }
$db->close(); $db->close();

View File

@ -346,16 +346,16 @@ if ($socid > 0)
// Si société cliente ou prospect, on affiche bouton "Créer facture client" // Si société cliente ou prospect, on affiche bouton "Créer facture client"
if ($societe->client != 0 && $conf->facture->enabled && $user->rights->facture->creer) { if ($societe->client != 0 && $conf->facture->enabled && $user->rights->facture->creer) {
$langs->load("bills"); $langs->load("bills");
print "<a class=\"tabAction\" href=\"facture.php?action=create&socidp=$societe->id\">".$langs->trans("AddBill")."</a>"; print "<a class=\"tabAction\" href=\"".DOL_URL_ROOT."/compta/facture.php?action=create&socidp=$societe->id\">".$langs->trans("AddBill")."</a>";
} }
if ($conf->deplacement->enabled) { if ($conf->deplacement->enabled) {
$langs->load("trips"); $langs->load("trips");
print "<a class=\"tabAction\" href=\"deplacement/fiche.php?socid=$societe->id&amp;action=create\">".$langs->trans("AddTrip")."</a>"; print "<a class=\"tabAction\" href=\"".DOL_URL_ROOT."/compta/deplacement/fiche.php?socid=$societe->id&amp;action=create\">".$langs->trans("AddTrip")."</a>";
} }
} }
print '<a class="butAction" href="action/fiche.php?action=create&socid='.$objsoc->id.'">'.$langs->trans("AddAction").'</a>'; print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&socid='.$socid.'">'.$langs->trans("AddAction").'</a>';
if ($user->rights->societe->contact->creer) if ($user->rights->societe->contact->creer)
{ {
@ -365,28 +365,6 @@ if ($socid > 0)
print '</div>'; print '</div>';
print "<br>\n"; print "<br>\n";
/*
*
*
*/
if ($action == 'changevalue')
{
print "<hr noshade>";
print "<form action=\"index.php?socid=$societe->id\" method=\"post\">";
print "<input type=\"hidden\" name=\"action\" value=\"cabrecrut\">";
print "Cette société est un cabinet de recrutement : ";
print "<select name=\"selectvalue\">";
print "<option value=\"\">";
print "<option value=\"t\">Oui";
print "<option value=\"f\">Non";
print "</select>";
print "<input type=\"submit\" class=\"button\" value=\"".$langs->trans("Update")."\">";
print "</form>\n";
}
else
{
/* /*
* *
* Liste des contacts * Liste des contacts
@ -560,7 +538,9 @@ if ($socid > 0)
} }
$db->free($result); $db->free($result);
} else { }
else
{
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print "</table><br>"; print "</table><br>";
@ -677,11 +657,10 @@ if ($socid > 0)
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print "</table>"; print "</table>";
}
} else
{
} else { dolibarr_print_error($db,'Bad value for socid parameter');
print "Erreur";
} }
$db->close(); $db->close();