From 09d231ad0a62ab2e124f5d121fed88120a80294e Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Sat, 19 Apr 2014 12:36:15 +0200
Subject: [PATCH] Update project.class.php
---
htdocs/projet/class/project.class.php | 23 +++--------------------
1 file changed, 3 insertions(+), 20 deletions(-)
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 46f70c7ca89..27a6c4ca0d3 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -391,31 +391,14 @@ class Project extends CommonObject
* @param string $type 'propal','order','invoice','order_supplier','invoice_supplier'
* @return array List of orders linked to project, <0 if error
*/
- function get_element_list($type)
+ function get_element_list($type, $tablename)
{
$elements = array();
- $sql = '';
- if ($type == 'propal')
- $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "propal WHERE fk_projet=" . $this->id;
- if ($type == 'order')
- $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "commande WHERE fk_projet=" . $this->id;
- if ($type == 'invoice')
- $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "facture WHERE fk_projet=" . $this->id;
- if ($type == 'invoice_predefined')
- $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "facture_rec WHERE fk_projet=" . $this->id;
- if ($type == 'order_supplier')
- $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "commande_fournisseur WHERE fk_projet=" . $this->id;
- if ($type == 'invoice_supplier')
- $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "facture_fourn WHERE fk_projet=" . $this->id;
- if ($type == 'contract')
- $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "contrat WHERE fk_projet=" . $this->id;
- if ($type == 'intervention')
- $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "fichinter WHERE fk_projet=" . $this->id;
- if ($type == 'trip')
- $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "deplacement WHERE fk_projet=" . $this->id;
if ($type == 'agenda')
$sql = "SELECT id as rowid FROM " . MAIN_DB_PREFIX . "actioncomm WHERE fk_project=" . $this->id;
+ else
+ $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $tablename." WHERE fk_projet=" . $this->id;
if (! $sql) return -1;
//print $sql;
--
GitLab