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

Fix: When creating invoice from other object, type must be "standard".

Browse Source
This commit is contained in:
Laurent Destailleur 2013-02-17 16:37:28 +01:00
parent 9f8ffe242a
commit e56e182fe9
1 changed files with 57 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
htdocs/compta/facture.php
View File

@ -1915,14 +1915,6 @@ if ($action == 'create')
print $desc; print $desc;
print '</td></tr>'."\n"; print '</td></tr>'."\n";
// Deposit
print '<tr height="18"><td width="16px" valign="middle">';
print '<input type="radio" name="type" value="3"'.(GETPOST('type')==3?' checked="checked"':'').'>';
print '</td><td valign="middle">';
$desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
print $desc;
print '</td></tr>'."\n";
// Proforma // Proforma
if (! empty($conf->global->FACTURE_USE_PROFORMAT)) if (! empty($conf->global->FACTURE_USE_PROFORMAT))
{ {
@ -1934,56 +1926,67 @@ if ($action == 'create')
print '</td></tr>'."\n"; print '</td></tr>'."\n";
} }
if ($socid>0) if (empty($origin))
{ {
// Replacement // Deposit
print '<tr height="18"><td valign="middle">'; print '<tr height="18"><td width="16px" valign="middle">';
print '<input type="radio" name="type" value="1"'.(GETPOST('type')==1?' checked="checked"':''); print '<input type="radio" name="type" value="3"'.(GETPOST('type')==3?' checked="checked"':'').'>';
if (! $options) print ' disabled="disabled"';
print '>';
print '</td><td valign="middle">'; print '</td><td valign="middle">';
$text=$langs->trans("InvoiceReplacementAsk").' '; $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
$text.='<select class="flat" name="fac_replacement" id="fac_replacement"';
if (! $options) $text.=' disabled="disabled"';
$text.='>';
if ($options)
{
$text.='<option value="-1"></option>';
$text.=$options;
}
else
{
$text.='<option value="-1">'.$langs->trans("NoReplacableInvoice").'</option>';
}
$text.='</select>';
$desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
print $desc; print $desc;
print '</td></tr>'."\n"; print '</td></tr>'."\n";
// Credit note if ($socid > 0)
print '<tr height="18"><td valign="middle">'; {
print '<input type="radio" name="type" value="2"'.(GETPOST('type')==2?' checked=true':''); // Replacement
if (! $optionsav) print ' disabled="disabled"'; print '<tr height="18"><td valign="middle">';
print '>'; print '<input type="radio" name="type" value="1"'.(GETPOST('type')==1?' checked="checked"':'');
print '</td><td valign="middle">'; if (! $options) print ' disabled="disabled"';
$text=$langs->transnoentities("InvoiceAvoirAsk").' '; print '>';
// $text.='<input type="text" value="">'; print '</td><td valign="middle">';
$text.='<select class="flat" name="fac_avoir" id="fac_avoir"'; $text=$langs->trans("InvoiceReplacementAsk").' ';
if (! $optionsav) $text.=' disabled="disabled"'; $text.='<select class="flat" name="fac_replacement" id="fac_replacement"';
$text.='>'; if (! $options) $text.=' disabled="disabled"';
if ($optionsav) $text.='>';
{ if ($options)
$text.='<option value="-1"></option>'; {
$text.=$optionsav; $text.='<option value="-1"></option>';
} $text.=$options;
else }
{ else
$text.='<option value="-1">'.$langs->trans("NoInvoiceToCorrect").'</option>'; {
} $text.='<option value="-1">'.$langs->trans("NoReplacableInvoice").'</option>';
$text.='</select>'; }
$desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1); $text.='</select>';
print $desc; $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
print '</td></tr>'."\n"; print $desc;
print '</td></tr>'."\n";
// Credit note
print '<tr height="18"><td valign="middle">';
print '<input type="radio" name="type" value="2"'.(GETPOST('type')==2?' checked=true':'');
if (! $optionsav) print ' disabled="disabled"';
print '>';
print '</td><td valign="middle">';
$text=$langs->transnoentities("InvoiceAvoirAsk").' ';
// $text.='<input type="text" value="">';
$text.='<select class="flat" name="fac_avoir" id="fac_avoir"';
if (! $optionsav) $text.=' disabled="disabled"';
$text.='>';
if ($optionsav)
{
$text.='<option value="-1"></option>';
$text.=$optionsav;
}
else
{
$text.='<option value="-1">'.$langs->trans("NoInvoiceToCorrect").'</option>';
}
$text.='</select>';
$desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1);
print $desc;
print '</td></tr>'."\n";
}
} }
print '</table>'; print '</table>';
print '</td></tr>'; print '</td></tr>';