From dd1f946afe8ba5618554118e5032d8a7872112ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 9 Apr 2016 19:06:40 +0200
Subject: [PATCH] Clean dead code
---
htdocs/comm/propal/class/propal.class.php | 4 +-
htdocs/commande/class/commande.class.php | 80 -----------------
htdocs/compta/facture/class/facture.class.php | 86 -------------------
.../class/supplier_proposal.class.php | 8 +-
4 files changed, 7 insertions(+), 171 deletions(-)
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 3a6d88896b9..a83600072d4 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2842,8 +2842,8 @@ class Propal extends CommonObject
/**
* Retrieve an array of propal lines
- *
- * @return int <0 if ko, >0 if ok
+ *
+ * @return int >0 if OK, <0 if KO
*/
function getLinesArray()
{
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 5c33602ad50..ae7c18ac077 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3303,86 +3303,6 @@ class Commande extends CommonOrder
function getLinesArray()
{
return $this->fetch_lines();
- /*
- $lines = array();
-
- $sql = 'SELECT l.rowid, l.fk_product, l.product_type, l.label as custom_label, l.description, l.price, l.qty, l.tva_tx, ';
- $sql.= ' l.fk_remise_except, l.remise_percent, l.subprice, l.info_bits, l.rang, l.special_code, l.fk_parent_line,';
- $sql.= ' l.total_ht, l.total_tva, l.total_ttc, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht, l.localtax1_tx, l.localtax2_tx,';
- $sql.= ' l.date_start, l.date_end,';
- $sql.= ' l.fk_unit,';
- $sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
- $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, ';
- $sql.= ' p.description as product_desc, p.stock as stock_reel,';
- $sql.= ' p.entity';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as l';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product=p.rowid';
- $sql.= ' WHERE l.fk_commande = '.$this->id;
- $sql.= ' ORDER BY l.rang ASC, l.rowid';
-
- $resql = $this->db->query($sql);
- if ($resql)
- {
- $num = $this->db->num_rows($resql);
- $i = 0;
-
- while ($i < $num)
- {
- $obj = $this->db->fetch_object($resql);
-
- $this->lines[$i] = new OrderLine($this->db);
- $this->lines[$i]->id = $obj->rowid;
- $this->lines[$i]->label = $obj->custom_label;
- $this->lines[$i]->description = $obj->description;
- $this->lines[$i]->fk_product = $obj->fk_product;
- $this->lines[$i]->ref = $obj->ref;
- $this->lines[$i]->entity = $obj->entity; // Product entity
- $this->lines[$i]->product_label = $obj->product_label;
- $this->lines[$i]->product_desc = $obj->product_desc;
- $this->lines[$i]->fk_product_type = $obj->fk_product_type;
- $this->lines[$i]->product_type = $obj->product_type;
- $this->lines[$i]->qty = $obj->qty;
- $this->lines[$i]->subprice = $obj->subprice;
- $this->lines[$i]->fk_remise_except = $obj->fk_remise_except;
- $this->lines[$i]->remise_percent = $obj->remise_percent;
- $this->lines[$i]->tva_tx = $obj->tva_tx;
- $this->lines[$i]->info_bits = $obj->info_bits;
- $this->lines[$i]->total_ht = $obj->total_ht;
- $this->lines[$i]->total_tva = $obj->total_tva;
- $this->lines[$i]->total_ttc = $obj->total_ttc;
- $this->lines[$i]->fk_parent_line = $obj->fk_parent_line;
- $this->lines[$i]->special_code = $obj->special_code;
- $this->lines[$i]->stock = $obj->stock_reel;
- $this->lines[$i]->rang = $obj->rang;
- $this->lines[$i]->date_start = $this->db->jdate($obj->date_start);
- $this->lines[$i]->date_end = $this->db->jdate($obj->date_end);
- $this->lines[$i]->fk_fournprice = $obj->fk_fournprice;
- $marginInfos = getMarginInfos($obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, $this->lines[$i]->fk_fournprice, $obj->pa_ht);
- $this->lines[$i]->pa_ht = $marginInfos[0];
- $this->lines[$i]->marge_tx = $marginInfos[1];
- $this->lines[$i]->marque_tx = $marginInfos[2];
- $this->lines[$i]->fk_unit = $obj->fk_unit;
-
- // Multicurrency
- $this->lines[$i]->fk_multicurrency = $obj->fk_multicurrency;
- $this->lines[$i]->multicurrency_code = $obj->multicurrency_code;
- $this->lines[$i]->multicurrency_subprice = $obj->multicurrency_subprice;
- $this->lines[$i]->multicurrency_total_ht = $obj->multicurrency_total_ht;
- $this->lines[$i]->multicurrency_total_tva = $obj->multicurrency_total_tva;
- $this->lines[$i]->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
-
- $i++;
- }
-
- $this->db->free($resql);
-
- return 1;
- }
- else
- {
- $this->error=$this->db->error();
- return -1;
- }*/
}
/**
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index a6b6ddf212c..4d216a80264 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3681,92 +3681,6 @@ class Facture extends CommonInvoice
function getLinesArray()
{
return $this->fetch_lines();
- /*
- $sql = 'SELECT l.rowid, l.label as custom_label, l.description, l.fk_product, l.product_type, l.qty, l.tva_tx,';
- $sql.= ' l.fk_remise_except, l.localtax1_tx, l.localtax2_tx,';
- $sql .= ' l.situation_percent, l.fk_prev_id,';
- $sql.= ' l.remise_percent, l.subprice, l.info_bits, l.rang, l.special_code, l.fk_parent_line,';
- $sql.= ' l.total_ht, l.total_tva, l.total_ttc, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht,';
- $sql.= ' l.date_start, l.date_end,';
- $sql.= ' l.fk_unit,';
- $sql.= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
- $sql.= ' p.ref as product_ref, p.fk_product_type, p.label as product_label,';
- $sql.= ' p.description as product_desc,';
- $sql.= ' p.entity';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'facturedet as l';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product=p.rowid';
- $sql.= ' WHERE l.fk_facture = '.$this->id;
- $sql.= ' ORDER BY l.rang ASC, l.rowid';
-
- dol_syslog(get_class($this).'::getLinesArray',LOG_DEBUG);
- $resql = $this->db->query($sql);
- if ($resql)
- {
- $num = $this->db->num_rows($resql);
- $i = 0;
-
- while ($i < $num)
- {
- $obj = $this->db->fetch_object($resql);
-
- $this->lines[$i] = new FactureLigne($this->db);
- $this->lines[$i]->id = $obj->rowid;
- $this->lines[$i]->label = $obj->custom_label; // deprecated
- $this->lines[$i]->description = $obj->description;
- $this->lines[$i]->fk_product = $obj->fk_product;
- $this->lines[$i]->ref = $obj->product_ref;
- $this->lines[$i]->product_ref = $obj->product_ref;
- $this->lines[$i]->product_label = $obj->product_label;
- $this->lines[$i]->product_desc = $obj->product_desc;
- $this->lines[$i]->fk_product_type = $obj->fk_product_type;
- $this->lines[$i]->product_type = $obj->product_type;
- $this->lines[$i]->entity = $obj->entity; // Product entity
- $this->lines[$i]->qty = $obj->qty;
- $this->lines[$i]->subprice = $obj->subprice;
- $this->lines[$i]->fk_remise_except = $obj->fk_remise_except;
- $this->lines[$i]->remise_percent = $obj->remise_percent;
- $this->lines[$i]->tva_tx = $obj->tva_tx;
- $this->lines[$i]->info_bits = $obj->info_bits;
- $this->lines[$i]->total_ht = $obj->total_ht;
- $this->lines[$i]->total_tva = $obj->total_tva;
- $this->lines[$i]->total_ttc = $obj->total_ttc;
- $this->lines[$i]->localtax1_tx = $obj->localtax1_tx;
- $this->lines[$i]->localtax2_tx = $obj->localtax2_tx;
- $this->lines[$i]->localtax1_type = $obj->localtax1_type;
- $this->lines[$i]->localtax2_type = $obj->localtax2_type;
- $this->lines[$i]->fk_parent_line = $obj->fk_parent_line;
- $this->lines[$i]->situation_percent = $obj->situation_percent;
- $this->lines[$i]->fk_prev_id = $obj->fk_prev_id;
- $this->lines[$i]->special_code = $obj->special_code;
- $this->lines[$i]->rang = $obj->rang;
- $this->lines[$i]->date_start = $this->db->jdate($obj->date_start);
- $this->lines[$i]->date_end = $this->db->jdate($obj->date_end);
- $this->lines[$i]->fk_fournprice = $obj->fk_fournprice;
- $marginInfos = getMarginInfos($obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, $this->lines[$i]->fk_fournprice, $obj->pa_ht);
- $this->lines[$i]->pa_ht = $marginInfos[0];
- $this->lines[$i]->marge_tx = $marginInfos[1];
- $this->lines[$i]->marque_tx = $marginInfos[2];
- $this->lines[$i]->fk_unit = $obj->fk_unit;
-
- // Multicurrency
- $this->lines[$i]->fk_multicurrency = $obj->fk_multicurrency;
- $this->lines[$i]->multicurrency_code = $obj->multicurrency_code;
- $this->lines[$i]->multicurrency_subprice = $obj->multicurrency_subprice;
- $this->lines[$i]->multicurrency_total_ht = $obj->multicurrency_total_ht;
- $this->lines[$i]->multicurrency_total_tva = $obj->multicurrency_total_tva;
- $this->lines[$i]->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
-
- $i++;
- }
- $this->db->free($resql);
-
- return 1;
- }
- else
- {
- $this->error=$this->db->error();
- return -1;
- }*/
}
/**
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index df634da27ae..5f9fc3eacd6 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2392,12 +2392,14 @@ class SupplierProposal extends CommonObject
}
/**
- * Retrieve an array of askprice lines
- *
- * @return int <0 if ko, >0 if ok
+ * Retrieve an array of supplier proposal lines
+ *
+ * @return int >0 if OK, <0 if KO
*/
function getLinesArray()
{
+ // For other object, here we call fetch_lines. But fetch_lines does not exists on supplier proposal
+
$sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
$sql.= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,';
$sql.= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code, pt.localtax1_tx, pt.localtax2_tx,';
--
GitLab