\n";
- // Si creation depuis un propal
- if ($_GET['propalid'])
+ // TODO deplacer dans la classe
+ if ($_GET['origin'] == 'propal')
{
$title=$langs->trans('ProductsAndServices');
@@ -1982,10 +1926,11 @@ if ($_GET['action'] == 'create')
$sql.= ' p.description as product_desc';
$sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as pt';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
- $sql.= ' WHERE pt.fk_propal = '.$_GET['propalid'];
+ $sql.= ' WHERE pt.fk_propal = '.$object->id;
$sql.= ' ORDER BY pt.rang ASC, pt.rowid';
}
- if ($_GET['commandeid'])
+ // TODO deplacer dans la classe
+ if ($_GET['origin'] == 'order')
{
$title=$langs->trans('Products');
@@ -1994,10 +1939,11 @@ if ($_GET['action'] == 'create')
$sql.= ' p.label as product, p.ref, 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 = '.$commande->id;
+ $sql.= ' WHERE pt.fk_commande = '.$object->id;
$sql.= ' ORDER BY pt.rowid ASC';
}
- if ($_GET['contratid'])
+ // TODO deplacer dans la classe
+ if ($_GET['origin'] == 'contrat')
{
$title=$langs->trans('Services');
@@ -2007,10 +1953,10 @@ if ($_GET['action'] == 'create')
$sql.= ' p.label as product, p.ref, 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 = '.$contrat->id;
+ $sql.= ' WHERE pt.fk_contrat = '.$object->id;
$sql.= ' ORDER BY pt.rowid ASC';
}
- if ($_GET['propalid'] || $_GET['commandeid'] || $_GET['contratid'])
+ if ($_GET['origin'] && $_GET['originid'])
{
print '