From 472397d5c2f2a4d699c84b0742ac9d823c012ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 28 Jul 2012 20:47:12 +0200 Subject: [PATCH 1/8] BackToList links in Supplier order section --- htdocs/comm/propal.php | 2 +- htdocs/fourn/commande/contact.php | 4 +++- htdocs/fourn/commande/document.php | 4 +++- htdocs/fourn/commande/fiche.php | 4 +++- htdocs/fourn/commande/history.php | 4 +++- htdocs/fourn/commande/note.php | 4 +++- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index b8f03a32b38..eecf70a7a97 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1271,7 +1271,7 @@ $linkback=''; -print $form->showrefnav($object,'ref',$linkback,1,'ref','ref',''); +print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', ''); print ''; // Ref client diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php index be532b75261..2349efa9c93 100644 --- a/htdocs/fourn/commande/contact.php +++ b/htdocs/fourn/commande/contact.php @@ -147,10 +147,12 @@ if ($id > 0 || ! empty($ref)) */ print ''; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; print ''; diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php index 94483274ef7..ee319fd9d02 100644 --- a/htdocs/fourn/commande/document.php +++ b/htdocs/fourn/commande/document.php @@ -158,10 +158,12 @@ if ($object->id > 0) print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; print ''; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index f1f17b5a5d3..b5a826e60c2 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -1049,10 +1049,12 @@ if ($id > 0 || ! empty($ref)) print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; print ''; diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php index 499565927a3..f911e8c2b71 100644 --- a/htdocs/fourn/commande/history.php +++ b/htdocs/fourn/commande/history.php @@ -76,10 +76,12 @@ if ($id > 0 || ! empty($ref)) print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; print ''; diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index a1cd6119a57..7ffc4489ab8 100644 --- a/htdocs/fourn/commande/note.php +++ b/htdocs/fourn/commande/note.php @@ -97,10 +97,12 @@ if ($id > 0 || ! empty($ref)) */ print '
'.$langs->trans("Ref").''; - print $form->showrefnav($commande,'ref','',1,'ref','ref'); + print $form->showrefnav($commande, 'ref', $linkback, 1, 'ref', 'ref'); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; print ''; From 90963ca84adc4d40f42d998af8d0f171eab220a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 28 Jul 2012 20:54:07 +0200 Subject: [PATCH 2/8] BackToList links in Client orders section --- htdocs/comm/propal.php | 2 +- htdocs/commande/contact.php | 4 +++- htdocs/commande/document.php | 6 ++++-- htdocs/commande/fiche.php | 4 +++- htdocs/commande/note.php | 4 +++- htdocs/fourn/commande/document.php | 2 +- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index eecf70a7a97..c58cf03db50 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1267,7 +1267,7 @@ print $formconfirm; print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print '
'; -$linkback=''.$langs->trans("BackToList").''; +$linkback = ''.$langs->trans("BackToList").''; // Ref print '
'.$langs->trans('Ref').''; diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php index f1e977fe9e6..7569d449af0 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -153,9 +153,11 @@ if ($id > 0 || ! empty($ref)) */ print ''; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print '"; // Ref commande client diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index ded13509385..1c69a24fcb3 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -158,11 +158,13 @@ if ($id > 0 || ! empty($ref)) } - print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print "
'; + print '
'; + + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; print ''; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 4b462c32613..43a284f4e20 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1757,10 +1757,12 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G print '
'.$langs->trans('Ref').''; - print $form->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print '
'.$langs->trans('Company').''.$object->thirdparty->getNomUrl(1).'
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; print ''; diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php index 614c28421a2..5e2c8b45f14 100644 --- a/htdocs/commande/note.php +++ b/htdocs/commande/note.php @@ -87,9 +87,11 @@ if ($id > 0 || ! empty($ref)) print '
'.$langs->trans('Ref').''; - print $form->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print '"; // Ref commande client diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php index ee319fd9d02..e659957d2f9 100644 --- a/htdocs/fourn/commande/document.php +++ b/htdocs/fourn/commande/document.php @@ -156,7 +156,7 @@ if ($object->id > 0) } - print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print "
'; + print '
'; $linkback = ''.$langs->trans("BackToList").''; From b3b33b7aca13caf9c070322a7b5db4a0e8195bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 28 Jul 2012 20:59:57 +0200 Subject: [PATCH 3/8] BackToList links in Contracts section --- htdocs/contrat/contact.php | 4 +++- htdocs/contrat/document.php | 4 +++- htdocs/contrat/fiche.php | 4 +++- htdocs/contrat/note.php | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index 915a2775b91..2eea1fd3dc0 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -144,9 +144,11 @@ if ($id > 0 || ! empty($ref)) */ print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Reference du contrat print '"; // Customer diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index 2c09a9b94c3..5a9ea118bb6 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.php @@ -156,8 +156,10 @@ if ($object->id) print '
'.$langs->trans("Ref").''; - print $object->ref; + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', ''); print "
'; + $linkback = ''.$langs->trans("BackToList").''; + // Reference - print ''; + print ''; // Societe print ''; diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index b1c828b7a3e..a1367ebae61 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -725,9 +725,11 @@ else print '
'.$langs->trans('Ref').''.$object->ref.'
'.$langs->trans('Ref').''.$form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '').'
'.$langs->trans("Customer").'
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref du contrat print '"; // Customer diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index 57bd23ccd89..921c36b5c02 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/note.php @@ -85,8 +85,10 @@ if ($id > 0 || ! empty($ref)) print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref','ref',''); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', ''); print "
'; + $linkback = ''.$langs->trans("BackToList").''; + // Reference - print ''; + print ''; // Societe print ''; From 32a3477ccbd71a727eaf68a4383f8d769b177161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 28 Jul 2012 21:05:00 +0200 Subject: [PATCH 4/8] BackToList links in Interventions section --- htdocs/fichinter/contact.php | 4 +++- htdocs/fichinter/document.php | 4 +++- htdocs/fichinter/fiche.php | 4 +++- htdocs/fichinter/note.php | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php index de49c8e781e..0f1d347f0a5 100644 --- a/htdocs/fichinter/contact.php +++ b/htdocs/fichinter/contact.php @@ -128,9 +128,11 @@ if ($id > 0 || ! empty($ref)) */ print '
'.$langs->trans('Ref').''.$object->ref.'
'.$langs->trans('Ref').''.$form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '').'
'.$langs->trans("Customer").'
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print '"; // Customer diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php index 03ecf75522c..4419c63a4ed 100644 --- a/htdocs/fichinter/document.php +++ b/htdocs/fichinter/document.php @@ -157,9 +157,11 @@ if ($object->id) print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print "
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; // Societe diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index c8fb4c33aca..77dc95ad6bc 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -885,9 +885,11 @@ else if ($id > 0 || ! empty($ref)) print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; // Third party diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php index 6b554c3aac1..630abae78b2 100644 --- a/htdocs/fichinter/note.php +++ b/htdocs/fichinter/note.php @@ -78,8 +78,10 @@ if ($id > 0 || ! empty($ref)) print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + print ''; // Company From 2eeaad1352e156a1aa6817d54de0649e68572795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 28 Jul 2012 21:22:59 +0200 Subject: [PATCH 5/8] BackToList links in Financial section --- htdocs/compta/deplacement/fiche.php | 4 +++- htdocs/compta/dons/fiche.php | 4 +++- htdocs/compta/facture.php | 4 +++- htdocs/compta/facture/contact.php | 4 +++- htdocs/compta/facture/document.php | 6 ++++-- htdocs/compta/facture/note.php | 4 +++- htdocs/compta/facture/prelevement.php | 4 +++- htdocs/fourn/facture/contact.php | 4 +++- htdocs/fourn/facture/document.php | 6 ++++-- htdocs/fourn/facture/fiche.php | 4 +++- htdocs/fourn/facture/note.php | 4 +++- 11 files changed, 35 insertions(+), 13 deletions(-) diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index 02cf7dcb4ef..4a8168e398f 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -434,9 +434,11 @@ else if ($id) print '
'.$langs->trans('Ref').''; - print $form->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; // Type diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index d33fac9299a..0a8e57eb880 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -442,12 +442,14 @@ if (! empty($id) && $action != 'edit') print ''; print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'id','',1,'rowid','ref',''); + print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', ''); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + $nbrows=12; if ($conf->projet->enabled) $nbrows++; // Ref print "".''; print ''; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 6ecbb4c5b80..fcf1f9a7c57 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2351,6 +2351,8 @@ else if ($id > 0 || ! empty($ref)) print '
'.$langs->trans("Ref").''; - print $form->showrefnav($don,'rowid','',1,'rowid','ref',''); + print $form->showrefnav($don, 'rowid', $linkback, 1, 'rowid', 'ref', ''); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; // Ref customer diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index 947c7d83cf7..dbf19328cf9 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -144,6 +144,8 @@ if ($id > 0 || ! empty($ref)) */ print '
'.$langs->trans('Ref').''; @@ -2365,7 +2367,7 @@ else if ($id > 0 || ! empty($ref)) { dol_print_error('',$discount->error); } - print $form->showrefnav($object,'ref','',1,'facnumber','ref',$morehtmlref); + print $form->showrefnav($object, 'ref', $linkback, 1, 'facnumber', 'ref', $morehtmlref); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; // Ref customer diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index e023a0dd242..c413b3ac2d3 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -163,7 +163,9 @@ if ($id > 0 || ! empty($ref)) - print '
'.$langs->trans('Ref').''; @@ -158,7 +160,7 @@ if ($id > 0 || ! empty($ref)) { dol_print_error('',$discount->error); } - print $form->showrefnav($object,'ref','',1,'facnumber','ref',$morehtmlref); + print $form->showrefnav($object, 'ref', $linkback, 1, 'facnumber', 'ref', $morehtmlref); print '
'; + print '
'; + + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; @@ -179,7 +181,7 @@ if ($id > 0 || ! empty($ref)) { dol_print_error('',$discount->error); } - print $form->showrefnav($object,'ref','',1,'facnumber','ref',$morehtmlref); + print $form->showrefnav($object, 'ref', $linkback, 1, 'facnumber', 'ref', $morehtmlref); print ''; // Ref customer diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index c68ad3777d8..bc14ed5f760 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -86,6 +86,8 @@ if ($id > 0 || ! empty($ref)) print '
'.$langs->trans('Ref').'
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; // Ref customer diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index df8d7f0c131..8f688dc93d9 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -140,6 +140,8 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"]) */ print '
'.$langs->trans('Ref').''; @@ -100,7 +102,7 @@ if ($id > 0 || ! empty($ref)) { dol_print_error('',$discount->error); } - print $form->showrefnav($object,'ref','',1,'facnumber','ref',$morehtmlref); + print $form->showrefnav($object, 'ref', $linkback, 1, 'facnumber', 'ref', $morehtmlref); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print '"; // Ref customer diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php index 1a4e97e34f4..fffbe36481e 100644 --- a/htdocs/fourn/facture/contact.php +++ b/htdocs/fourn/facture/contact.php @@ -142,9 +142,11 @@ if ($id > 0 || ! empty($ref)) */ print '
'.$langs->trans("Ref").''; $morehtmlref=''; @@ -153,7 +155,7 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"]) { dol_print_error('',$discount->error); } - print $form->showrefnav($object,'ref','',1,'facnumber','ref',$morehtmlref); + print $form->showrefnav($object, 'ref', $linkback, 1, 'facnumber', 'ref', $morehtmlref); print "
'; + $linkback = ''.$langs->trans("BackToList").''; + // Reference du facture print '"; // Ref supplier diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index 8e72fdb0c46..0b44c881c4f 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -168,11 +168,13 @@ if ($facid > 0) } - print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'facid','',1,'rowid','ref',$morehtmlref); + print $form->showrefnav($object, 'facid', $linkback, 1, 'rowid', 'ref', $morehtmlref); print "
'; + print '
'; + + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; print "\n"; diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index ddf0a58501a..f9fedc97d85 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -1277,9 +1277,11 @@ else */ print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'facid','',1,'rowid','ref',$morehtmlref); + print $form->showrefnav($object, 'facid', $linkback, 1, 'rowid', 'ref', $morehtmlref); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print "\n"; diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php index bf815feff58..905b0f03328 100644 --- a/htdocs/fourn/facture/note.php +++ b/htdocs/fourn/facture/note.php @@ -87,9 +87,11 @@ if ($id) print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'id','',1,'rowid','ref'); + print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref'); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print "\n"; From 9dc38f4382ae9a52817a28c1f5bb7cfbd1be4e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 28 Jul 2012 21:49:47 +0200 Subject: [PATCH 6/8] Created rest of BackToList links --- htdocs/adherents/agenda.php | 4 +++- htdocs/adherents/card_subscriptions.php | 4 +++- htdocs/adherents/document.php | 6 ++++-- htdocs/adherents/fiche.php | 4 +++- htdocs/adherents/fiche_subscription.php | 4 +++- htdocs/adherents/note.php | 4 +++- htdocs/adherents/type.php | 4 +++- htdocs/comm/action/document.php | 6 ++++-- htdocs/comm/action/fiche.php | 4 +++- htdocs/comm/mailing/cibles.php | 4 +++- htdocs/comm/mailing/fiche.php | 4 +++- htdocs/compta/bank/account.php | 4 +++- htdocs/compta/bank/annuel.php | 4 +++- htdocs/compta/bank/bankid_fr.php | 4 +++- htdocs/compta/bank/fiche.php | 4 +++- htdocs/compta/bank/graph.php | 4 +++- htdocs/compta/bank/ligne.php | 4 +++- htdocs/compta/bank/releve.php | 4 +++- htdocs/compta/bank/treso.php | 4 +++- htdocs/projet/contact.php | 4 ++-- htdocs/projet/document.php | 4 +++- htdocs/projet/element.php | 4 +++- htdocs/projet/fiche.php | 4 +++- htdocs/projet/ganttview.php | 4 +++- htdocs/projet/note.php | 4 ++-- htdocs/projet/tasks.php | 4 +++- 26 files changed, 78 insertions(+), 30 deletions(-) diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php index 41b23d465d9..360413b32f9 100644 --- a/htdocs/adherents/agenda.php +++ b/htdocs/adherents/agenda.php @@ -86,10 +86,12 @@ if ($id) print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'facid','',1,'rowid','ref',$morehtmlref); + print $form->showrefnav($object, 'facid', $linkback, 1, 'rowid', 'ref', $morehtmlref); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Reference print ''; print ''; print ''; diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index bac638927c0..deda22920df 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -486,10 +486,12 @@ if ($rowid) print ''; print '
'.$langs->trans('Ref').''; - print $form->showrefnav($object,'id'); + print $form->showrefnav($object, 'id', $linkback); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; $showphoto=''; diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php index 0ba89db6895..3d5a53a8068 100644 --- a/htdocs/adherents/document.php +++ b/htdocs/adherents/document.php @@ -155,12 +155,14 @@ if ($id > 0) } - print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'rowid'); + print $form->showrefnav($object, 'rowid', $linkback); print '
'.$form->showphoto('memberphoto',$object).'
'; + print '
'; + + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; print ''; // Login diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 10f75203936..77421bdf6c4 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -1272,10 +1272,12 @@ if ($rowid && $action != 'edit') print '
'.$langs->trans("Ref").''; - print $form->showrefnav($member,'rowid'); + print $form->showrefnav($member, 'rowid', $linkback); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; $showphoto='
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'rowid'); + print $form->showrefnav($object, 'rowid', $linkback); print '
'; diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php index cd179364519..861e28086f2 100644 --- a/htdocs/adherents/fiche_subscription.php +++ b/htdocs/adherents/fiche_subscription.php @@ -299,10 +299,12 @@ if ($rowid && $action != 'edit') print ''; print ''; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; // Member diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 5ede330a911..69a9a0f613a 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -89,10 +89,12 @@ if ($id) print '
'.$langs->trans("Ref").''; - print $form->showrefnav($subscription,'rowid','',1); + print $form->showrefnav($subscription, 'rowid', $linkback, 1); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Reference print ''; print ''; print ''; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 80ec61b3f98..995c0b18ae7 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -282,10 +282,12 @@ if ($rowid > 0) print '
'.$langs->trans('Ref').''; - print $form->showrefnav($object,'id'); + print $form->showrefnav($object, 'id', $linkback); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; // Label diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 60d70ec1027..70914d5d357 100755 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -148,11 +148,13 @@ if ($objectid > 0) dol_fiche_head($head, 'documents', $langs->trans("Action"),0,'action'); // Affichage fiche action en mode visu - print '
'.$langs->trans("Ref").''; - print $form->showrefnav($adht,'rowid'); + print $form->showrefnav($adht, 'rowid', $linkback); print '
'; + + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; // Type diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 50dc49e2f24..b2cb670324c 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -795,9 +795,11 @@ if ($id) // Affichage fiche action en mode visu print '
'.$langs->trans("Ref").''; - print $form->showrefnav($act,'id','',($user->societe_id?0:1),'id','ref',''); + print $form->showrefnav($act, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', ''); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; // Type diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 74de137d0ca..f092d263999 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -178,9 +178,11 @@ if ($object->fetch($id) >= 0) print '
'.$langs->trans("Ref").''; - print $form->showrefnav($act,'id','',($user->societe_id?0:1),'id','ref',''); + print $form->showrefnav($act, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', ''); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + print ''; print ''; print ''; diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index e7ed17f5e04..d824c417af7 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -754,9 +754,11 @@ else print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'id'); + print $form->showrefnav($object,'id', $linkback); print '
'.$langs->trans("MailTitle").''.$object->titre.'
'; + $linkback = ''.$langs->trans("BackToList").''; + print ''; print ''; // Description diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 5e2cba398e3..fc293e38130 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -259,11 +259,13 @@ if ($id > 0 || ! empty($ref)) dol_fiche_head($head,'journal',$langs->trans("FinancialAccount"),0,'account'); print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'id'); + print $form->showrefnav($object,'id', $linkback); print '
'; + + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; print ''; // Label diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index 77f188eb5c7..2dd36be46fe 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -133,6 +133,8 @@ $lien=($year_start?"'; +$linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref'); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref'); print '
'.$langs->trans("Ref").''; @@ -140,7 +142,7 @@ if ($_GET["account"]) { if (! preg_match('/,/',$_GET["account"])) { - print $form->showrefnav($acct,'ref','',1,'ref'); + print $form->showrefnav($acct, 'ref', $linkback, 1, 'ref'); } else { diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 63cabba3857..c7f693e04e6 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -135,10 +135,12 @@ if (($_GET["id"] || $_GET["ref"]) && $action != 'edit') print ''; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; // Label diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 7dec4bfd2dd..2bfb23e59ae 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -367,10 +367,12 @@ else print '
'.$langs->trans("Ref").''; - print $form->showrefnav($account,'ref','',1,'ref'); + print $form->showrefnav($account, 'ref', $linkback, 1, 'ref'); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; // Label diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index 29ed40be23a..8d95f2789aa 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -742,6 +742,8 @@ if ($mesg) print $mesg.'
'; print '
'.$langs->trans("Ref").''; - print $form->showrefnav($account,'ref','',1,'ref'); + print $form->showrefnav($account, 'ref', $linkback, 1, 'ref'); print '
'; +$linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print '
'.$langs->trans("Ref").''; @@ -753,7 +755,7 @@ if ($account) if ($_GET["option"]!='all') { $morehtml=''.$langs->trans("ShowAllAccounts").''; - print $form->showrefnav($acct,'ref','',1,'ref','ref','',$moreparam); + print $form->showrefnav($acct, 'ref', $linkback, 1, 'ref', 'ref', '', $moreparam); } else { diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 277f45e7c94..1275cd176db 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -278,10 +278,12 @@ if ($result) print ''; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print '"; print ''; print ''; diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 2531c7639ef..64fd20ca008 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -112,10 +112,12 @@ if (! isset($_GET["num"])) print '
'.$langs->trans("Ref")."'; - print $form->showrefnav($bankline,'rowid','',1,'rowid','rowid'); + print $form->showrefnav($bankline, 'rowid', $linkback, 1, 'rowid', 'rowid'); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; // Label diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index f32d0c615f0..90f4598f94a 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -96,10 +96,12 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) print '
'.$langs->trans("Ref").''; - print $form->showrefnav($acct,'ref','',1,'ref'); + print $form->showrefnav($acct, 'ref', $linkback, 1, 'ref'); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; // Label diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index 6879a00ed80..4ee93dbda57 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -156,7 +156,7 @@ if ($id > 0 || ! empty($ref)) */ print '
'.$langs->trans("Ref").''; - print $form->showrefnav($acct,'ref','',1,'ref'); + print $form->showrefnav($acct, 'ref', $linkback, 1, 'ref'); print '
'; - //$linkback="".$langs->trans("BackToList").""; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; // Label diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php index ee07aed7804..9d558f98c4f 100644 --- a/htdocs/projet/document.php +++ b/htdocs/projet/document.php @@ -160,6 +160,8 @@ if ($object->id > 0) print '
'.$langs->trans('Ref').''; @@ -166,7 +166,7 @@ if ($id > 0 || ! empty($ref)) $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,0); $project->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")"; } - print $form->showrefnav($project,'ref',$linkback,1,'ref','ref',''); + print $form->showrefnav($project, 'ref', $linkback, 1, 'ref', 'ref', ''); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; // Label diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 9a007cc2d2a..6df314e0909 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -94,6 +94,8 @@ dol_fiche_head($head, 'element', $langs->trans("Project"),0,($project->public?'p print '
'.$langs->trans("Ref").''; // Define a complementary filter for search of next/prev ref. @@ -168,7 +170,7 @@ if ($object->id > 0) $projectsListId = $object->getProjectsAuthorizedForUser($user,$mine,0); $object->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")"; } - print $form->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print '
'; +$linkback = ''.$langs->trans("BackToList").''; + print ''; print ''; diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index 39368209f31..967d57b4367 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -536,6 +536,8 @@ else { print '
'.$langs->trans("Ref").''; // Define a complementary filter for search of next/prev ref. if (! $user->rights->projet->all->lire) @@ -101,7 +103,7 @@ if (! $user->rights->projet->all->lire) $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,0); $project->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")"; } -print $form->showrefnav($project,'ref','',1,'ref','ref'); +print $form->showrefnav($project, 'ref', $linkback, 1, 'ref', 'ref'); print '
'.$langs->trans("Label").''.$project->title.'
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; // Label diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index d908c72962a..6a96df4cdb0 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -103,6 +103,8 @@ if ($id > 0 || ! empty($ref)) print '
'.$langs->trans("Ref").''; // Define a complementary filter for search of next/prev ref. @@ -544,7 +546,7 @@ else $objectsListId = $object->getProjectsAuthorizedForUser($user,$mine,0); $object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',',array_keys($objectsListId)):'0').")"; } - print $form->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php index bf767d4525d..4f3b888db10 100644 --- a/htdocs/projet/note.php +++ b/htdocs/projet/note.php @@ -122,7 +122,7 @@ if ($id > 0 || ! empty($ref)) print '
'; print $langs->trans("Ref"); @@ -110,7 +112,7 @@ if ($id > 0 || ! empty($ref)) // Define a complementary filter for search of next/prev ref. $objectsListId = $object->getProjectsAuthorizedForUser($user,$mine,1); $object->next_prev_filter=" rowid in (".$objectsListId.")"; - print $form->showrefnav($object,'ref','',1,'ref','ref','',$param); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '', $param); print '
'.$langs->trans("Label").''.$object->title.'
'; - //$linkback="".$langs->trans("BackToList").""; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; // Label diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 9c21affd706..ec9144d3f5f 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -178,6 +178,8 @@ if ($id > 0 || ! empty($ref)) print '
'.$langs->trans("Ref").''; @@ -132,7 +132,7 @@ if ($id > 0 || ! empty($ref)) $projectsListId = $project->getProjectsAuthorizedForUser($user,$mine,0); $project->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")"; } - print $form->showrefnav($project,'ref','',1,'ref','ref'); + print $form->showrefnav($project, 'ref', $linkback, 1, 'ref', 'ref'); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; From 04c34b0042c4fa6bb7c2dc2322283041de65df1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 28 Jul 2012 21:54:36 +0200 Subject: [PATCH 7/8] BackToList links in Contacts section --- htdocs/contact/exportimport.php | 4 +++- htdocs/contact/fiche.php | 4 +++- htdocs/contact/perso.php | 4 +++- htdocs/societe/soc.php | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/htdocs/contact/exportimport.php b/htdocs/contact/exportimport.php index c2a469e0c0a..fa4c5dae0d9 100644 --- a/htdocs/contact/exportimport.php +++ b/htdocs/contact/exportimport.php @@ -56,9 +56,11 @@ dol_fiche_head($head, 'exportimport', $langs->trans("ContactsAddresses"), 0, 'co */ print '
'; print $langs->trans("Ref"); @@ -188,7 +190,7 @@ if ($id > 0 || ! empty($ref)) $projectsListId = $object->getProjectsAuthorizedForUser($user,$mine,0); $object->next_prev_filter=" rowid in (".(count($projectsListId)?join(',',array_keys($projectsListId)):'0').")"; } - print $form->showrefnav($object,'ref','',1,'ref','ref','',$param); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '', $param); print '
'.$langs->trans("Label").''.$object->title.'
'; +$linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; // Name diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index b13f960e9de..7f9fe21e9a1 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -727,9 +727,11 @@ else print '
'.$langs->trans("Ref").''; -print $form->showrefnav($contact,'id'); +print $form->showrefnav($contact, 'id', $linkback); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; // Name diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 26a3b90ea59..2755b29ccf4 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -158,9 +158,11 @@ else */ print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'id'); + print $form->showrefnav($object, 'id', $linkback); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; // Name diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 4125279fd9f..2457bcdce80 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -1461,7 +1461,7 @@ else // Name print ''; print ''; print ''; From ec36ffd73c5cefa9db56d0ea161e39873495aaf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Sat, 28 Jul 2012 22:14:53 +0200 Subject: [PATCH 8/8] Missing expeditions and stocks BackToList links --- htdocs/expedition/contact.php | 4 +++- htdocs/expedition/fiche.php | 4 +++- htdocs/product/stock/fiche.php | 4 +++- htdocs/product/stock/mouvement.php | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php index 86b7a2b86c1..f1635301eaa 100644 --- a/htdocs/expedition/contact.php +++ b/htdocs/expedition/contact.php @@ -165,9 +165,11 @@ if ($id > 0 || ! empty($ref)) */ print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'id'); + print $form->showrefnav($object, 'id', $linkback); print '
'.$langs->trans('ThirdPartyName').''; - print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom'); + print $form->showrefnav($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom'); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print '"; // Customer diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index fc8c2ed7855..f11c15f4b95 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -952,10 +952,12 @@ else print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print "
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; // Customer diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php index 8cb4c17c5c2..d2750f6f832 100644 --- a/htdocs/product/stock/fiche.php +++ b/htdocs/product/stock/fiche.php @@ -249,9 +249,11 @@ else print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'ref','',1,'ref','ref'); + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print '
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print ''; diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index b4d2f06bd6b..f949102222c 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -204,9 +204,11 @@ if ($resql) print '
'.$langs->trans("Ref").''; - print $form->showrefnav($object,'id','',1,'rowid','libelle'); + print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'libelle'); print '
'.$langs->trans("LocationSummary").''.$object->lieu.'
'; + $linkback = ''.$langs->trans("BackToList").''; + // Ref print ''; print '';
'.$langs->trans("Ref").''; - print $form->showrefnav($entrepot,'id','',1,'rowid','libelle'); + print $form->showrefnav($entrepot, 'id', $linkback, 1, 'rowid', 'libelle'); print '
'.$langs->trans("LocationSummary").''.$entrepot->lieu.'