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

Minor look enhancement

Browse Source
This commit is contained in:
Laurent Destailleur 2011-08-10 11:53:25 +00:00
parent 8c91b0d3f5
commit 0cd303c505
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
htdocs/product/composition/fiche.php
View File

@ -24,7 +24,7 @@
* \file htdocs/product/composition/fiche.php * \file htdocs/product/composition/fiche.php
* \ingroup product * \ingroup product
* \brief Page de la fiche produit * \brief Page de la fiche produit
* \version $Id: fiche.php,v 1.10 2011/08/10 10:00:48 simnandez Exp $ * \version $Id: fiche.php,v 1.11 2011/08/10 11:53:25 eldy Exp $
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
@ -136,7 +136,7 @@ if($action == 'search' )
$sql.= " WHERE p.entity = ".$conf->entity; $sql.= " WHERE p.entity = ".$conf->entity;
if($key != "") if($key != "")
{ {
if ($conf->global->MAIN_MULTILANGS) if ($conf->global->MAIN_MULTILANGS)
{ {
$sql.= " AND (p.ref like '%".$key."%'"; $sql.= " AND (p.ref like '%".$key."%'";
$sql.= " OR pl.label like '%".$key."%')"; $sql.= " OR pl.label like '%".$key."%')";
@ -205,8 +205,8 @@ if ($id || $ref)
print '<tr><td>'.$langs->trans("AssociatedProductsNumber").'</td><td>'.sizeof($product->get_arbo_each_prod()).'</td>'; print '<tr><td>'.$langs->trans("AssociatedProductsNumber").'</td><td>'.sizeof($product->get_arbo_each_prod()).'</td>';
dol_fiche_end(); dol_fiche_end();
// List of subproducts // List of subproducts
$prods_arbo = $product->get_arbo_each_prod(); $prods_arbo = $product->get_arbo_each_prod();
if(sizeof($prods_arbo) > 0) if(sizeof($prods_arbo) > 0)
@ -219,14 +219,14 @@ if ($id || $ref)
$productstatic->id=$value['id']; $productstatic->id=$value['id'];
$productstatic->type=$value['type']; $productstatic->type=$value['type'];
$productstatic->ref=$value['fullpath']; $productstatic->ref=$value['fullpath'];
$productstatic->load_stock(); if ($conf->stock->enabled) $productstatic->load_stock();
//var_dump($value); //var_dump($value);
//print '<pre>'.$productstatic->ref.'</pre>'; //print '<pre>'.$productstatic->ref.'</pre>';
//print $productstatic->getNomUrl(1).'<br>'; //print $productstatic->getNomUrl(1).'<br>';
//print $value[0]; // This contains a tr line. //print $value[0]; // This contains a tr line.
print '<tr>'; print '<tr>';
print '<td>'.$productstatic->getNomUrl(1).'&nbsp &nbsp</td>'; print '<td>'.$productstatic->getNomUrl(1).' ('.$value['nb'].') &nbsp &nbsp</td>';
print '<td>'.$langs->trans("Stock").' : <b>'.$productstatic->stock_reel.' ('.$value['nb'].')</b></td>'; if ($conf->stock->enabled) print '<td>'.$langs->trans("Stock").' : <b>'.$productstatic->stock_reel.'</b></td>';
print '</tr>'; print '</tr>';
} }
print '</table>'; print '</table>';
@ -281,14 +281,14 @@ if ($id || $ref)
$productstatic->id=$value['id']; $productstatic->id=$value['id'];
$productstatic->type=$value['type']; $productstatic->type=$value['type'];
$productstatic->ref=$value['fullpath']; $productstatic->ref=$value['fullpath'];
$productstatic->load_stock(); if ($conf->stock->enabled) $productstatic->load_stock();
//var_dump($value); //var_dump($value);
//print '<pre>'.$productstatic->ref.'</pre>'; //print '<pre>'.$productstatic->ref.'</pre>';
//print $productstatic->getNomUrl(1).'<br>'; //print $productstatic->getNomUrl(1).'<br>';
//print $value[0]; // This contains a tr line. //print $value[0]; // This contains a tr line.
print '<tr>'; print '<tr>';
print '<td>'.$productstatic->getNomUrl(1).'&nbsp &nbsp</td>'; print '<td>'.$productstatic->getNomUrl(1).' ('.$value['nb'].') &nbsp &nbsp</td>';
print '<td>'.$langs->trans("Stock").' : <b>'.$productstatic->stock_reel.' ('.$value['nb'].')</b></td>'; if ($conf->stock->enabled) print '<td>'.$langs->trans("Stock").' : <b>'.$productstatic->stock_reel.'</b></td>';
print '</tr>'; print '</tr>';
} }
print '</table>'; print '</table>';
@ -298,29 +298,31 @@ if ($id || $ref)
print '</table>'; print '</table>';
dol_fiche_end(); dol_fiche_end();
print '<br>'; print '<br>';
print_fiche_titre($langs->trans("ProductToAddSearch"),'','');
print '<form action="'.DOL_URL_ROOT.'/product/composition/fiche.php?id='.$id.'" method="post">'; print '<form action="'.DOL_URL_ROOT.'/product/composition/fiche.php?id='.$id.'" method="post">';
print '<table class="border" width="100%"><tr><td>';
print '<table class="nobordernopadding">'; print '<table class="nobordernopadding">';
print '<tr><td><b>'.$langs->trans("ProductToAddSearch").'</b></td></tr>';
print '<tr><td>'; print '<tr><td>';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print $langs->trans("KeywordFilter"); print $langs->trans("KeywordFilter").' &nbsp; ';
print '</td><td><input type="text" name="key" value="'.$key.'">'; print '</td>';
print '<td><input type="text" name="key" value="'.$key.'">';
print '<input type="hidden" name="action" value="search">'; print '<input type="hidden" name="action" value="search">';
print '<input type="hidden" name="id" value="'.$id.'">'; print '<input type="hidden" name="id" value="'.$id.'">';
print '</td></tr>'; print '</td></tr>';
if($conf->categorie->enabled) if($conf->categorie->enabled)
{ {
print '<tr><td>'.$langs->trans("CategoryFilter"); print '<tr><td>'.$langs->trans("CategoryFilter").' &nbsp; </td>';
print '</td><td>'.$html->select_all_categories(0,$catMere).'</td></tr>'; print '<td>'.$html->select_all_categories(0,$catMere).'</td></tr>';
} }
print '<tr><td colspan="2"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>'; print '<tr><td colspan="2"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
print '</table>'; print '</table>';
print '</td></td></table>';
print '</form>'; print '</form>';
if($action == 'search') if($action == 'search')
@ -411,7 +413,7 @@ if ($id || $ref)
} }
print '</table>'; print '</table>';
print '<input type="hidden" name="max_prod" value="'.$i.'">'; print '<input type="hidden" name="max_prod" value="'.$i.'">';
if($num > 0) if($num > 0)
{ {
print '<br><center><input type="submit" class="button" value="'.$langs->trans("Add").'/'.$langs->trans("Update").'">'; print '<br><center><input type="submit" class="button" value="'.$langs->trans("Add").'/'.$langs->trans("Update").'">';
@ -449,5 +451,5 @@ print "\n</div>\n";
$db->close(); $db->close();
llxFooter('$Date: 2011/08/10 10:00:48 $ - $Revision: 1.10 $'); llxFooter('$Date: 2011/08/10 11:53:25 $ - $Revision: 1.11 $');
?> ?>