From ad72a8eed1689844be2a757cbee69a37684e3c0b Mon Sep 17 00:00:00 2001 From: aspangaro Date: Fri, 21 Oct 2016 06:34:02 +0200 Subject: [PATCH 1/4] Better presentation of invoice payment page --- htdocs/compta/paiement.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index ac03853a1b1..ed133716f86 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -461,24 +461,19 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''; // Third party - print '\n"; + print '\n"; // Date payment print ''; - print ''; - - $rowspan=5; + print ''; // Payment mode print '\n"; - print ''; print ''; // Bank account @@ -493,7 +488,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie } else { - print ''; + print ''; } print "\n"; @@ -515,6 +510,11 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''; print ''; + // Comments + print ''; + print ''; + print '
'.$langs->trans('Company').''.$facture->thirdparty->getNomUrl(4)."
'.$langs->trans('Company').''.$facture->thirdparty->getNomUrl(4)."
'.$langs->trans('Date').''; $datepayment = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); $datepayment= ($datepayment == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE)?-1:'') : $datepayment); $form->select_date($datepayment,'','','',0,"add_paiement",1,1,0,0,'','',$facture->date); - print ''.$langs->trans('Comments').'
'.$langs->trans('PaymentMode').''; $form->select_types_paiements((GETPOST('paiementcode')?GETPOST('paiementcode'):$facture->mode_reglement_code),'paiementcode','',2); print "'; - print '
  
'.$langs->trans('Comments').''; + print '
'; dol_fiche_end(); From d1cafde77d3e08c53f85db2c5636579b56fc5a72 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Fri, 21 Oct 2016 06:39:39 +0200 Subject: [PATCH 2/4] No rowspan needed --- htdocs/compta/paiement.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index ed133716f86..3f8d97976bd 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -512,8 +512,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie // Comments print ''.$langs->trans('Comments').''; - print ''; - print ''; + print ''; + print ''; print ''; From 3cf44fcd3ef767609044273ce5e7c4dc1c9e4825 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Fri, 21 Oct 2016 07:02:43 +0200 Subject: [PATCH 3/4] Fix: Missing Currency title --- htdocs/compta/paiement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 3f8d97976bd..7bfbc9ea076 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -578,7 +578,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''; print ''.$arraytitle.''; print ''.$langs->trans('Date').''; - if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('Currency').''; + print ''.$langs->trans('Currency').''; if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('MulticurrencyAmountTTC').''; if (!empty($conf->multicurrency->enabled)) print ''.$multicurrencyalreadypayedlabel.''; if (!empty($conf->multicurrency->enabled)) print ''.$multicurrencyremaindertopay.''; From b67c4ece8dc718859032eddd0d24ae4a01aa8881 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Fri, 21 Oct 2016 07:04:08 +0200 Subject: [PATCH 4/4] Fix: Missing Currency column --- htdocs/compta/paiement.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 7bfbc9ea076..97630ca4252 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -578,7 +578,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''; print ''.$arraytitle.''; print ''.$langs->trans('Date').''; - print ''.$langs->trans('Currency').''; + if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('Currency').''; if (!empty($conf->multicurrency->enabled)) print ''.$langs->trans('MulticurrencyAmountTTC').''; if (!empty($conf->multicurrency->enabled)) print ''.$multicurrencyalreadypayedlabel.''; if (!empty($conf->multicurrency->enabled)) print ''.$multicurrencyremaindertopay.''; @@ -633,7 +633,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''.dol_print_date($db->jdate($objp->df),'day')."\n"; // Currency - print ''.$objp->multicurrency_code."\n"; + if (!empty($conf->multicurrency->enabled)) print ''.$objp->multicurrency_code."\n"; // Multicurrency Price if (!empty($conf->multicurrency->enabled))