From b86e20f0e6d38f05b31b1c16b1a8f1ca51c1e547 Mon Sep 17 00:00:00 2001 From: simnandez Date: Thu, 29 Aug 2013 12:05:29 +0200 Subject: [PATCH] Fix: Intervention box links to contracts id --- ChangeLog | 1 + htdocs/core/boxes/box_ficheinter.php | 11 ++++++----- htdocs/langs/ca_ES/boxes.lang | 1 + htdocs/langs/en_US/boxes.lang | 1 + htdocs/langs/es_ES/boxes.lang | 1 + htdocs/langs/fr_FR/boxes.lang | 1 + 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1cc21b1266d..3225203c90c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ Fix: If only service module is activated, it's impossible to delete service Fix: [ bug #1043 ] Bad interventions ref numbering Fix: Mailing module : if an email is already in destinaires list all other email from selector was not inserted Fix: Localtaxes balance not showing +Fix: Intervention box links to contracts id ***** ChangeLog for 3.4 compared to 3.3.* ***** For users: diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php index 765224baccc..c821989bf4f 100644 --- a/htdocs/core/boxes/box_ficheinter.php +++ b/htdocs/core/boxes/box_ficheinter.php @@ -1,5 +1,6 @@ + * Copyright (C) 2013 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +26,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; /** - * Class to manage the box to show last contracts + * Class to manage the box to show last interventions */ class box_ficheinter extends ModeleBoxes { @@ -95,11 +96,11 @@ class box_ficheinter extends ModeleBoxes $this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"', 'logo' => $this->boximg, - 'url' => DOL_URL_ROOT."/ficheinter/fiche.php?id=".$objp->rowid); + 'url' => DOL_URL_ROOT."/fichinter/fiche.php?id=".$objp->rowid); $this->info_box_contents[$i][1] = array('td' => 'align="left"', - 'text' => ($objp->ref?$objp->ref:$objp->rowid), // Some contracts have no ref - 'url' => DOL_URL_ROOT."/contrat/fiche.php?id=".$objp->rowid); + 'text' => ($objp->ref?$objp->ref:$objp->rowid), // Some interventions have no ref + 'url' => DOL_URL_ROOT."/fichinter/fiche.php?id=".$objp->rowid); $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"', 'logo' => 'company', @@ -120,7 +121,7 @@ class box_ficheinter extends ModeleBoxes $i++; } - if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedContracts")); + if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedInterventions")); } else { diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang index b3bf6593a99..a42a5ccbd0d 100644 --- a/htdocs/langs/ca_ES/boxes.lang +++ b/htdocs/langs/ca_ES/boxes.lang @@ -75,6 +75,7 @@ NoRecordedProducts=Sense productes/serveis registrats NoRecordedProspects=Sense clients potencials registrats NoContractedProducts=Sense productes/serveis contractats NoRecordedContracts=Sense contractes registrats +NoRecordedInterventions=Sense intervencions registrades BoxLatestSupplierOrders=Últimes comandes a proveïdors BoxTitleLatestSupplierOrders=Les %s últimes comandes a proveïdors NoSupplierOrder=Sense comandes a proveïdors diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index 817238c9881..28b24d7e29d 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -75,6 +75,7 @@ NoRecordedProducts=No recorded products/services NoRecordedProspects=No recorded prospects NoContractedProducts=No products/services contracted NoRecordedContracts=No recorded contracts +NoRecordedInterventions=No recorded interventions BoxLatestSupplierOrders=Latest supplier orders BoxTitleLatestSupplierOrders=%s latest supplier orders NoSupplierOrder=No recorded supplier order diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang index d61aa5e023e..4356c354265 100644 --- a/htdocs/langs/es_ES/boxes.lang +++ b/htdocs/langs/es_ES/boxes.lang @@ -75,6 +75,7 @@ NoRecordedProducts=Sin productos/servicios registrados NoRecordedProspects=Sin clientes potenciales registrados NoContractedProducts=Sin productos/servicios contratados NoRecordedContracts=Sin contratos registrados +NoRecordedInterventions=Sin intervenciones registradas BoxLatestSupplierOrders=Últimos pedidos a proveedores BoxTitleLatestSupplierOrders=Los %s últimos pedidos a proveedores NoSupplierOrder=Sin pedidos a proveedores diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang index 3bef5b4b8f3..059ca108836 100644 --- a/htdocs/langs/fr_FR/boxes.lang +++ b/htdocs/langs/fr_FR/boxes.lang @@ -75,6 +75,7 @@ NoRecordedProducts=Pas de produit/service enregistré NoRecordedProspects=Pas de prospect enregistré NoContractedProducts=Pas de produit/service contracté NoRecordedContracts=Pas de contrat enregistré +NoRecordedInterventions=Pas fiche d'intervention enregistrée BoxLatestSupplierOrders=Dernières commandes fournisseur BoxTitleLatestSupplierOrders=Les %s dernières commandes fournisseur enregistrées NoSupplierOrder=Pas de commandes fournisseur enregistrées