Fix pb with multicurrency

Dolibarr · Oct 16, 2016 · 15a7262 · 15a7262
1 parent 28933c3
commit 15a7262
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
@@ -439,12 +439,18 @@
 	                        $objp = $db->fetch_object($resql);
 	                        $var=!$var;
 	                        print '<tr '.$bc[$var].'>';
+
+	                        // Ref
 	                        print '<td>';
 	                        $invoicesupplierstatic->ref=$objp->ref;
 	                        $invoicesupplierstatic->id=$objp->facid;
 	                        print $invoicesupplierstatic->getNomUrl(1);
 	                        print '</td>';
+
+	                        // Ref supplier
 	                        print '<td>'.$objp->ref_supplier.'</td>';
+
+	                        // Date
 	                        if ($objp->df > 0 )
 	                        {
 	                            print '<td align="center">';
@@ -455,12 +461,12 @@
 	                            print '<td align="center"><b>!!!</b></td>';
 	                        }
 
-	                        // Currency
-	                        print '<td align="center">'.$objp->multicurrency_code."</td>\n";
-
 	                        // Multicurrency
 	                        if (!empty($conf->multicurrency->enabled)) 
 	                        {
+    	                        // Currency
+	                            print '<td align="center">'.$objp->multicurrency_code."</td>\n";
+
 	                            print '<td align="right">';
 	                            if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
 	                            {
@@ -520,13 +526,16 @@
 	                    {
 	                        // Print total
 	                        print '<tr class="liste_total">';
-	                        print '<td colspan="4" align="left">'.$langs->trans('TotalTTC').':</td>';
-	                        print '<td align="right"><b>'.price($total_ttc).'</b></td>';
+	                        print '<td colspan="3" align="left">'.$langs->trans('TotalTTC').':</td>';
+							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
 							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
-	                        print '<td align="right"><b>'.price($totalrecu).'</b></td>';
 							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
+							if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
+	                        print '<td align="right"><b>'.price($total_ttc).'</b></td>';
+							print '<td align="right"><b>'.price($totalrecu).'</b></td>';
 	                        print '<td align="right"><b>'.price($total_ttc - $totalrecu).'</b></td>';
 	                        print '<td align="center">&nbsp;</td>';
+	                        if (!empty($conf->multicurrency->enabled)) print '<td>&nbsp;</td>';
 	                        print "</tr>\n";
 	                    }
 	                    print "</table>\n";