diff --git a/ChangeLog b/ChangeLog index c7cd52038afc0..8f8467ddc7157 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 ***** diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index 1685970dd0869..718df6f595899 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -290,7 +290,7 @@ $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 @@ print '
'.$langs->trans("DateChequeReceived")." | \n"; - print ''.$langs->trans("ChequeNumber")." | \n"; - print ''.$langs->trans("CheckTransmitter")." | \n"; - print ''.$langs->trans("Bank")." | \n"; - print ''.$langs->trans("Amount")." | \n"; + print ''.$langs->trans("DateChequeReceived")." | \n"; + print ''.$langs->trans("ChequeNumber")." | \n"; + print ''.$langs->trans("CheckTransmitter")." | \n"; + print ''.$langs->trans("Bank")." | \n"; + print ''.$langs->trans("Amount")." | \n"; print "
'.dol_print_date($value["date"],'day').' | '; + print ''.dol_print_date($value["date"],'day').' | '; print ''.$value["numero"]." | \n"; print ''.$value["emetteur"]." | \n"; print ''.$value["banque"]." | \n"; diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 4bbd7c3fe56b3..4bb3496295dee 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -177,7 +177,9 @@ 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 @@ // 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 @@ $_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 @@ print '