From 9aecfda78a87d787bf501393ab9647b510d1ed1f Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 15 Jul 2015 21:55:09 +0200 Subject: [PATCH] Fix: Show project link --- htdocs/don/card.php | 7 +++++-- htdocs/don/class/don.class.php | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/htdocs/don/card.php b/htdocs/don/card.php index c813351415c..323f36bd609 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -36,6 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; + require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; } require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; @@ -658,8 +659,10 @@ if (! empty($id) && $action != 'edit') print ''; print ''.$langs->trans("Project").''; print ''; - $object->fetch_projet(); - print $object->project->getNomUrl(4); + $projettmp=new Project($db); + $projettmp->id=$object->fk_projet; + $projettmp->ref=$object->project; + print $projettmp->getNomUrl(1); print ''; print ''; } diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index 96c14591769..2b84f0d0727 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -608,7 +608,7 @@ class Don extends CommonObject $sql.= " d.firstname, d.lastname, d.societe, d.amount, d.fk_statut, d.address, d.zip, d.town, "; $sql.= " d.fk_country, d.country as country_olddata, d.public, d.amount, d.fk_payment, d.paid, d.note_private, d.note_public, cp.libelle, d.email, d.phone, "; $sql.= " d.phone_mobile, d.fk_projet, d.model_pdf,"; - $sql.= " p.title as project_label,"; + $sql.= " p.ref as project_ref,"; $sql.= " c.code as country_code, c.label as country"; $sql.= " FROM ".MAIN_DB_PREFIX."don as d"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_projet"; @@ -652,7 +652,7 @@ class Don extends CommonObject $this->email = $obj->email; $this->phone = $obj->phone; $this->phone_mobile = $obj->phone_mobile; - $this->project = $obj->project_label; + $this->project = $obj->project_ref; $this->fk_projet = $obj->fk_projet; $this->public = $obj->public; $this->modepaymentid = $obj->fk_payment;