Skip to content

Commit

Permalink
Fix 'delete' link shown on account used in parts config
Browse files Browse the repository at this point in the history
  • Loading branch information
ehuelsmann committed Dec 15, 2023
1 parent 77ac280 commit 8489ee7
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion sql/modules/Account.sql
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,19 @@ eca(account_id) AS (
SELECT DISTINCT cash_account_id
FROM entity_credit_account
),
p(account_id) AS (
SELECT DISTINCT inventory_accno_id
FROM parts
UNION
SELECT DISTINCT income_accno_id
FROM parts
UNION
SELECT DISTINCT expense_accno_id
FROM parts
UNION
SELECT DISTINCT returns_accno_id
FROM parts
),
ta(account_id) AS (
SELECT chart_id
FROM eca_tax
Expand All @@ -730,7 +743,7 @@ SELECT a.id, a.is_heading, a.accno, a.description, a.gifi_accno,
ELSE null::numeric END,
CASE WHEN sum(ac.amount_bc) > 0 THEN sum(amount_bc)
ELSE null::numeric END,
count(ac.*)+count(hh.*)+count(ha.*)+count(eca.*)+count(ta.*), l.link
count(ac.*)+count(hh.*)+count(ha.*)+count(eca.*)+count(p.*)+count(ta.*), l.link
FROM (SELECT id, heading, false as is_heading, accno, description, gifi_accno
FROM account
UNION
Expand All @@ -742,6 +755,7 @@ SELECT a.id, a.is_heading, a.accno, a.description, a.gifi_accno,
LEFT JOIN hh ON hh.parent_id = a.id AND a.is_heading
LEFT JOIN ha ON ha.heading = a.id AND a.is_heading
LEFT JOIN eca ON eca.account_id = a.id AND NOT a.is_heading
LEFT JOIN p ON p.account_id = a.id AND NOT a.is_heading
LEFT JOIN ta ON ta.account_id = a.id AND NOT a.is_heading
GROUP BY a.id, a.is_heading, a.accno, a.description, a.gifi_accno, l.link
ORDER BY a.accno;
Expand Down

0 comments on commit 8489ee7

Please sign in to comment.