From ddc8420fa71b2f25852ffefc6d72a8d7d10f57aa Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 29 Apr 2010 14:25:01 +0000 Subject: [PATCH] Fix: uniformize code --- htdocs/compta/facture.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 51eb547e123..02cad6b6a03 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1784,12 +1784,11 @@ if ($_GET['action'] == 'create') { $title=$langs->trans('ProductsAndServices'); - $sql = 'SELECT pt.rowid, pt.description, pt.price, pt.fk_product, pt.fk_remise_except,'; + $sql = 'SELECT pt.rowid, pt.description, pt.fk_remise_except,'; $sql.= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.product_type, pt.info_bits,'; - $sql.= ' p.label as product, p.ref, p.fk_product_type, p.rowid as prodid,'; - $sql.= ' p.description as product_desc'; + $sql.= ' p.label as product, p.ref, p.fk_product_type, p.rowid as prodid'; $sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as pt'; - $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid'; + $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product = p.rowid'; $sql.= ' WHERE pt.fk_propal = '.$object->id; $sql.= ' ORDER BY pt.rang ASC, pt.rowid'; } @@ -1798,9 +1797,10 @@ if ($_GET['action'] == 'create') { $title=$langs->trans('Products'); - $sql = 'SELECT pt.rowid, pt.subprice, pt.tva_tx, pt.qty, pt.fk_remise_except, pt.remise_percent, pt.product_type,'; - $sql.= ' pt.description, pt.info_bits, pt.date_start as date_debut_prevue, pt.date_end as date_fin_prevue,'; - $sql.= ' p.label as product, p.ref, p.rowid as prodid'; + $sql = 'SELECT pt.rowid, pt.description, pt.fk_remise_except,'; + $sql.= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.product_type, pt.info_bits,'; + $sql.= ' pt.date_start as date_debut_prevue, pt.date_end as date_fin_prevue,'; + $sql.= ' p.label as product, p.ref, p.fk_product_type, p.rowid as prodid'; $sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as pt'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product = p.rowid'; $sql.= ' WHERE pt.fk_commande = '.$object->id; @@ -1811,10 +1811,11 @@ if ($_GET['action'] == 'create') { $title=$langs->trans('Services'); - $sql = 'SELECT pt.rowid, pt.subprice, pt.tva_tx, pt.qty, pt.remise_percent, pt.description, pt.info_bits,'; + $sql = 'SELECT pt.rowid, pt.description,'; + $sql = ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,'; $sql.= ' pt.date_ouverture_prevue as date_debut_prevue, pt.date_ouverture as date_debut_reel,'; $sql.= ' pt.date_fin_validite as date_fin_prevue, pt.date_cloture as date_fin_reel,'; - $sql.= ' p.label as product, p.ref, p.rowid as prodid'; + $sql.= ' p.label as product, p.ref, p.fk_product_type, p.rowid as prodid'; $sql.= ' FROM '.MAIN_DB_PREFIX.'contratdet as pt'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product = p.rowid'; $sql.= ' WHERE pt.fk_contrat = '.$object->id;