root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 12.0 618

Browse Source 
Files correlati     :
Commento            : cg5.exe cg5500b.msk cg5500a.rep cg5500d.msk

Aggiunta colonna con iva da versare/a credito. camibato il contenuto della prima con il risultato
This commit is contained in:
AlexBonazzi 2018-08-26 09:03:57 +02:00
parent fb98823f08
commit 028e8139fd
5 changed files with 209 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
src/cg/cg5500.cpp
View File

@ -367,7 +367,7 @@ void Visliq_app::print()
book.add(rep);
rep.load("cg5500b");
r = rep.recordset();
r->set_var("#FILTER", key, true);
r->set_var("#FILTER", key1, true);
r->set_var("#ANNO", TVariant((long)year()), true);
book.add(rep);
book.print_or_preview();
@ -613,7 +613,7 @@ bool Visliq_app::vis_all()
for (int id = 108; shm.id2pos(id) > 0; id++)
{
if ((id > 107 && id <= 110) || id == 112)
if ((id > 107 && id <= 110) || id == 114)
sh.enable_column(id, true);
}
}
@ -1436,18 +1436,20 @@ void Visliq_app::recalc_next_liq(int start_month, TSheet_field* sl, TSheet_field
TToken_string& t = sl->row(row);
t.add(itoname(i),0);
const real r0 = _lim->get_real("R0");
const real iva_ven = _lam->get_real("R0"); // IVA acquisti
const real iva_acq = _lam->get_real("R1"); // IVA vendite
const real ris = iva_ven - iva_acq;
t.add(abs(ris).string(), 1);
const real r1 = _lim->get_real("R1");
bool enable_date = !r1.is_zero();
const real r5 = _lim->get_real("R5");
real absv = abs(r0);
t.add(absv, 1);
if (!r0.is_zero())
t.add(r0 > ZERO ? "D" : "C", 2);
t.add(ris == ZERO ? "" : (ris > ZERO ? "D" : "C"), 2);
t.add(r1, 3);
absv = abs(r5);
t.add(absv, 4);
t.add(abs(r5), 4);
if (!r5.is_zero())
t.add(r5 >ZERO ? "D" : "C", 5);
@ -1480,7 +1482,14 @@ void Visliq_app::recalc_next_liq(int start_month, TSheet_field* sl, TSheet_field
}
else
t.add("", 10);
t.add(_lim->get("S3"), 11);
real r0 = _lim->get_real("R0");
if (compensabile)
r0 += autf24;
t.add(abs(r0).string(), 11);
t.add(r0 == ZERO ? "" : (r0 > ZERO ? "D" : "C"), 12);
t.add(_lim->get("S3"), 13);
for (int kk = 3; kk < 6 ; kk++)
sl->enable_cell(row, kk);
@ -1488,7 +1497,7 @@ void Visliq_app::recalc_next_liq(int start_month, TSheet_field* sl, TSheet_field
sl->enable_cell(row, 8);
sl->enable_cell(row, 9);
sl->enable_cell(row, 9, enable_date);
sl->enable_cell(row, 12);
sl->enable_cell(row, 14);
}
}
sl->force_update();
@ -1600,17 +1609,21 @@ void Visliq_app::read_general(TMask& m)
else
tt = &(sh.row(row));
const real r0abs = abs(_lim->get_real("R0"));
const real iva_ven = _lam->get_real("R0"); // IVA acquisti
const real iva_acq = _lam->get_real("R1"); // IVA vendite
const real ris = iva_ven -iva_acq;
const real r1 = _lim->get_real("R1");
const real r5abs = abs(_lim->get_real("R5"));
tt->add(itoname(i),0);
tt->add(r0abs.string(),1);
tt->add(abs(ris).string(),1);
int sr0 = (_lim->get_real("R0")).sign();
int sr5 = (_lim->get_real("R5")).sign();
const int sris = ris.sign();
const int sr5 = (_lim->get_real("R5")).sign();
tt->add(sr0 == 0 ? "" : (sr0 > 0 ? "D" : "C"),2);
tt->add(sris == 0 ? "" : (sris > 0 ? "D" : "C"),2);
tt->add(r1.string(),3);
tt->add(r5abs.string(),4);
bool enable_date = !r1.is_zero();
@ -1629,8 +1642,6 @@ void Visliq_app::read_general(TMask& m)
sh.enable_cell(row, 9, enable_date);
if (compensabile)
{
// if (cr_res > ZERO)
// {
cr_res += autf24;
cr_res -= crf24;
cr_res -= criva;
@ -1647,9 +1658,15 @@ void Visliq_app::read_general(TMask& m)
}
else
tt->add("", 10);
tt->add(_lim->get("S3"), 11);
real r0 = _lim->get_real("R0");
if (compensabile)
r0 += autf24;
tt->add(abs(r0).string(), 11);
tt->add(r0 == ZERO ? "" : (r0 > ZERO ? "D" : "C"), 12);
tt->add(_lim->get("S3"), 13);
sh.row(row) = (*tt);
// sh.force_update(row);
}
sh.force_update();
@ -1708,7 +1725,7 @@ void Visliq_app::read_general(TMask& m)
tt.add(versamenti[i-1].string(),5);// versamenti
sv.row(-1) = tt;
if (i == 12)
if (i == 11)
sv.enable_cell(sv.items() - 1, -1, false);
}
@ -1771,7 +1788,7 @@ void Visliq_app::write_general(TMask& m)
// risolve menata del dettaglio si'/no
if (lfrommask)
{
for (int i = 1; i <= 11; i++)
for (int i = 1; i <= 13; i++)
tt_ln.add(shm.get(101+i),i);
}
@ -1806,7 +1823,7 @@ void Visliq_app::write_general(TMask& m)
TString8 ncab (tt_vn.get(3));
TString ocon (tt_vo.get(4));
TString ncon (tt_vn.get(4));
TString descr(tt_ln.get(11));
TString descr(tt_ln.get(13));
if (odbcr == "C") orett = -orett;
if (ndbcr == "C") nrett = -nrett;
@ -1997,14 +2014,10 @@ void Visliq_app::write_general(TMask& m)
if (compensabile)
{
const real criva(tt_ln.get(6));
// if (cr_res > ZERO)
// {
cr_res += autf24;
cr_res -= crf24;
cr_res -= criva;
// }
// if (cr_res < ZERO)
// cr_res = ZERO;
cr_res += autf24;
cr_res -= crf24;
cr_res -= criva;
if (cr_res < ZERO)
sh.set_back_and_fore_color(COLOR_LTYELLOW, COLOR_DKRED, row, 7);
else
@ -2039,23 +2052,31 @@ void Visliq_app::write_general(TMask& m)
// Rimetti a posto righe sheet se serve
if (was_lim)
{
int sr0 = (_lim->get_real("R0")).sign();
int sr5 = (_lim->get_real("R5")).sign();
real r0abs = abs(_lim->get_real("R0"));
real r5abs = abs(_lim->get_real("R5"));
tt_ln.add(r0abs.string(),1);
tt_ln.add(sr0 == 0 ? "" : (sr0 > 0 ? "D" : "C"), 2);
const real iva_ven = _lam->get_real("R0"); // IVA acquisti
const real iva_acq = _lam->get_real("R1"); // IVA vendite
const real ris = iva_ven - iva_acq;
tt_ln.add(abs(ris).string(), 1);
tt_ln.add(ris == 0 ? "" : (ris > 0 ? "D" : "C"), 2);
tt_ln.add((_lim->get_real("R1")).string(),3);
tt_ln.add(r5abs.string(),4);
int sr5 = (_lim->get_real("R5")).sign();
real r5abs = abs(_lim->get_real("R5"));
tt_ln.add(r5abs.string(),4);
tt_ln.add(sr5 == 0 ? "" : (sr5 > 0 ? "D" : "C"),5);
if ( cr_res < ZERO)
tt_ln.add("",10);
else
tt_ln.add(cr_res.string(),10);
}
tt_ln.add(cr_res.string(), 10);
real r0 = _lim->get_real("R0");
tt_ln.add(abs(r0).string(), 11);
tt_ln.add(r0 == ZERO ? "" : (r0 > ZERO ? "D" : "C"), 12);
}
_from_one = false;
} // for mese liq. (riga sheet)

180
src/cg/cg5500a.rep
View File

@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<report name="cg5500a" page_split="1" lpi="6">
<description>Stampa prospetto liquidazione</description>
<font face="Courier New" size="8" />
<font face="Courier New" size="7" />
<section type="Head" pattern="1">
<font face="Courier New" bold="1" size="8" />
<field type="Testo" width="4" pattern="2" text="Data">
<font italic="1" face="Courier New" bold="1" size="8" />
</field>
<field type="Stringa" align="center" width="175" height="2" pattern="1">
<font face="Arial" bold="1" size="14" />
<prescript description="H0.0 PRESCRIPT">"Stampa Prospetto Liquidazione "
@ -11,9 +14,6 @@
+
#THIS !</prescript>
</field>
<field type="Testo" width="4" pattern="2" text="Data">
<font italic="1" face="Courier New" bold="1" size="8" />
</field>
<field x="5" type="Data" width="11" pattern="2">
<source>#SYSTEM.DATE</source>
</field>
@ -37,52 +37,65 @@ GET_FIRM_DATA </prescript>
<prescript description="H0.0 PRESCRIPT">"!IVA"
GET_FIRM_DATA</prescript>
</field>
<field x="111.5" y="3.5" type="Testo" width="25" pattern="1" text="Credito anno precedente" />
<field border="1" y="5" type="Testo" valign="center" align="center" width="13" height="2" pattern="1" text="Mese" />
<field border="1" x="13" y="5" type="Testo" valign="center" align="center" width="22" height="2" pattern="1" text="Risultato" />
<field border="1" x="35" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="Rimborsi" />
<field border="1" x="53" y="5" type="Testo" valign="center" align="center" width="22" height="2" pattern="1" text="Rettifiche" />
<field border="1" x="75" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="Credito utilizz. IVA" />
<field border="1" x="93" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="Credito utilizz. F24 " />
<field border="1" x="111" y="5" type="Testo" valign="center" align="center" width="17" height="2" pattern="1" text="Credito autorizzato" />
<field border="1" x="128" y="5" type="Testo" valign="center" align="center" width="12" height="2" pattern="1" text="Data Autorizz." />
<field border="1" x="140" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="Credito residuo" />
<field border="1" x="158" y="5" type="Testo" valign="center" align="center" width="17" height="2" pattern="1" text="Descrizione" />
<field x="48" y="3.5" type="Valuta" hidden="1" align="right" width="18" id="108" pattern="1" text="#########,@@">
<field x="112" y="3.5" type="Testo" width="28" pattern="1" text="Credito anno precedente" />
<field border="1" x="0.5" y="5" type="Testo" valign="center" align="center" width="13" height="2" pattern="1" text="Mese" />
<field border="1" x="13.5" y="5" type="Testo" valign="center" align="center" width="19" height="2" pattern="1" text="Risultato" />
<field border="1" x="32.5" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="Rimborsi" />
<field border="1" x="50.5" y="5" type="Testo" valign="center" align="center" width="19" height="2" pattern="1" text="Rettifiche" />
<field border="1" x="69.5" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="Credito utilizz. IVA" />
<field border="1" x="87.5" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="Credito utilizz. F24 " />
<field border="1" x="105.5" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="IVA dovuta o a credito" />
<field border="1" x="123.5" y="5" type="Testo" valign="center" align="center" width="17" height="2" pattern="1" text="Credito autorizzato" />
<field border="1" x="140.5" y="5" type="Testo" valign="center" align="center" width="12" height="2" pattern="1" text="Data Autorizz." />
<field border="1" x="152.5" y="5" type="Testo" valign="center" align="center" width="18" height="2" pattern="1" text="Credito residuo" />
<field border="1" x="170.5" y="5" type="Testo" valign="center" align="center" width="25" height="2" pattern="1" text="Descrizione" />
<field x="48.5" y="3.5" type="Valuta" hidden="1" align="right" width="18" id="108" pattern="1" text="#########,@@">
<prescript description="H0.108 PRESCRIPT">"R0"
#FILTER @
"%LIA"
TABLE_READ</prescript>
</field>
<field x="78" y="3.5" type="Valuta" hidden="1" align="right" width="18" id="109" pattern="1" text="#########,@@">
<field x="78.5" y="3.5" type="Valuta" hidden="1" align="right" width="18" id="109" pattern="1" text="#########,@@">
<prescript description="H0.109 PRESCRIPT">"R15"
#FILTER @
"%LIA"
TABLE_READ</prescript>
</field>
<field x="139.5" y="3.5" type="Valuta" align="right" width="18" id="110" pattern="1" text="###.###.###,@@">
<field x="140" y="3.5" type="Valuta" align="right" width="18" id="110" pattern="1" text="###.###.###,@@">
<font face="Courier New" size="8" />
<prescript description="H0.110 PRESCRIPT">#108 @
#109 @
-
#THIS !</prescript>
</field>
<field x="160" y="3.5" type="Array" width="30" id="111" pattern="1">
<prescript description="H0.111 PRESCRIPT">"S9"
#FILTER @
"%LIA"
TABLE_READ
</prescript>
<list>
<li Value="Compensabile solo in IVA" Code=" " />
<li Value="Compensabile in F24" Code="CM" />
</list>
</field>
</section>
<section type="Head" level="1" pattern="1" />
<section type="Body" pattern="1" />
<section type="Body" level="1" pattern="1">
<field border="2" type="Linea" pattern="1" />
<field border="2" x="13" type="Linea" pattern="1" />
<field border="2" x="35" type="Linea" pattern="1" />
<field border="2" x="53" type="Linea" pattern="1" />
<field border="2" x="75" type="Linea" pattern="1" />
<field border="2" x="93" type="Linea" pattern="1" />
<field border="2" x="111" type="Linea" pattern="1" />
<field border="2" x="128" type="Linea" pattern="1" />
<field border="2" x="140" type="Linea" pattern="1" />
<field border="2" x="158" type="Linea" pattern="1" />
<field border="2" x="175" type="Linea" pattern="1" />
<field type="Array" width="13" id="109" pattern="1">
<field border="2" x="0.5" type="Linea" pattern="1" />
<field border="2" x="13.5" type="Linea" pattern="1" />
<field border="2" x="32.5" type="Linea" pattern="1" />
<field border="2" x="50.5" type="Linea" pattern="1" />
<field border="2" x="69.5" type="Linea" pattern="1" />
<field border="2" x="87.5" type="Linea" pattern="1" />
<field border="2" x="105.5" type="Linea" pattern="1" />
<field border="2" x="123.5" type="Linea" pattern="1" />
<field border="2" x="140.5" type="Linea" pattern="1" />
<field border="2" x="152.5" type="Linea" pattern="1" />
<field border="2" x="170.5" type="Linea" pattern="1" />
<field border="2" x="195.5" type="Linea" pattern="1" />
<field x="0.5" type="Array" width="13" id="109" pattern="1">
<source>CODTAB[5,7]</source>
<list>
<li Value="Gennaio" Code="01" />
@ -100,67 +113,118 @@ TABLE_READ</prescript>
<li Value="Annuale" Code="13" />
</list>
</field>
<field x="14" type="Valuta" align="right" width="18" id="110" pattern="1" text="###.###.###,@@">
<source>R0</source>
<prescript description="B1.110 PRESCRIPT">#THIS @
<field x="13.5" type="Valuta" align="right" width="18" id="110" pattern="1" text="###.###.###,@@">
<prescript description="B1.110 PRESCRIPT">"201@.R0" @
"201@.R1" @
-
#THIS !
#THIS @
0
&#3E;
IF
"D"
#201 !
ELSE
#THIS @
0 &#3C;
IF
0
#THIS @
-
#THIS !
"C"
#201 !
THEN
#201 !</prescript>
THEN</prescript>
</field>
<field x="35" type="Valuta" align="right" width="18" id="111" pattern="1" text="###.###.###,@@">
<field x="32.5" type="Valuta" align="right" width="18" id="111" pattern="1" text="###.###.###,@@">
<source>R1</source>
</field>
<field x="54" type="Valuta" align="right" width="18" id="112" pattern="1" text="###.###.###,@@">
<field x="50.5" type="Valuta" align="right" width="18" id="112" pattern="1" text="###.###.###,@@">
<source>R5</source>
<prescript description="B1.112 PRESCRIPT">#THIS @
0
&#3E;
IF
"D"
#202 !
ELSE
#THIS @
0 &#3C;
IF
0
#THIS @
-
#THIS !
"C"
#202 !
THEN
#202 !</prescript>
THEN</prescript>
</field>
<field x="75" type="Valuta" align="right" width="18" id="113" pattern="1" text="###.###.###,@@">
<field x="69.5" type="Valuta" align="right" width="18" id="113" pattern="1" text="###.###.###,@@">
<source>R15</source>
</field>
<field x="93" type="Valuta" align="right" width="18" id="114" pattern="1" text="###.###.###,@@">
<field x="87.5" type="Valuta" align="right" width="18" id="114" pattern="1" text="###.###.###,@@">
<source>R16</source>
</field>
<field x="111" type="Valuta" align="right" width="17" id="115" pattern="1" text="###.###.###,@@">
<field x="123.5" type="Valuta" align="right" width="17" id="115" pattern="1" text="###.###.###,@@">
<source>R20</source>
</field>
<field x="128" type="Data" align="center" width="12" id="116" pattern="1">
<field x="140.5" type="Data" align="center" width="12" id="116" pattern="1">
<source>D1</source>
</field>
<field x="140" type="Valuta" align="right" width="18" id="117" pattern="1" text="###.###.###,@@">
<field x="152.5" type="Valuta" align="right" width="18" id="117" pattern="1" text="###.###.###,@@">
<prescript description="B1.117 PRESCRIPT">#H0.110 @
#H0.111 @
"CM"
=
IF
#113 @ -
#114 @ -
#115 @ +
ELSE
#119 @
0
&#3C;
IF
0
#119 @
-
ELSE
0
THEN
THEN
DUP
#THIS !
#H0.110 !</prescript>
</field>
<field x="158" type="Stringa" dynamic_height="1" width="17" height="3" id="118" pattern="1">
<field x="171" type="Stringa" dynamic_height="1" width="25" height="3" id="118" pattern="1">
<source>S3</source>
</field>
<field x="33" type="Stringa" width="1" id="201" pattern="1" />
<field x="73" type="Stringa" width="1" id="202" pattern="1" />
<field x="105.5" type="Valuta" align="right" width="17" id="119" pattern="1" text="###.###.###,@@">
<source>R0</source>
<prescript description="B1.119 PRESCRIPT">#THIS @
0
&#3E;
IF
"D"
#203 !
ELSE
#THIS @
0 &#3C;
IF
0
#THIS @
-
#THIS !
"C"
#203 !
THEN
THEN</prescript>
</field>
<field x="31.5" type="Stringa" width="1" id="201" pattern="1" />
<field x="68.5" type="Stringa" width="1" id="202" pattern="1" />
<field x="122.5" type="Stringa" width="1" id="203" pattern="1" />
</section>
<section hidden_if_needed="1" type="Foot" pattern="1">
<field border="2" type="Linea" pattern="1" />
@ -178,20 +242,22 @@ DUP
</section>
<section type="Foot" level="1" pattern="1">
<font face="Courier New" bold="1" size="10" />
<field border="2" type="Linea" pattern="1" />
<field border="2" x="13" type="Linea" pattern="1" />
<field border="2" x="35" type="Linea" pattern="1" />
<field border="2" x="53" type="Linea" pattern="1" />
<field border="2" x="75" type="Linea" pattern="1" />
<field border="2" x="93" type="Linea" pattern="1" />
<field border="2" x="111" type="Linea" pattern="1" />
<field border="2" x="128" type="Linea" pattern="1" />
<field border="2" x="140" type="Linea" pattern="1" />
<field border="2" x="158" type="Linea" pattern="1" />
<field border="2" x="175" type="Linea" pattern="1" />
<field border="2" y="1" type="Linea" width="175" height="0" pattern="1" />
<field border="2" x="0.5" type="Linea" pattern="1" />
<field border="2" x="13.5" type="Linea" pattern="1" />
<field border="2" x="32.5" type="Linea" pattern="1" />
<field border="2" x="50.5" type="Linea" pattern="1" />
<field border="2" x="69.5" type="Linea" pattern="1" />
<field border="2" x="87.5" type="Linea" pattern="1" />
<field border="2" x="105.5" type="Linea" pattern="1" />
<field border="2" x="123.5" type="Linea" pattern="1" />
<field border="2" x="140.5" type="Linea" pattern="1" />
<field border="2" x="152.5" type="Linea" pattern="1" />
<field border="2" x="170.5" type="Linea" pattern="1" />
<field border="2" x="195.5" type="Linea" pattern="1" />
<field border="2" x="0.5" y="1" type="Linea" width="195" height="0" pattern="1" />
</section>
<sql>USE LIM
JOIN LAM ALIAS 201 INTO CODTAB==CODTAB
FROM CODTAB=#ANNO
TO CODTAB=#ANNO</sql>
</report>

23
src/cg/cg5500b.uml
View File

@ -73,6 +73,8 @@ BEGIN
ITEM "Credito anno in corso\nautorizzato F24@20"
ITEM "Data autorizzazione@20"
ITEM "Credito IVA\nresiduo@15"
ITEM "IVA dovuta o\na credito@15"
ITEM "D/C@3"
ITEM "Descrizione@50"
END
@ -201,9 +203,26 @@ BEGIN
GROUP 12
END
STRING 112 50 35
CURRENCY 112 15
BEGIN
PROMPT 1 10 "Descr. "
PROMPT 1 10 "IVA dovuta o credito "
FLAGS "D"
GROUP 12
END
LIST 113 1 10
BEGIN
PROMPT 57 10 ""
ITEM " | "
ITEM "D|Debito"
ITEM "C|Credito"
FLAGS "UD"
GROUP 11
END
STRING 114 50 35
BEGIN
PROMPT 1 11 "Descr. "
GROUP 12
FLAGS "D"
END

2
src/cg/cg5500d.uml
View File

@ -251,7 +251,7 @@ END
CURRENCY F_CREDAUT 15
BEGIN
PROMPT 2 22 "Credito IVA autorizzato in F24 : "
PROMPT 2 21 "Credito IVA autorizzato in F24 :"
GROUP 10
FLAGS "H"
PICTURE "."

2
src/cg/cglib02.cpp
View File

@ -700,7 +700,7 @@ bool TSaldo::saldo_cont_sep(int g, int c, long s, const int codes, TDate al,
if (ok)
{
if (mov.get(MOV_CONTSEP) == cont_sep)
if (( cont_sep != NULL && *cont_sep == '\0') || mov.get(MOV_CONTSEP) == cont_sep)
{
_codcaus = mov.get(MOV_CODCAUS);
_datareg = mov.get(MOV_DATAREG);