From 377bad6bc15e70e71ec142b1b56811ed6dfb660d Mon Sep 17 00:00:00 2001
From: Marius Mutu <mmarius28@gmail.com>
Date: Wed, 30 Sep 2026 10:09:11 +0300
Subject: [PATCH] sync SVN r18229

---
 Programe/saft_d406.prg | 9 +++++----
 changelog_roacont.txt  | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Programe/saft_d406.prg b/Programe/saft_d406.prg
index 1fc98d3..3698a24 100644
--- a/Programe/saft_d406.prg
+++ b/Programe/saft_d406.prg
@@ -3122,6 +3122,7 @@ select distinct u.cod_um_iso as UnitOfMeasure, u.um_iso as description
 		* GeneralLedgerEntries
 		* 4428 este optional sa aiba taxcode
 		* nu pun taxcode pentru 4428 pentru ca la exigibilizare TVA are un cod 380xxx diferit fata de 4428 301xxx si nu am 2 coduri pe aceeasi inregistrare in Registrul Jurnal
+		*!* 30.09.2026 marius.mutu - coloana de TVA (referita prin id_tva) nu are suma de taxa in D406
 		Text To m.lcSql Noshow Textmerge
 select c.an,
        c.luna,
@@ -3199,19 +3200,19 @@ select c.an,
                        a.suma,
                        a.suma_val,
                        case
-                         when j.taxcode <> 0 and j.id_tva is null then
+                         when (j.taxcode <> 0 or j.este_tva = 1) and j.id_tva is null then
                           null
                          else
                           decode(NVL(a.id_jtva_coloana,0), 0, null, a.id_jtva_coloana)
                        end as id_jtva_coloana,
                        case
-                         when j.taxcode <> 0 and j.id_tva is null then
+                         when (j.taxcode <> 0 or j.este_tva = 1) and j.id_tva is null then
                           0
                          else
                           decode(NVL(a.id_jtva_coloana,0), 0, 0, j.cota_tva)
                        end as cota_taxa, 
                        case
-                         when j.taxcode <> 0 and j.id_tva is null then
+                         when (j.taxcode <> 0 or j.este_tva = 1) and j.id_tva is null then
                           null
                          else
                           decode(NVL(a.id_jtva_coloana,0), 0, null, j.denumire)
@@ -3328,7 +3329,7 @@ select c.an,
                                   ac.id_sectie,
                                   ac.id_valuta,
                                   ac.curs) a
-                  left join jtva_coloane j
+                  left join (select j0.*, case when exists (select 1 from jtva_coloane b where b.id_tva = j0.id_jtva_coloana) then 1 else 0 end as este_tva from jtva_coloane j0) j
                     on a.id_jtva_coloana = j.id_jtva_coloana
                     left join vsaft_taxtable tx on a.taxcode = tx.taxcode) b
          group by an,
diff --git a/changelog_roacont.txt b/changelog_roacont.txt
index 7d6fc2e..43ff584 100644
--- a/changelog_roacont.txt
+++ b/changelog_roacont.txt
@@ -5,6 +5,8 @@ ROACONT - 2.11.84
 :eroare:
   Borderou eFactura: corectata eroarea "The download of the specified resource has failed" la Actualizare token si la Editare in browser.
 
+  Declaratia D406 (SAF-T). Notele 4428=4427 cu cota veche de TVA (24%, 20%) nu mai au suma de taxa completata pe conturile de TVA si nu mai apar la verificarea TVA (tip 3).
+
 :modificare:  
   Trezorerie > Banca valuta > Plati > "Plata factura in valuta diferita"  Se salveaza corect in registrul jurnal valuta facturii pe nota 581 = 5124 in valuta.