diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 048ed73075b72901d2ef1a4dc345020f3eab24f5..5c2d68123026d921637afb044cc2181a2cb383c5 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -465,10 +465,11 @@ if ($id > 0 || ! empty($ref)) if ($mode_search && ! empty($conf->tax->enabled)) { // VAT - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu2 ON bu2.fk_bank = b.rowid AND bu2.type='payment_vat'"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu2 ON bu2.fk_bank = b.rowid AND bu2.type='payment_vat'"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."tva as t ON bu2.url_id = t.rowid"; - // Salary payment - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu3 ON bu3.fk_bank = b.rowid AND bu3.type='payment_salary'"; + + // Salary payment + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu3 ON bu3.fk_bank = b.rowid AND bu3.type='payment_salary'"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_salary as sal ON bu3.url_id = sal.rowid"; } if ($mode_search && ! empty($conf->adherent->enabled)) @@ -587,7 +588,7 @@ if ($id > 0 || ! empty($ref)) $paymentvatstatic->ref=$links[$key]['url_id']; print ' '.$paymentvatstatic->getNomUrl(2); } - elseif ($links[$key]['type']=='payment_salary') + elseif ($links[$key]['type']=='payment_salary') { $paymentsalstatic->id=$links[$key]['url_id']; $paymentsalstatic->ref=$links[$key]['url_id']; @@ -628,7 +629,7 @@ if ($id > 0 || ! empty($ref)) { } - elseif ($links[$key]['type']=='user') + elseif ($links[$key]['type']=='user') { } @@ -670,7 +671,7 @@ if ($id > 0 || ! empty($ref)) $societestatic->nom=$links[$key]['label']; print $societestatic->getNomUrl(1,'',16); } - else if ($links[$key]['type']=='user') + else if ($links[$key]['type']=='user') { $userstatic->id=$links[$key]['url_id']; $userstatic->lastname=$links[$key]['label']; diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 615c3ac868a606400bcb973c8ced59361ea9ddb4..735a78319ab42daad127d80ec30f74dc90ebf3cc 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -252,7 +252,7 @@ if ($resql) print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->dv),"day")."</td>\n"; // Payment type - print "<td align=\"center\">"; + print '<td class="nowrap">'; $labeltype=($langs->trans("PaymentTypeShort".$objp->fk_type)!="PaymentTypeShort".$objp->fk_type)?$langs->trans("PaymentTypeShort".$objp->fk_type):$langs->getLabelFromKey($db,$objp->fk_type,'c_paiement','code','libelle'); if ($labeltype == 'SOLD') print ' '; //$langs->trans("InitialBankBalance"); else print $labeltype; diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index d9ba93188bd11d5b77265ca3e149d861160936fb..ef75e8746d1e4527541a4046fa227ff21144f686 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -323,7 +323,7 @@ class Tva extends CommonObject /** - * Hum la fonction s'appelle 'Solde' elle doit a mon avis calcluer le solde de TVA, non ? + * Hum la fonction s'appelle 'Solde' elle doit a mon avis calculer le solde de TVA, non ? * * @param int $year Year * @return double Amount @@ -589,7 +589,7 @@ class Tva extends CommonObject } /** - * Mise a jour du lien entre le paiement tva et la ligne g�n�r�e dans llx_bank + * Mise a jour du lien entre le paiement tva et la ligne generee dans llx_bank * * @param int $id_bank Id compte bancaire * @return int <0 if KO, >0 if OK