From 5e12459ad158a88f4ab796d0d88c936e7e55dd04 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 6 May 2014 22:54:33 +0200 Subject: [PATCH] Fix: Ref and date for social contributions payments were merged into on field making not possible to click on ref. --- htdocs/compta/sociales/charges.php | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index adc5fb8ae74..753a4292fb9 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2013 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -303,8 +303,8 @@ if ($id > 0) print ''; /* - * Paiements - */ + * Payments + */ $sql = "SELECT p.rowid, p.num_paiement, datep as dp, p.amount,"; $sql.= "c.libelle as paiement_type"; $sql.= " FROM ".MAIN_DB_PREFIX."paiementcharge as p"; @@ -324,8 +324,12 @@ if ($id > 0) $i = 0; $total = 0; echo ''; print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; $var=True; while ($i < $num) @@ -333,15 +337,15 @@ if ($id > 0) $objp = $db->fetch_object($resql); $var=!$var; print "\n"; + print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''; + print '\n"; print "\n"; - print '\n"; + print '\n"; print ""; $totalpaye += $objp->amount; $i++; } - + if ($object->paye == 0) { print "\n"; @@ -375,7 +379,7 @@ if ($id > 0) print dol_print_date($object->periode,"day"); } print ""; - + // Due date if ($action == 'edit') {
'.$langs->trans("Payments").''.$langs->trans("Type").''.$langs->trans("Amount").' 
'.$langs->trans("RefPayment").''.$langs->trans("Date").''.$langs->trans("Type").''.$langs->trans("Amount").' 
"; - print ''.img_object($langs->trans("Payment"),"payment").' '; - print dol_print_date($db->jdate($objp->dp),'day')."'.dol_print_date($db->jdate($objp->dp),'day')."".$objp->paiement_type.' '.$objp->num_paiement."'.price($objp->amount)." ".$langs->trans("Currency".$conf->currency)."'.price($objp->amount)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("AlreadyPaid")." :".price($totalpaye)." ".$langs->trans("Currency".$conf->currency)."