From e56e182fe90c52abf513c3fc0ba84bf3cffaf485 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Feb 2013 16:37:28 +0100
Subject: [PATCH] Fix: When creating invoice from other object, type must be
 "standard".

---
 htdocs/compta/facture.php | 111 +++++++++++++++++++-------------------
 1 file changed, 57 insertions(+), 54 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index bccac8d8354..7c42593f70b 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1915,14 +1915,6 @@ if ($action == 'create')
     print $desc;
     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
     if (! empty($conf->global->FACTURE_USE_PROFORMAT))
     {
@@ -1934,56 +1926,67 @@ if ($action == 'create')
         print '</td></tr>'."\n";
     }
 
-	if ($socid>0)
-	{
-	    // Replacement
-	    print '<tr height="18"><td valign="middle">';
-	    print '<input type="radio" name="type" value="1"'.(GETPOST('type')==1?' checked="checked"':'');
-	    if (! $options) print ' disabled="disabled"';
-	    print '>';
+    if (empty($origin))
+    {
+	    // 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">';
-	    $text=$langs->trans("InvoiceReplacementAsk").' ';
-	    $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);
+	    $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
 	    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";
+    	if ($socid > 0)
+		{
+		    // Replacement
+		    print '<tr height="18"><td valign="middle">';
+		    print '<input type="radio" name="type" value="1"'.(GETPOST('type')==1?' checked="checked"':'');
+		    if (! $options) print ' disabled="disabled"';
+		    print '>';
+		    print '</td><td valign="middle">';
+		    $text=$langs->trans("InvoiceReplacementAsk").' ';
+		    $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 '</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 '</td></tr>';