From 134f13c63f1f1f325c63f7ec3c1a6fb654b432b2 Mon Sep 17 00:00:00 2001
From: a-schild <andre@schild.ws>
Date: Tue, 7 Jul 2015 18:17:22 +0200
Subject: [PATCH] Removed conflict code from merge/checkout

---
 htdocs/fourn/facture/paiement.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 20cf8f250bd..ba3f82c78e0 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -424,8 +424,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	        // Bouton Enregistrer
 	        if ($action != 'add_paiement')
 	        {
-				print '<br><div class="center"><input type="checkbox" checked name="closepaidinvoices"> '.$langs->trans("ClosePaidInvoicesAutomatically");
-				print '<br><input type="submit" class="button" value="'.$langs->trans('Save').'"></div>';
+				print '<center><br><input type="checkbox" checked="checked" name="closepaidinvoices"> '.$langs->trans("ClosePaidInvoicesAutomatically");
+				print '<br><input type="submit" class="button" value="'.$langs->trans('Save').'"></center>';
 	        }
 
             // Form to confirm payment
@@ -545,7 +545,7 @@ if (empty($action))
         print_liste_field_titre($langs->trans('Account'),$_SERVER["PHP_SELF"],'ba.label','',$paramlist,'',$sortfield,$sortorder);
         print_liste_field_titre($langs->trans('Amount'),$_SERVER["PHP_SELF"],'p.amount','',$paramlist,'align="right"',$sortfield,$sortorder);
         //print_liste_field_titre($langs->trans('Invoice'),$_SERVER["PHP_SELF"],'ref_supplier','',$paramlist,'',$sortfield,$sortorder);
-		print_liste_field_titre('');
+        print '<td class="liste_titre">&nbsp;</td>';
 		print "</tr>\n";
 
         // Lines for filters fields