Debug multicurrency

htdocs/compta/paiement.php

@@ -629,19 +629,19 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                     // Date
                     print '<td align="center">'.dol_print_date($db->jdate($objp->df),'day')."</td>\n";
                     
-                    // currency
+                    // Currency
                     print '<td align="center">'.$objp->multicurrency_code."</td>\n";
                     
 					// Multicurrency Price
 					if (!empty($conf->multicurrency->enabled)) 
 					{
 					    print '<td align="right">';
-					    if ($objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc);
+					    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc);
 					    print '</td>';
 					
                     	// Multicurrency Price
 						print '<td align="right">';
-						if ($objp->multicurrency_code != $conf->currency) 
+						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) 
 						{
 						    print price($sign * $multicurrency_payment);
     		                if ($multicurrency_creditnotes) print '+'.price($multicurrency_creditnotes);
@@ -651,7 +651,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 					
     					// Multicurrency Price
     				    print '<td align="right">';
-    				    if ($objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay);
+    				    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay);
     				    print '</td>';
 					}
 					
@@ -698,17 +698,20 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                    $namef = 'multicurrency_amount_'.$objp->facid;
 	                    $nameRemain = 'multicurrency_remain_'.$objp->facid;
 	
-	                    if ($action != 'add_paiement')
+	                    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
 	                    {
-	                        if (!empty($conf->use_javascript_ajax))
-								print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
-	                        print '<input type=hidden class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
-	                        print '<input type="text" size="8" class="multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
-	                    }
-	                    else
-	                    {
-	                        print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
-	                        print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
+    	                    if ($action != 'add_paiement')
+    	                    {
+    	                        if (!empty($conf->use_javascript_ajax))
+    								print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
+    	                        print '<input type=hidden class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
+    	                        print '<input type="text" size="8" class="multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
+    	                    }
+    	                    else
+    	                    {
+    	                        print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
+    	                        print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
+    	                    }
 	                    }
 	                    print "</td>";
 					}

htdocs/fourn/facture/paiement.php

@@ -419,13 +419,14 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                    print '<td>'.$langs->trans('Invoice').'</td>';
 	                    print '<td>'.$langs->trans('RefSupplier').'</td>';
 	                    print '<td align="center">'.$langs->trans('Date').'</td>';
-	                    print '<td align="right">'.$langs->trans('AmountTTC').'</td>';
+	                    if (!empty($conf->multicurrency->enabled)) print '<td>'.$langs->trans('Currency').'</td>';
 						if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
-	                    print '<td align="right">'.$langs->trans('AlreadyPaid').'</td>';
 						if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('MulticurrencyAlreadyPaid').'</td>';
-	                    print '<td align="right">'.$langs->trans('RemainderToPay').'</td>';
 						if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.$langs->trans('MulticurrencyRemainderToPay').'</td>';
-	                    print '<td align="center">'.$langs->trans('PaymentAmount').'</td>';
+	                    print '<td align="right">'.$langs->trans('AmountTTC').'</td>';
+	                    print '<td align="right">'.$langs->trans('AlreadyPaid').'</td>';
+	                    print '<td align="right">'.$langs->trans('RemainderToPay').'</td>';
+						print '<td align="center">'.$langs->trans('PaymentAmount').'</td>';
 						if (!empty($conf->multicurrency->enabled)) print '<td align="center">'.$langs->trans('MulticurrencyPaymentAmount').'</td>';
 	                    print '</tr>';
 
@@ -453,21 +454,41 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                        {
 	                            print '<td align="center"><b>!!!</b></td>';
 	                        }
+	                        
+	                        // Currency
+	                        print '<td align="center">'.$objp->multicurrency_code."</td>\n";
+	                        
+	                        // Multicurrency
+	                        if (!empty($conf->multicurrency->enabled)) 
+	                        {
+	                            print '<td align="right">';
+	                            if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
+	                            {
+	                                print price($objp->multicurrency_total_ttc);
+	                            }
+	                            print '</td>';
+
+							    print '<td align="right">';
+							    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) 
+						        {         
+						            print price($objp->multicurrency_am);
+							    }
+							    print '</td>';
+							    
+							    print '<td align="right">';
+							    if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) 
+						        {
+						            print price($objp->multicurrency_total_ttc - $objp->multicurrency_am);
+							    }
+							    print '</td>';
+	                        }
+
 	                        print '<td align="right">'.price($objp->total_ttc).'</td>';
 							
-							// Multicurrency
-							if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.price($objp->multicurrency_total_ttc).'</td>';
-	                        
 	                        print '<td align="right">'.price($objp->am).'</td>';
 							
-							// Multicurrency
-							if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.price($objp->multicurrency_am).'</td>';
-	                        
 	                        print '<td align="right">'.price($objp->total_ttc - $objp->am).'</td>';
 							
-							// Multicurrency
-							if (!empty($conf->multicurrency->enabled)) print '<td align="right">'.price($objp->multicurrency_total_ttc - $objp->multicurrency_am).'</td>';
-							
 	                        print '<td align="center">';
 	                        $namef = 'amount_'.$objp->facid;
 	                        if (!empty($conf->use_javascript_ajax))
@@ -479,10 +500,13 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							if (!empty($conf->multicurrency->enabled)) 
 							{
 								print '<td align="center">';
-			                    $namef = 'multicurrency_amount_'.$objp->facid;
-			                    if (!empty($conf->use_javascript_ajax))
-									print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($objp->multicurrency_total_ttc - $objp->multicurrency_am)."'");
-		                        print '<input type="text" size="8" class="multicurrency_amount" name="'.$namef.'" value="'.GETPOST($namef).'">';
+								if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
+								{
+    			                    $namef = 'multicurrency_amount_'.$objp->facid;
+    			                    if (!empty($conf->use_javascript_ajax))
+    									print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($objp->multicurrency_total_ttc - $objp->multicurrency_am)."'");
+    		                        print '<input type="text" size="8" class="multicurrency_amount" name="'.$namef.'" value="'.GETPOST($namef).'">';
+								}
 			                    print "</td>";
 							}
 							
@@ -496,7 +520,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                    {
 	                        // Print total
 	                        print '<tr class="liste_total">';
-	                        print '<td colspan="3" align="left">'.$langs->trans('TotalTTC').':</td>';
+	                        print '<td colspan="4" align="left">'.$langs->trans('TotalTTC').':</td>';
 	                        print '<td align="right"><b>'.price($total_ttc).'</b></td>';
 							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
 	                        print '<td align="right"><b>'.price($totalrecu).'</b></td>';