lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Works on migration management positioning lines

Browse Source 
Phase 3 : llx_facturedet
This commit is contained in:
Regis Houssin 2010-09-06 14:49:48 +00:00
parent cf4aa19d0c
commit cbcf6f7eca
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/compta/commande/fiche.php
View File

@ -397,9 +397,12 @@ if ($id > 0 || ! empty($ref))
$sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,';
$sql.= ' p.description as product_desc';
$sql.= ' FROM '.MAIN_DB_PREFIX."commandedet as l";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_rang as r ON r.fk_parent = l.fk_commande AND r.parenttype = '".$commande->element."'";
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product=p.rowid';
$sql.= " WHERE l.fk_commande = ".$commande->id;
$sql.= " ORDER BY l.rang, l.rowid";
$sql.= " AND r.fk_child = l.rowid";
$sql.= " AND r.childtype = '".$commande->element."'";
$sql.= " ORDER BY r.rang, l.rowid";
$resql = $db->query($sql);
if ($resql)

4
htdocs/compta/facture.php
View File

@ -1775,7 +1775,7 @@ if ($_GET['action'] == 'create')
$sql.= ' WHERE pt.fk_propal = '.$object->id;
$sql.= " AND r.fk_child = pt.rowid";
$sql.= " AND r.childtype = '".$object->element."'";
$sql.= ' ORDER BY pt.rang ASC, pt.rowid';
$sql.= ' ORDER BY r.rang ASC, pt.rowid';
}
// TODO deplacer dans la classe
if ($_GET['origin'] == 'commande')
@ -1792,7 +1792,7 @@ if ($_GET['action'] == 'create')
$sql.= ' WHERE pt.fk_commande = '.$object->id;
$sql.= " AND r.fk_child = pt.rowid";
$sql.= " AND r.childtype = '".$object->element."'";
$sql.= ' ORDER BY pt.rowid ASC';
$sql.= ' ORDER BY r.rang ASC, pt.rowid';
}
// TODO deplacer dans la classe
if ($_GET['origin'] == 'contrat')

6
htdocs/compta/propal.php
View File

@ -327,9 +327,13 @@ if ($id > 0 || ! empty($ref))
$sql.= ' p.rowid as prodid, p.label as product_label, p.ref, p.fk_product_type, ';
$sql.= ' p.description as product_desc';
$sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as pt';
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_rang as r ON r.fk_parent = pt.fk_propal AND r.parenttype = '".$propal->element."'";
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
$sql.= ' WHERE pt.fk_propal = '.$propal->id;
$sql.= ' ORDER BY pt.rang ASC, pt.rowid';
$sql.= " AND r.fk_child = pt.rowid";
$sql.= " AND r.childtype = '".$propal->element."'";
$sql.= ' ORDER BY r.rang ASC, pt.rowid';
$resql = $db->query($sql);
if ($resql)
{