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

New: If there is only one back account and value is mandatory, then value is preselected.

Browse Source
This commit is contained in:
Laurent Destailleur 2011-02-05 17:25:56 +00:00
parent 457990e09b
commit 4269814214
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/paiement.php
View File

@ -266,7 +266,7 @@ if ($_GET['action'] == 'create' || $_POST['action'] == 'confirm_paiement' || $_P
if ($facture->type != 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToCredit').'</span></td>'; if ($facture->type != 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToCredit').'</span></td>';
if ($facture->type == 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToDebit').'</span></td>'; if ($facture->type == 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToDebit').'</span></td>';
print '<td>'; print '<td>';
$html->select_comptes(empty($_POST['accountid'])?'':$_POST['accountid'],'accountid',0,'',1); $html->select_comptes(empty($_POST['accountid'])?'':$_POST['accountid'],'accountid',0,'',2);
print '</td>'; print '</td>';
} }
else else

8
htdocs/core/class/html.form.class.php
View File

@ -838,7 +838,7 @@ class Form
/** /**
* Return list of products for customer in Ajax if Ajax activated or go to select_produits_do * Return list of products for customer in Ajax if Ajax activated or go to select_produits_do
* *
* @param selected Preselected products * @param selected Preselected products
* @param htmlname Name of HTML seletc field (must be unique in page) * @param htmlname Name of HTML seletc field (must be unique in page)
* @param filtertype Filter on product type (''=nofilter, 0=product, 1=service) * @param filtertype Filter on product type (''=nofilter, 0=product, 1=service)
@ -951,7 +951,7 @@ class Form
$outselect.='<select class="flat" name="'.$htmlname.'">'; $outselect.='<select class="flat" name="'.$htmlname.'">';
$outselect.='<option value="0" selected="selected">&nbsp;</option>'; $outselect.='<option value="0" selected="selected">&nbsp;</option>';
$i = 0; $i = 0;
while ($num && $i < $num) while ($num && $i < $num)
{ {
@ -1655,7 +1655,7 @@ class Form
* @param htmlname Name of select zone * @param htmlname Name of select zone
* @param statut Status of searched accounts (0=open, 1=closed) * @param statut Status of searched accounts (0=open, 1=closed)
* @param filtre To filter list * @param filtre To filter list
* @param useempty Add an empty value in list * @param useempty 1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
*/ */
function select_comptes($selected='',$htmlname='accountid',$statut=0,$filtre='',$useempty=0) function select_comptes($selected='',$htmlname='accountid',$statut=0,$filtre='',$useempty=0)
{ {
@ -1679,7 +1679,7 @@ class Form
if ($num) if ($num)
{ {
print '<select id="select'.$htmlname.'" class="flat selectbankaccount" name="'.$htmlname.'">'; print '<select id="select'.$htmlname.'" class="flat selectbankaccount" name="'.$htmlname.'">';
if ($useempty) if ($useempty == 1 || ($useempty == 2 && $num > 1))
{ {
print '<option value="'.$obj->rowid.'">&nbsp;</option>'; print '<option value="'.$obj->rowid.'">&nbsp;</option>';
} }