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

New: Support a backtopage parameter on contact creation page

Browse Source
This commit is contained in:
Laurent Destailleur 2011-03-20 15:42:25 +00:00
parent 7e70ea08a9
commit 469a163f3c
6 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -35,6 +35,7 @@ For developers:
- New: External modules can overwrite all default language files by
forcing priority on langs directories on its own lang directory.
- New: External modules can show export list with an "enabled" condition.
- New: Support a backtopage parameter on contact creation page
***** ChangeLog for 3.0 compared to 2.9 *****

14
htdocs/compta/paiement/cheque/fiche.php
View File

@ -290,7 +290,7 @@ if ($_GET['action'] == 'new')
$sql.= " AND ba.entity = ".$conf->entity;
$sql.= " AND b.fk_bordereau = 0";
$sql.= " AND b.amount > 0";
$sql.= " ORDER BY b.emetteur ASC, b.rowid ASC";
$sql.= $db->order("b.dateo,b.rowid","ASC");
$resql = $db->query($sql);
if ($resql)
@ -319,11 +319,11 @@ if ($_GET['action'] == 'new')
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("DateChequeReceived")." &nbsp;</td>\n";
print '<td width="120">'.$langs->trans("ChequeNumber")."</td>\n";
print '<td>'.$langs->trans("CheckTransmitter")."</td>\n";
print '<td>'.$langs->trans("Bank")."</td>\n";
print '<td align="right">'.$langs->trans("Amount")."</td>\n";
print '<td style="min-width: 120px">'.$langs->trans("DateChequeReceived")." &nbsp;</td>\n";
print '<td style="min-width: 120px">'.$langs->trans("ChequeNumber")."</td>\n";
print '<td style="min-width: 200px">'.$langs->trans("CheckTransmitter")."</td>\n";
print '<td style="min-width: 200px">'.$langs->trans("Bank")."</td>\n";
print '<td align="right" width="100px">'.$langs->trans("Amount")."</td>\n";
print "</tr>\n";
$var=true;
@ -336,7 +336,7 @@ if ($_GET['action'] == 'new')
$accounts[$objp->bid] += 1;
print "<tr ".$bc[$var].">";
print '<td width="120">'.dol_print_date($value["date"],'day').'</td>';
print '<td>'.dol_print_date($value["date"],'day').'</td>';
print '<td>'.$value["numero"]."</td>\n";
print '<td>'.$value["emetteur"]."</td>\n";
print '<td>'.$value["banque"]."</td>\n";

14
htdocs/contact/fiche.php
View File

@ -177,7 +177,9 @@ else
if (! $error && $id > 0)
{
$db->commit();
Header("Location: fiche.php?id=".$id);
if (GETPOST('backtopage')) $url=GETPOST('backtopage');
else $url='fiche.php?id='.$id;
Header("Location: ".$url);
exit;
}
else
@ -385,9 +387,7 @@ else
// When used in standard mode
// -----------------------------------------
/*
* Confirmation de la suppression du contact
*/
// Confirm deleting contact
if ($user->rights->societe->contact->supprimer)
{
if ($_GET["action"] == 'delete')
@ -411,9 +411,7 @@ else
$_GET["id"]=0;
}
/*
* Affichage onglets
*/
// Show tabs
$head = contact_prepare_head($object);
dol_fiche_head($head, 'card', $langs->trans("ContactsAddresses"), 0, 'contact');
@ -469,6 +467,8 @@ else
print '<form method="post" name="formsoc" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">';
print '<input type="hidden" name="backtopage" value="'.GETPOST("backtopage").'">';
print '<input type="hidden" name="action" value="add">';
print '<table class="border" width="100%">';
// Name

1
htdocs/langs/en_US/main.lang
View File

@ -106,6 +106,7 @@ Enabled=Enabled
Disable=Disable
Disabled=Disabled
Add=Add
AddLink=Add link
Update=Update
AddActionToDo=Add action to do
AddActionDone=Add action done

1
htdocs/langs/fr_FR/main.lang
View File

@ -105,6 +105,7 @@ Disable=Désactiver
Disabled=Désactivé
Create=Créer
Add=Ajouter
AddLink=Lier
Update=Modifier
AddActionToDo=Ajouter action à faire
AddActionDone=Ajouter action faite

22
htdocs/societe/soc.php
View File

@ -242,24 +242,10 @@ else
{
$db->commit();
if ( $soc->client == 1 )
{
Header("Location: ".DOL_URL_ROOT."/comm/fiche.php?socid=".$soc->id);
return;
}
else
{
if ( $soc->fournisseur == 1 )
{
Header("Location: ".DOL_URL_ROOT."/fourn/fiche.php?socid=".$soc->id);
return;
}
else
{
Header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$soc->id);
return;
}
}
$url=$_SERVER["PHP_SELF"]."?socid=".$soc->id;
if (($soc->client == 1 || $soc->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url=DOL_URL_ROOT."/comm/fiche.php?socid=".$soc->id;
else if ($soc->fournisseur == 1) $url=DOL_URL_ROOT."/fourn/fiche.php?socid=".$soc->id;
Header("Location: ".$url);
exit;
}
else