From 42d7aab8fa9e6b65519a6e2d462c4c11b8c282f2 Mon Sep 17 00:00:00 2001 From: angelo Date: Fri, 28 Nov 1997 14:57:21 +0000 Subject: [PATCH] Modifiche per IVA11'97: nuovi campi, nuove dizioni, nuove aliquote. git-svn-id: svn://10.65.10.50/trunk@5672 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg0400.cpp | 22 +++++------ cg/cg4304.cpp | 18 ++++----- cg/f103.dir | 3 ++ cg/f103.trr | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++ cg/f104.dir | 3 ++ cg/f104.trr | 44 +++++++++++++++++++++ 6 files changed, 173 insertions(+), 20 deletions(-) create mode 100755 cg/f103.dir create mode 100755 cg/f103.trr create mode 100755 cg/f104.dir create mode 100755 cg/f104.trr diff --git a/cg/cg0400.cpp b/cg/cg0400.cpp index 0127b49a3..4c8a51e7a 100755 --- a/cg/cg0400.cpp +++ b/cg/cg0400.cpp @@ -197,7 +197,7 @@ const char* TProgressivi_iva::desc_iva(const TString& cod) if (cod == "{AF") TMP = "Artt.17c3/74c1"; - else if (cod == "{A13") + else if (cod == "{A14") TMP = "Art.40c5/6/8 a.i."; else { @@ -272,8 +272,8 @@ void TProgressivi_iva::look_pim() TTable tabiva("%IVA"); TString80 codtab; TString16 codatt,codiva,tipoiva,codreg; - TToken_string a13("",'!'); - real imponibile, imposta,afi,afv,a13i,a13v; + TToken_string a14("",'!'); + real imponibile, imposta,afi,afv,a14i,a14v; real corr_item,*cp,aliquota; bool is_key; @@ -281,7 +281,7 @@ void TProgressivi_iva::look_pim() for (pim.first(); !pim.eof(); pim.next()) { - imponibile = imposta = afi = afv = a13i = a13v = ZERO; + imponibile = imposta = afi = afv = a14i = a14v = ZERO; tiporec tipo; codtab = pim.get("CODTAB"); @@ -339,16 +339,16 @@ void TProgressivi_iva::look_pim() imposta += pim.get_real("R6"); } if (_mese == 13) - { // Separa le autofatture non residenti(AF) e gli importi A13 + { // Separa le autofatture non residenti(AF) e gli importi A14 afi = pim.get_real("R7"); afv = pim.get_real("R8"); - a13 = pim.get("S0"); - a13i = a13.get(0); - a13v = a13.get(1); - imponibile -= afi + a13i; - imposta -= afv + a13v; + a14 = pim.get("S0"); + a14i = a14.get(0); + a14v = a14.get(1); + imponibile -= afi + a14i; + imposta -= afv + a14v; _gen1_array.add_riga("{AF",afi,afv,ZERO,ZERO,ZERO,ZERO); // Mette '{' cosi' vengono stampati per ultimi - _gen1_array.add_riga("{A13",a13i,a13v,ZERO,ZERO,ZERO,ZERO); + _gen1_array.add_riga("{A14",a14i,a14v,ZERO,ZERO,ZERO,ZERO); } if (_mese != 13) diff --git a/cg/cg4304.cpp b/cg/cg4304.cpp index 185ff3645..f4f0e93ec 100755 --- a/cg/cg4304.cpp +++ b/cg/cg4304.cpp @@ -646,7 +646,7 @@ void TLiquidazione_app::describe_pims(int month, const char* codatt) if (!corrisp || (!cfv.is_zero() || !cfi.is_zero())) { real adf, adi; // autofatture non residenti art. 17 - real a13i, a13v; // ammontare art 40 c. 5/6/8 + real a14i, a14v; // ammontare art 40 c. 5/6/8 real vendi = corrisp ? cfi : _pim->get_real("R0"); real vendv = corrisp ? cfv : _pim->get_real("R1"); @@ -656,21 +656,21 @@ void TLiquidazione_app::describe_pims(int month, const char* codatt) if (month == 13) { TToken_string kr(_pim->get("S0"),'!'); - a13i = kr.get(0); - a13v = kr.get(1); + a14i = kr.get(0); + a14v = kr.get(1); adf = _pim->get_real("R7"); adi = _pim->get_real("R8"); } - d->_r0 += vendi - adf - a13i; - d->_r1 += vendv - adi - a13v; + d->_r0 += vendi - adf - a14i; + d->_r1 += vendv - adi - a14v; t0 += vendi /* - adf */; t1 += vendv /* - adi */; autodafe += adf; autodafe_iva += adi; - art40 += a13i; - art40_iva += a13v; + art40 += a14i; + art40_iva += a14v; } } if (isnew) @@ -720,7 +720,7 @@ void TLiquidazione_app::describe_pims(int month, const char* codatt) { _DescrItem* ads = new _DescrItem(PIM_ROW); ads->_s0 = ref; - ads->_s1 = "A13"; + ads->_s1 = "A14"; ads->_r0 = art40; ads->_r1 = art40_iva; if (isfirst) @@ -1333,7 +1333,7 @@ void TLiquidazione_app::set_pim(_DescrItem& d) int rw = 1; if (d._s1 == "AF") //Il dio sistema colpisce ancora, non va bene A35, ma AF... d._s2 = "Artt.17c3/74c1"; // La descrizione non la metto uguale perche' cosi e' piu' fika - else if (d._s1 == "A13") // Sempre per merito del dio sistema ho dovuto aggiungere A13. + else if (d._s1 == "A14") // Sempre per merito del dio sistema ho dovuto aggiungere A14. d._s2 = "Art.40c5/6/8 a.i."; else if (d._s0 == "74TER") rw++; diff --git a/cg/f103.dir b/cg/f103.dir new file mode 100755 index 000000000..3382e3489 --- /dev/null +++ b/cg/f103.dir @@ -0,0 +1,3 @@ +103 +1 +%tab1100a|0|0|1466|7|File trasferimento IVA11||| diff --git a/cg/f103.trr b/cg/f103.trr new file mode 100755 index 000000000..808b0057b --- /dev/null +++ b/cg/f103.trr @@ -0,0 +1,103 @@ +103 +99 +TADITT|1|5|0| +TACATT|1|5|0| +IMA01|4|15|2| +IMA02|4|15|2| +IMA03|4|15|2| +A35|4|15|2| +A35BIS|4|15|2| +A35TER|4|15|2| +B14|4|15|2| +XC101|4|15|2| +XC102|4|15|2| +XC103|4|15|2| +XC104|4|15|2| +XC105|4|15|2| +XC106|4|15|2| +XC107|4|15|2| +XC108|4|15|2| +XC109|4|15|2| +XC110|4|15|2| +XC111|4|15|2| +XC201|4|15|2| +XC202|4|15|2| +XC203|4|15|2| +XC204|4|15|2| +XC205|4|15|2| +XC206|4|15|2| +XC207|4|15|2| +XC208|4|15|2| +E52|4|15|2| +F76|4|15|2| +EC101|4|15|2| +EC102|4|15|2| +EC103|4|15|2| +EC104|4|15|2| +EC105|4|15|2| +EC106|4|15|2| +EC107|4|15|2| +EC108|4|15|2| +EC109|4|15|2| +EC110|4|15|2| +EC111|4|15|2| +EC112|4|15|2| +EC113|4|15|2| +EC114|4|15|2| +EC115|4|15|2| +EC116|4|15|2| +EC201|4|15|2| +EC202|4|15|2| +EC203|4|15|2| +EC204|4|15|2| +EC205|4|15|2| +IVVENR|4|15|2| +FC101|4|15|2| +FC102|4|15|2| +FC103|4|15|2| +FC104|4|15|2| +FC105|4|15|2| +FC106|4|15|2| +FC107|4|15|2| +FC108|4|15|2| +FC109|4|15|2| +FC110|4|15|2| +FC111|4|15|2| +FC112|4|15|2| +FC113|4|15|2| +FC114|4|15|2| +FC115|4|15|2| +FC116|4|15|2| +FC201|4|15|2| +FC202|4|15|2| +FC203|4|15|2| +FC204|4|15|2| +FC205|4|15|2| +FC206|4|15|2| +FC207|4|15|2| +FC208|4|15|2| +FC209|4|15|2| +FC210|4|15|2| +SBF01|4|15|2| +SBF02|4|15|2| +SBF03|4|15|2| +SBF04|4|15|2| +SBF05|4|15|2| +SBF06|4|15|2| +SBF07|4|15|2| +SBF08|4|15|2| +SBF09|4|15|2| +SBF10|4|15|2| +SBF11|4|15|2| +SBF12|4|15|2| +SBF13|4|15|2| +SBI01|4|15|2| +SBI02|4|15|2| +SBI03|4|15|2| +SBI04|4|15|2| +SBI05|4|15|2| +SBI06|4|15|2| +SBI07|4|15|2| +SBI08|4|15|2| +1 +TADITT+TACATT| diff --git a/cg/f104.dir b/cg/f104.dir new file mode 100755 index 000000000..64333eb7c --- /dev/null +++ b/cg/f104.dir @@ -0,0 +1,3 @@ +104 +1 +%tab1100b|0|0|581|7|File trasferimento IVA11 (bis)||| diff --git a/cg/f104.trr b/cg/f104.trr new file mode 100755 index 000000000..49e45c671 --- /dev/null +++ b/cg/f104.trr @@ -0,0 +1,44 @@ +104 +40 +TADITT|1|5|0| +TACATT|1|5|0| +R1|4|15|2| +R2|4|15|2| +R3|4|15|2| +R4|4|15|2| +R5|4|15|2| +R6|4|15|2| +R9|4|15|2| +T1|4|15|2| +T1C|4|15|2| +T2|4|15|2| +T2C|4|15|2| +T3|4|15|2| +T3C|4|15|2| +T5|4|15|2| +T6|4|15|2| +G30I|4|15|2| +G30V|4|15|2| +G31I|4|15|2| +G31V|4|15|2| +ABME01|4|15|2| +ABME02|4|15|2| +ABME03|4|15|2| +ABME04|4|15|2| +ABVE01|4|15|2| +ABVE02|4|15|2| +ABVE03|4|15|2| +ABVE04|4|15|2| +AGME01|4|15|2| +AGME02|4|15|2| +AGME03|4|15|2| +AGME04|4|15|2| +AGVE01|4|15|2| +AGVE02|4|15|2| +AGVE03|4|15|2| +AGVE04|4|15|2| +RQA34|4|15|2| +L2|4|15|2| +L2BIS|4|15|2| +1 +TADITT+TACATT|