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

Fix: Mise en paramtre du nombre max d'lments de la liste des produits

Browse Source
This commit is contained in:
Laurent Destailleur 2005-10-10 20:55:21 +00:00
parent 9aa9e8eab0
commit 98edc34d85
5 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/addpropal.php
View File

@ -191,7 +191,7 @@ if ($_GET["action"] == 'create')
for ($i = 1 ; $i <= PROPALE_NEW_FORM_NB_PRODUCT ; $i++) for ($i = 1 ; $i <= PROPALE_NEW_FORM_NB_PRODUCT ; $i++)
{ {
print '<tr><td>'; print '<tr><td>';
$form->select_produits('',"idprod".$i,'',50); $form->select_produits('',"idprod".$i,'',$conf->produit->limit_size);
print '</td>'; print '</td>';
print '<td><input type="text" size="2" name="qty'.$i.'" value="1"></td>'; print '<td><input type="text" size="2" name="qty'.$i.'" value="1"></td>';
print '<td><input type="text" size="3" name="remise'.$i.'" value="'.$soc->remise_client.'"> %</td></tr>'; print '<td><input type="text" size="3" name="remise'.$i.'" value="'.$soc->remise_client.'"> %</td></tr>';

4
htdocs/commande/fiche.php
View File

@ -330,7 +330,7 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
for ($i = 1 ; $i <= $NBLINES ; $i++) for ($i = 1 ; $i <= $NBLINES ; $i++)
{ {
print '<tr><td>'; print '<tr><td>';
print $html->select_produits('','idprod'.$i); print $html->select_produits('','idprod'.$i,'',$conf->produit->limit_size);
print '</td>'; print '</td>';
print '<td><input type="text" size="3" name="qty'.$i.'" value="1"></td>'; print '<td><input type="text" size="3" name="qty'.$i.'" value="1"></td>';
print '<td><input type="text" size="3" name="remise_percent'.$i.'" value="0">%</td></tr>'; print '<td><input type="text" size="3" name="remise_percent'.$i.'" value="0">%</td></tr>';
@ -806,7 +806,7 @@ else
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td colspan="2">'; print '<td colspan="2">';
$html->select_produits('','p_idprod','',20); $html->select_produits('','p_idprod','',$conf->produit->limit_size);
print '<br>'; print '<br>';
print '<textarea cols="50" name="np_desc" rows="1"></textarea>'; print '<textarea cols="50" name="np_desc" rows="1"></textarea>';
print '</td>'; print '</td>';

20
htdocs/compta/facture.php
View File

@ -654,7 +654,7 @@ if ($_GET['action'] == 'create')
$nbrows=4; $nbrows=4;
if ($conf->global->FAC_USE_CUSTOMER_ORDER_REF) $nbrows++; if ($conf->global->FAC_USE_CUSTOMER_ORDER_REF) $nbrows++;
print '<td rowspan="'.$nbrows.'" valign="top">'; print '<td rowspan="'.$nbrows.'" valign="top">';
print '<textarea name="note" wrap="soft" cols="50" rows="'.ROWS_5.'">'; print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_5.'">';
if (is_object($propal)) if (is_object($propal))
{ {
print $propal->note; print $propal->note;
@ -1500,7 +1500,7 @@ else
print ' - '.stripslashes(nl2br($objp->product)); print ' - '.stripslashes(nl2br($objp->product));
print '<br>'; print '<br>';
} }
print '<textarea name="desc" cols="50" rows="'.ROWS_2.'">'.stripslashes($objp->description).'</textarea></td>'; print '<textarea name="desc" cols="70" rows="'.ROWS_2.'">'.stripslashes($objp->description).'</textarea></td>';
print '<td align="right">'; print '<td align="right">';
print $html->select_tva('tva_tx',$objp->tva_taux); print $html->select_tva('tva_tx',$objp->tva_taux);
print '</td>'; print '</td>';
@ -1558,7 +1558,7 @@ else
$var=true; $var=true;
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td><textarea name="desc" cols="50" rows="'.ROWS_2.'"></textarea></td>'; print '<td><textarea name="desc" cols="70" rows="'.ROWS_2.'"></textarea></td>';
print '<td align="right">'; print '<td align="right">';
$html->select_tva('tva_tx',$conf->defaulttx); $html->select_tva('tva_tx',$conf->defaulttx);
print '</td>'; print '</td>';
@ -1591,7 +1591,7 @@ else
print '<td colspan="2">'; print '<td colspan="2">';
$html->select_produits('','idprod','',$conf->produit->limit_size); $html->select_produits('','idprod','',$conf->produit->limit_size);
print '<br>'; print '<br>';
print '<textarea name="desc" cols="50" rows="'.ROWS_2.'"></textarea></td>'; print '<textarea name="desc" cols="70" rows="'.ROWS_2.'"></textarea></td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print '<td align="right"><input type="text" name="qty" value="1" size="2"></td>'; print '<td align="right"><input type="text" name="qty" value="1" size="2"></td>';
print '<td align="right" nowrap><input type="text" name="remise_percent" size="2" value="0">%</td>'; print '<td align="right" nowrap><input type="text" name="remise_percent" size="2" value="0">%</td>';
@ -1790,14 +1790,24 @@ else
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'; print '<tr '.$bc[$var].'><td>';
print '<a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$objp->id.'">'.img_object($langs->trans('ShowOrder'), 'order').' '.$objp->ref."</a></td>\n"; print '<a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$objp->id.'">'.img_object($langs->trans('ShowOrder'), 'order').' '.$objp->ref."</a></td>\n";
if ($conf->global->FAC_USE_CUSTOMER_ORDER_REF)
{
print '<td>'.$objp->ref_client.'</td>'; print '<td>'.$objp->ref_client.'</td>';
}
print '<td align="center">'.dolibarr_print_date($objp->date_commande).'</td>'; print '<td align="center">'.dolibarr_print_date($objp->date_commande).'</td>';
print '<td align="right">'.price($objp->total_ht).'</td>'; print '<td align="right">'.price($objp->total_ht).'</td>';
print "</tr>\n"; print "</tr>\n";
$total = $total + $objp->total_ht; $total = $total + $objp->total_ht;
$i++; $i++;
} }
print '<tr class="liste_total"><td>&nbsp;</td><td>&nbsp;</td><td align="left">'.$langs->trans('TotalHT').'</td><td align="right">'.price($total).'</td></tr>'; print '<tr class="liste_total">';
print '<td align="left">'.$langs->trans('TotalHT').'</td>';
if ($conf->global->FAC_USE_CUSTOMER_ORDER_REF)
{
print '<td>&nbsp;</td>';
}
print '<td>&nbsp;</td>';
print '<td align="right">'.price($total).'</td></tr>';
print '</table>'; print '</table>';
} }
} }

2
htdocs/contrat/fiche.php
View File

@ -806,7 +806,7 @@ else
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td colspan="3">'; print '<td colspan="3">';
$html->select_produits('','p_idprod','',0); $html->select_produits('','p_idprod','',$conf->produit->limit_size);
print '<br>'; print '<br>';
print '<textarea name="desc" cols="50" rows="'.ROWS_2.'"></textarea>'; print '<textarea name="desc" cols="50" rows="'.ROWS_2.'"></textarea>';
print '</td>'; print '</td>';

8
htdocs/main.inc.php
View File

@ -130,6 +130,12 @@ if (isset($user->conf->MAIN_LANG_DEFAULT) && $user->conf->MAIN_LANG_DEFAULT)
} }
} }
$conf->produit->limit_size=50;
if (isset($user->conf->PRODUIT_LIMIT_SIZE))
{
$conf->produit->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;
}
// Remplace conf->css par valeur personnalisée // Remplace conf->css par valeur personnalisée
if (isset($user->conf->MAIN_THEME) && $user->conf->MAIN_THEME) if (isset($user->conf->MAIN_THEME) && $user->conf->MAIN_THEME)
{ {
@ -144,7 +150,7 @@ if (isset($user->conf->MAIN_DISABLE_JAVASCRIPT) && $user->conf->MAIN_DISABLE_JAV
$conf->use_javascript=! $user->conf->MAIN_DISABLE_JAVASCRIPT; $conf->use_javascript=! $user->conf->MAIN_DISABLE_JAVASCRIPT;
} }
// Défini gestionnaire de manu à utiliser // Défini gestionnaire de menu à utiliser
if (! $user->societe_id) // Si utilisateur interne if (! $user->societe_id) // Si utilisateur interne
{ {
$conf->top_menu=$conf->global->MAIN_MENU_BARRETOP; $conf->top_menu=$conf->global->MAIN_MENU_BARRETOP;