diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index f4f33099a63..e0dd2f63ad5 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -179,112 +179,144 @@ if ($resql) print "
"; } - print '
'; - print ''; - print ''; - print ''; + $smarty->template_dir = DOL_DOCUMENT_ROOT; - print ''; - - // Lignes des titres - print ""; - print_liste_field_titre($langs->trans("Ref"),"liste.php", "p.ref","&envente=$envente".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","","",$sortfield); - print_liste_field_titre($langs->trans("Label"),"liste.php", "p.label","&envente=$envente".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","","",$sortfield); - print_liste_field_titre($langs->trans("DateModification"),"liste.php", "p.tms","&envente=$envente".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="center"',$sortfield); - if ($conf->service->enabled && $type != 0) print_liste_field_titre($langs->trans("Duration"),"liste.php", "p.duration","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="center"',$sortfield); - print_liste_field_titre($langs->trans("SellingPrice"),"liste.php", "p.price","&envente=$envente".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="right"',$sortfield); - print_liste_field_titre($langs->trans("Status"),"liste.php", "p.envente","&envente=$envente".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="center"',$sortfield); - print "\n"; - - // Lignes des champs de filtre - - print ''; - print ''; - print ''; - if ($conf->service->enabled && $type != 0) + if ($_GET["canvas"] <> '' && file_exists($smarty->template_dir . '/product/canvas/'.$_GET["canvas"].'/liste.tpl') ) { + $smartdatas = array(); + while ($i < min($num,$limit)) + { + $datas = array(); + $objp = $db->fetch_object($resql); + + $datas["id"] = $objp->rowid; + $datas["ref"] = $objp->ref; + $datas["titre"] = $objp->label; + $datas["casier"] = 0; + $datas["entrepot"] = 0; + $datas["ventes"] = 0; + $datas["stock"] = 0; + $datas["pages"] = 0; + $datas["prix"] = price($objp->price); + $datas["valo"] = 0; + + array_push($smartdatas,$datas); + + $i++; + } + $smarty->assign('datas', $smartdatas); + + $smarty->display('product/canvas/'.$_GET["canvas"].'/liste.tpl'); + } + else + { + print ''; + print ''; + print ''; + print ''; + + print '
'; - print ''; - print ''; - print ''; - print '
'; + + // Lignes des titres + print ""; + print_liste_field_titre($langs->trans("Ref"),"liste.php", "p.ref","&envente=$envente".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","","",$sortfield); + print_liste_field_titre($langs->trans("Label"),"liste.php", "p.label","&envente=$envente".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","","",$sortfield); + print_liste_field_titre($langs->trans("DateModification"),"liste.php", "p.tms","&envente=$envente".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="center"',$sortfield); + if ($conf->service->enabled && $type != 0) print_liste_field_titre($langs->trans("Duration"),"liste.php", "p.duration","&envente=$envente&".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="center"',$sortfield); + print_liste_field_titre($langs->trans("SellingPrice"),"liste.php", "p.price","&envente=$envente".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="right"',$sortfield); + print_liste_field_titre($langs->trans("Status"),"liste.php", "p.envente","&envente=$envente".(isset($type)?"&type=$type":"")."&fourn_id=$fourn_id&snom=$snom&sref=$sref","",'align="center"',$sortfield); + print "\n"; + + // Lignes des champs de filtre + + print ''; + print ''; + print ''; + if ($conf->service->enabled && $type != 0) + { + print ''; + } print ''; - } - print ''; - print ''; - print ''; - print ''; - - - $product_static=new Product($db); - - $var=True; - while ($i < min($num,$limit)) - { - $objp = $db->fetch_object($resql); - - // Multilangs - if ($conf->global->MAIN_MULTILANGS) // si l'option est active - { - $sql = "SELECT label FROM ".MAIN_DB_PREFIX."product_det"; - $sql.= " WHERE fk_product=".$objp->rowid." AND lang='". $langs->getDefaultLang() ."'"; - $sql.= " LIMIT 1"; - $result = $db->query($sql); - if ($result) - { - $objtp = $db->fetch_object($result); - if ($objtp->label != '') $objp->label = $objtp->label; - } - } - - $var=!$var; - print ''; - print ''; - print ''; - if ($conf->service->enabled && $type != 0) - { - print ''; - } - print ''; - print ''; - print "\n"; - $i++; - } - - if ($num > $conf->liste_limit) - { - if ($sref || $snom || $sall || $_POST["search"]) + print ''; + print ''; + print ''; + + + $product_static=new Product($db); + + $var=True; + while ($i < min($num,$limit)) { - print_barre_liste($texte, $page, "liste.php", "&sref=".$sref."&snom=".$snom."&sall=".$sall."&envente=".$_POST["envente"], $sortfield, $sortorder,'',$num); + $objp = $db->fetch_object($resql); + + // Multilangs + if ($conf->global->MAIN_MULTILANGS) // si l'option est active + { + $sql = "SELECT label FROM ".MAIN_DB_PREFIX."product_det"; + $sql.= " WHERE fk_product=".$objp->rowid." AND lang='". $langs->getDefaultLang() ."'"; + $sql.= " LIMIT 1"; + $result = $db->query($sql); + if ($result) + { + $objtp = $db->fetch_object($result); + if ($objtp->label != '') $objp->label = $objtp->label; + } + } + + $var=!$var; + print '\n"; + print ''; + print '\n"; + if ($conf->service->enabled && $type != 0) + { + print ''; + } + print ''; + print ''; + print "\n"; + $i++; } - else + + if ($num > $conf->liste_limit) { - print_barre_liste($texte, $page, "liste.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":""), $sortfield, $sortorder,'',$num); + if ($sref || $snom || $sall || $_POST["search"]) + { + print_barre_liste($texte, $page, "liste.php", "&sref=".$sref."&snom=".$snom."&sall=".$sall."&envente=".$_POST["envente"], $sortfield, $sortorder,'',$num); + } + else + { + print_barre_liste($texte, $page, "liste.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":""), $sortfield, $sortorder,'',$num); + } } + + $db->free($resql); + + print "
'; + print ''; + print ''; + print ''; + print ''; + print ' '; + print ''; print ' '; print ''; - print ' '; - print ''; - print ' '; - print ''; - print ''; - print ''; - print '
'; - print "rowid\">"; - if ($objp->fk_product_type) print img_object($langs->trans("ShowService"),"service"); - else print img_object($langs->trans("ShowProduct"),"product"); - print ' '; - print ''.$objp->ref.''.$objp->label.''.dolibarr_print_date($objp->datem).''; - if (eregi('([0-9]+)y',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationYear"); - elseif (eregi('([0-9]+)m',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationMonth"); - elseif (eregi('([0-9]+)d',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationDay"); - else print $objp->duration; - print ''.price($objp->price).''.$product_static->LibStatut($objp->statut,5).'
'; + print ' '; + print ''; + print ''; + print ''; + print '
'; + print "rowid\">"; + if ($objp->fk_product_type) print img_object($langs->trans("ShowService"),"service"); + else print img_object($langs->trans("ShowProduct"),"product"); + print ' '; + print ''.$objp->ref."'.$objp->label.''.dolibarr_print_date($objp->datem)."'; + if (eregi('([0-9]+)y',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationYear"); + elseif (eregi('([0-9]+)m',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationMonth"); + elseif (eregi('([0-9]+)d',$objp->duration,$regs)) print $regs[1].' '.$langs->trans("DurationDay"); + else print $objp->duration; + print ''.price($objp->price).''.$product_static->LibStatut($objp->statut,5).'
"; + print '
'; } - - $db->free($resql); - - print ""; - print ''; } else {