lesanges
/
recusfiscaux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Correction erreur écriture en double (http://localhost:8080/tktview/ae62f4cde5) 

FossilOrigin-Name: ada31d7d5a3cc60b40e4bada4afd0eab57ca48eb4bac4b4d5f34fda5f8feca6e
This commit is contained in:
engel 2023-04-08 08:44:31 +00:00
parent 8e19aaf526
commit e75c56b736
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Utils.php
View File

@ -63,13 +63,12 @@ class Utils
INNER JOIN acc_accounts INNER JOIN acc_accounts
ON acc_transactions_lines.id_account = acc_accounts.id ON acc_transactions_lines.id_account = acc_accounts.id
WHERE WHERE
(strftime(%s, acc_transactions.date) = "%d" (strftime("%%Y", acc_transactions.date) = "%d"
AND AND
acc_accounts.%s acc_accounts.%s
) )
GROUP by acc_accounts.code GROUP by acc_accounts.code
ORDER by acc_accounts.code', ORDER by acc_accounts.code',
'"%Y"',
$annee, $annee,
$db->where('code', $op, $comptes) $db->where('code', $op, $comptes)
); );
@ -104,14 +103,13 @@ class Utils
INNER JOIN acc_accounts INNER JOIN acc_accounts
ON acc_transactions_lines.id_account = acc_accounts.id ON acc_transactions_lines.id_account = acc_accounts.id
WHERE WHERE
(strftime(%s, acc_transactions.date) = "%d" (strftime("%%Y", acc_transactions.date) = "%d"
AND AND
acc_accounts.%s acc_accounts.%s
) )
GROUP BY services_fees.id, acc_accounts.code GROUP BY services_fees.id, acc_accounts.code
ORDER BY acc_accounts.code ORDER BY acc_accounts.code
', ',
'"%Y"',
$annee, $annee,
$db->where('code', $op, $comptes) $db->where('code', $op, $comptes)
); );
@ -170,12 +168,12 @@ class Utils
INNER JOIN acc_accounts INNER JOIN acc_accounts
ON acc_transactions_lines.id_account = acc_accounts.id ON acc_transactions_lines.id_account = acc_accounts.id
WHERE WHERE
(strftime(%s, acc_transactions.date) = "%d" (strftime("%%Y", acc_transactions.date) = "%d"
AND AND
acc_accounts.%s acc_accounts.%s
) )
GROUP BY acc_transactions.id, acc_accounts.id
ORDER by %s, acc_accounts.code, acc_transactions.date', ORDER by %s, acc_accounts.code, acc_transactions.date',
'"%Y"',
$annee, $annee,
$db->where('code', $op, $comptes), $db->where('code', $op, $comptes),
$tri $tri
@ -225,7 +223,8 @@ class Utils
AND AND
%s %s
) )
ORDER by services_fees.id, %s, acc_accounts.code, acc_transactions.date', GROUP BY acc_transactions.id, acc_accounts.id
ORDER by %s, acc_accounts.code, acc_transactions.date',
$annee, $annee,
$condition, $condition,
$tri $tri
@ -265,14 +264,13 @@ class Utils
INNER JOIN acc_accounts INNER JOIN acc_accounts
ON acc_transactions_lines.id_account = acc_accounts.id ON acc_transactions_lines.id_account = acc_accounts.id
WHERE WHERE
(strftime(%s, acc_transactions.date) = "%d" (strftime("%%Y", acc_transactions.date) = "%d"
AND AND
acc_accounts.%s acc_accounts.%s
) )
GROUP BY acc_transactions.id, acc_accounts.id
ORDER by %s, acc_accounts.code, acc_transactions.date ORDER by %s, acc_accounts.code, acc_transactions.date
', ',
'"%Y"',
$annee, $annee,
$db->where('id', 'in', $comptesIsoles), $db->where('id', 'in', $comptesIsoles),
$tri $tri
@ -308,7 +306,7 @@ class Utils
INNER JOIN acc_transactions_lines INNER JOIN acc_transactions_lines
ON acc_transactions_lines.id_transaction = acc_transactions.id ON acc_transactions_lines.id_transaction = acc_transactions.id
WHERE ( WHERE (
strftime(%s, acc_transactions.date) = "%d" strftime("%%Y", acc_transactions.date) = "%d"
AND AND
acc_transactions_users.id_transaction = acc_transactions.id acc_transactions_users.id_transaction = acc_transactions.id
AND AND
@ -319,7 +317,6 @@ class Utils
', ',
$tri, $tri,
$nom, $nom,
'"%Y"',
$annee $annee
); );
$donateurs = array(); $donateurs = array();

2
www/admin/index.php
View File

@ -37,7 +37,7 @@ if (null !== $champsNom)
// pendant l'année fiscale choisie // pendant l'année fiscale choisie
$_SESSION['comptes'] = Utils::getComptes($_SESSION['annee_recu'], 'like', '7%'); $_SESSION['comptes'] = Utils::getComptes($_SESSION['annee_recu'], 'like', '7%');
// liste des activités, cotisations et comptes associés // liste des activités, tarifs et comptes associés
$activitesTarifsComptes = Utils::getTarifsComptes($_SESSION['annee_recu'], 'like', '7%'); $activitesTarifsComptes = Utils::getTarifsComptes($_SESSION['annee_recu'], 'like', '7%');
$_SESSION['lesTarifs'] = Utils::getTarifs(); $_SESSION['lesTarifs'] = Utils::getTarifs();
$_SESSION['lesActivites'] = Utils::getActivites(); $_SESSION['lesActivites'] = Utils::getActivites();

5
www/admin/versements_activites.php
View File

@ -63,12 +63,15 @@ $lesComptes = array_map(fn($elem) : string =>
$tarifsSelectionnes); $tarifsSelectionnes);
# versements des tarifs sélectionnées et de leur compte associé # versements des tarifs sélectionnées et de leur compte associé
$_SESSION['lesVersements'] = if (count($lesTarifs) != 0)
{
$_SESSION['lesVersements'] =
Utils::getVersementsTarifsComptes( Utils::getVersementsTarifsComptes(
$_SESSION['annee_recu'], $_SESSION['annee_recu'],
$lesTarifs, $lesTarifs,
$lesComptes, $lesComptes,
$champsNom); $champsNom);
}
// ajouter les versements sans tarif (tri par nom, compte, date) // ajouter les versements sans tarif (tri par nom, compte, date)
if (isset($_SESSION['comptesSelectionnes'])) if (isset($_SESSION['comptesSelectionnes']))