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

Patch level : 12.0 1134

Browse Source 
Files correlati     : cg7
Commento:
modifiche quadro VE da terminare
This commit is contained in:
smen 2022-04-08 17:02:07 +02:00
parent 89558795f8
commit 7bf78fe1c3
11 changed files with 165 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/Ba4.vcxproj
View File

@ -232,6 +232,7 @@
<ClInclude Include="..\src\ba\ba4100a.h" />
<ClInclude Include="..\src\ba\ba4200.h" />
<ClInclude Include="..\src\ba\ba4300.h" />
<ClInclude Include="..\src\ba\ba4500.h" />
<ClInclude Include="..\src\ba\ba4700a.h" />
</ItemGroup>
<ItemGroup>

3
build/Ba4.vcxproj.filters
View File

@ -82,5 +82,8 @@
<ClInclude Include="..\src\ba\ba4100a.h">
<Filter>Headers</Filter>
</ClInclude>
<ClInclude Include="..\src\ba\ba4500.h">
<Filter>Headers</Filter>
</ClInclude>
</ItemGroup>
</Project>

1
src/ba/ba4500.h
View File

@ -137,5 +137,6 @@
#define FLD_AT1_CODATTH 199
#define F_ATTPREV 200
#define F_CODATECO 201
#define CHK_ATTNONCOM 202
#endif // __BA4500_H

13
src/ba/ba4500a.uml
View File

@ -220,9 +220,16 @@ BEGIN
HELP "Indicare se l'attivita' si svolge su piu' luoghi"
END
BOOLEAN CHK_ATTNONCOM
BEGIN
PROMPT 1 15 "Attività non commerciale"
FIELD LF_ATTIV->ATTNONCOM
HELP "Indicare se l'attivita' non è di tipo commerciale (esempio ONLUS)"
END
NUMBER FLD_AT1_NSOCILDIP 3
BEGIN
PROMPT 1 15 "N.soci lavoro dipendente "
PROMPT 1 16 "N.soci lavoro dipendente "
FIELD LF_ATTIV->NSOCILDIP
FLAGS "R"
HELP "Numero di soci lavoratori dipendenti"
@ -230,7 +237,7 @@ END
NUMBER FLD_AT1_GIATTANN 3
BEGIN
PROMPT 44 15 "gg.attivita' annuali "
PROMPT 44 16 "gg.attivita' annuali "
FIELD LF_ATTIV->GIATTANN
FLAGS "R"
HELP "Numero di giorni di attivita' all'anno"
@ -239,7 +246,7 @@ END
STRING FLD_AT1_GILAVASTAG 3
BEGIN
PROMPT 1 16 "gg.lav.attivita' stagionale "
PROMPT 1 17 "gg.lav.attivita' stagionale "
FIELD LF_ATTIV->GILAVASTAG
FLAGS "R"
HELP "Numero di giorni per l'attivita' stagionale"

2
src/ba/f10.dir
View File

@ -1,3 +1,3 @@
10
1
%attiv|0|0|209|0|Attivita'|#9||
%attiv|0|0|210|0|Attivita'|||

3
src/ba/f10.trr
View File

@ -1,5 +1,5 @@
10
32
33
CODDITTA|3|5|0|
CODATT|1|5|0|
ATTPREV|8|1|0|
@ -32,5 +32,6 @@ ATTLAVDIP|8|1|0|
ART74_4|8|1|0|
TIPOATT|1|1|0|
CODATECO|1|6|0|Codice Attività ATECO 2007
ATTNONCOM|8|1|0|Attività non commerciale (esempio ONLUS)
1
CODDITTA+CODATT|

1
src/cg/cg7401.cpp
View File

@ -167,6 +167,7 @@ TISAM_recordset & TQuadro_IVA_recordset::get_recordset(const int code, const int
CHECK(set != nullptr, TR("Null report"));
set->set_var("#ANNO", format("%d", year == 0 ? _year : year));
set->set_var("#DITTA", format("%d",prefix().get_codditta()));
return *set;
}

10
src/cg/cg7600.cpp
View File

@ -7,8 +7,9 @@
#include "cg7401.h"
#include "cgpim.h"
#include "cg7400a.h"
#include <attiv.h>
#include "ivadiff.h"
#include <applicat.h>
#define REP_EXPORT 1
#define REP_INTRA 2
@ -121,6 +122,11 @@ void TQuadro_VE_recordset::load()
const bool esente = (tipo_aliquota == "ES");
const bool reverse = int_tipo_iva11_ven >= 31 && int_tipo_iva11_ven <= 38;
const bool terremotati = int_tipo_iva11_ven == 25;
TToken_string codatt;
codatt.add(prefix().get_codditta());
codatt.add(codtab.mid(4, 5));
const TRectype& attiv = cache().get(LF_ATTIV, codatt);
const bool attivita_commerciale = !attiv.get_bool(ATT_ATTNONCOM);
tiporec tipo;
real imp;
@ -136,7 +142,7 @@ void TQuadro_VE_recordset::load()
break;
case vend_norm: // vendite normali
case corr_norm:
if (atoi(aliquota) != 0)
if (attivita_commerciale && atoi(aliquota) != 0)
{
const bool agricolo = ivar.get_int("I4") != 0;

98
src/cg/cg7600n.rep
View File

@ -1,114 +1,116 @@
<?xml version="1.0" encoding="UTF-8" ?>
<report name="cg7600n" orientation="1" lpi="6">
<report libraries="" page_merge="" save_printer="" name="CG7600N" use_printer_font="" orientation="1" page_split="" lpi="6" command="" class="">
<description>fatture in split</description>
<font face="Courier New" size="10" />
<section type="Head" pattern="1">
<section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="" hidden="" page_break="" can_break="" pattern="1">
<font face="Arial" size="8" />
<field type="Stringa" width="50" pattern="1">
<field deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Ditta: " +#SYSTEM.RAGSOC</source>
</field>
<field x="50" type="Stringa" align="right" width="45" pattern="1">
<field x="50" deactivated="" type="Stringa" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="45" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Data di Stampa: " +#SYSTEM.DATE+" - Pag. "+#PAGE</source>
</field>
<field y="1" type="Stringa" align="center" width="95" pattern="1">
<field y="1" deactivated="" type="Stringa" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="95" codval="" id="" pattern="1" hide_zero="" text="">
<font face="Arial" bold="1" size="10" />
<source>"Lista Fatture emesse in Split Payment nel periodo: " +#ANNO</source>
</field>
<field y="3" type="Testo" align="right" width="7" pattern="1" text="NumReg" />
<field x="8" y="3" type="Testo" width="10" pattern="1" text="DataReg" />
<field x="18" y="3" type="Testo" width="3" pattern="1" text="Caus" />
<field x="22" y="3" type="Testo" width="3" pattern="1" text="Reg." />
<field x="25" y="3" type="Testo" align="right" width="6" pattern="1" text="Cli." />
<field x="32" y="3" type="Testo" width="35" pattern="1" text="Ragione Sociale" />
<field x="67" y="3" type="Testo" width="5" pattern="1" text="C.Iva" />
<field x="71.5" y="3" type="Testo" align="right" width="11" pattern="1" text="Imponibile" />
<field x="82.5" y="3" type="Testo" align="right" width="9" pattern="1" text="Imposta" />
<field x="92" y="3" type="Testo" align="center" width="4" pattern="1" text="Split" />
<field border="2" y="4" type="Linea" width="95" height="0" pattern="1" />
<field y="3" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="7" codval="" id="" pattern="1" hide_zero="" text="NumReg" />
<field x="8" y="3" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="1" hide_zero="" text="DataReg" />
<field x="18" y="3" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="3" codval="" id="" pattern="1" hide_zero="" text="Caus" />
<field x="22" y="3" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="3" codval="" id="" pattern="1" hide_zero="" text="Reg." />
<field x="25" y="3" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="6" codval="" id="" pattern="1" hide_zero="" text="Cli." />
<field x="32" y="3" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="35" codval="" id="" pattern="1" hide_zero="" text="Ragione Sociale" />
<field x="67" y="3" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="5" codval="" id="" pattern="1" hide_zero="" text="C.Iva" />
<field x="71.5" y="3" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="11" codval="" id="" pattern="1" hide_zero="" text="Imponibile" />
<field x="82.5" y="3" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="9" codval="" id="" pattern="1" hide_zero="" text="Imposta" />
<field x="92" y="3" deactivated="" type="Testo" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="4" codval="" id="" pattern="1" hide_zero="" text="Split" />
<field border="2" y="4" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="95" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
</section>
<section type="Head" level="1" pattern="1">
<section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="1" hidden="" page_break="" can_break="" pattern="1">
<font face="Arial" bold="1" size="8" />
<prescript description="H1 PRESCRIPT">MESSAGE RESET,F1</prescript>
</section>
<section type="Head" level="2" pattern="1">
<section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="2" hidden="" page_break="" can_break="" pattern="1">
<groupby>RMOVIVA.CODIVA</groupby>
<font face="Arial" bold="1" size="8" />
<prescript description="H2 PRESCRIPT">MESSAGE RESET,F2</prescript>
<field type="Testo" width="10" pattern="1" text="Codice Iva:" />
<field x="10" type="Stringa" width="4" id="10" pattern="1">
<field deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="1" hide_zero="" text="Codice Iva:" />
<field x="10" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="10" pattern="1" hide_zero="" text="">
<source>RMOVIVA.CODIVA</source>
</field>
<field x="15" type="Stringa" width="25" id="20" pattern="1">
<field x="15" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="25" codval="" id="20" pattern="1" hide_zero="" text="">
<prescript description="H2.20 PRESCRIPT">MESSAGE TABLEREAD,%IVA,#10,S0</prescript>
</field>
</section>
<section type="Body" pattern="1" />
<section type="Body" level="1" pattern="1">
<section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Body" level="" hidden="" page_break="" can_break="" pattern="1" />
<section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Body" level="1" hidden="" page_break="" can_break="" pattern="1">
<font face="Arial" size="8" />
<field type="Numero" align="right" link="23.NUMREG" width="7" pattern="1">
<field deactivated="" type="Numero" hidden="" align="right" link="23.NUMREG" dynamic_height="" shade_offset="" width="7" codval="" id="" pattern="1" hide_zero="" text="">
<source>RMOVIVA.NUMREG</source>
</field>
<field x="8" type="Data" width="10" pattern="1">
<field x="8" deactivated="" type="Data" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="1" hide_zero="" text="">
<source>MOV.DATAREG</source>
</field>
<field x="18" type="Stringa" width="3" pattern="1">
<field x="18" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="3" codval="" id="" pattern="1" hide_zero="" text="">
<source>MOV.CODCAUS</source>
</field>
<field x="21.5" type="Stringa" width="3" pattern="1">
<field x="21.5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="3" codval="" id="" pattern="1" hide_zero="" text="">
<source>MOV.REG</source>
</field>
<field x="25" type="Numero" align="right" link="20.CODCF" width="6" pattern="1">
<field x="25" deactivated="" type="Numero" hidden="" align="right" link="20.CODCF" dynamic_height="" shade_offset="" width="6" codval="" id="" pattern="1" hide_zero="" text="">
<source>MOV.CODCF</source>
</field>
<field x="26" type="Stringa" hidden="1" link="20.TIPOCF" width="1" pattern="1">
<field x="26" deactivated="" type="Stringa" hidden="1" link="20.TIPOCF" dynamic_height="" shade_offset="" width="1" codval="" id="" pattern="1" hide_zero="" text="">
<source>MOV.TIPO</source>
</field>
<field x="31.5" type="Stringa" width="35" pattern="1">
<field x="31.5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="35" codval="" id="" pattern="1" hide_zero="" text="">
<source>CLIFO.RAGSOC</source>
</field>
<field x="67.5" type="Stringa" width="4" pattern="1">
<field x="67.5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="" pattern="1" hide_zero="" text="">
<source>RMOVIVA.CODIVA</source>
</field>
<field x="71.5" type="Valuta" align="right" width="11" pattern="1" text="###.###.###,@@">
<field x="71.5" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="11" codval="" id="" pattern="1" hide_zero="" text="###.###.###,@@">
<source>RMOVIVA.IMPONIBILE</source>
<prescript description="B1.0 PRESCRIPT">MESSAGE ADD,F2.100</prescript>
</field>
<field x="82.5" type="Valuta" align="right" width="9" pattern="1" text="###.###.###,@@">
<field x="82.5" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="9" codval="" id="" pattern="1" hide_zero="" text="###.###.###,@@">
<source>RMOVIVA.IMPOSTA</source>
<prescript description="B1.0 PRESCRIPT">MESSAGE ADD,F2.200</prescript>
</field>
<field x="93" type="Stringa" width="1" pattern="1">
<field x="93" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="1" codval="" id="" pattern="1" hide_zero="" text="">
<source>MOV.SPLITPAY</source>
</field>
<field x="95" type="Stringa" width="1" pattern="1">
<field x="95" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="1" codval="" id="" pattern="1" hide_zero="" text="">
<source>CLIFO.SPLITPAY</source>
</field>
</section>
<section type="Foot" pattern="1" />
<section type="Foot" level="1" pattern="1">
<section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Foot" level="" hidden="" page_break="" can_break="" pattern="1" />
<section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Foot" level="1" hidden="" page_break="" can_break="" pattern="1">
<font face="Arial" bold="1" size="8" />
<field type="Testo" width="16" pattern="1" text="Totale Generale:" />
<field x="71.5" type="Valuta" align="right" width="11" id="100" pattern="1" text="###.###.###,@@" />
<field x="82.5" type="Valuta" align="right" width="9" id="200" pattern="1" text="###.###.###,@@" />
<field deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="16" codval="" id="" pattern="1" hide_zero="" text="Totale Generale:" />
<field x="71.5" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="11" codval="" id="100" pattern="1" hide_zero="" text="###.###.###,@@" />
<field x="82.5" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="9" codval="" id="200" pattern="1" hide_zero="" text="###.###.###,@@" />
</section>
<section type="Foot" level="2" height="2" pattern="1">
<section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Foot" level="2" hidden="" height="2" page_break="" can_break="" pattern="1">
<font face="Arial" bold="1" size="8" />
<field type="Testo" width="10" pattern="1" text="Totale:" />
<field x="10" type="Stringa" width="4" pattern="1">
<field deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="" pattern="1" hide_zero="" text="Totale:" />
<field x="10" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="" pattern="1" hide_zero="" text="">
<source>#H2.10</source>
</field>
<field x="15" type="Stringa" width="30" pattern="1">
<field x="15" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="30" codval="" id="" pattern="1" hide_zero="" text="">
<source>#H2.20</source>
</field>
<field x="71.5" type="Valuta" align="right" width="11" id="100" pattern="1" text="###.###.###,@@">
<field x="71.5" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="11" codval="" id="100" pattern="1" hide_zero="" text="###.###.###,@@">
<prescript description="F2.100 PRESCRIPT">MESSAGE ADD,F1.100</prescript>
</field>
<field x="82.5" type="Valuta" align="right" width="9" id="200" pattern="1" text="###.###.###,@@">
<field x="82.5" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="9" codval="" id="200" pattern="1" hide_zero="" text="###.###.###,@@">
<prescript description="F2.200 PRESCRIPT">MESSAGE ADD,F1.200</prescript>
</field>
</section>
<sql>USE RMOVIVA SELECT ((MOV.SPLITPAY="S")||((MOV.SPLITPAY="")&#26;&#26;(20.SPLITPAY="X")))&#26;&#26;(MOV.ANNOIVA=#ANNO)
<sql>USE RMOVIVA SELECT ((MOV.SPLITPAY="S")||((MOV.SPLITPAY="")&#26;&#26;(20.SPLITPAY="X")))&#26;&#26;(MOV.ANNOIVA=#ANNO)&#26;&#26;(ATTIV.ATTNONCOM!="X")
BY RMOVIVA.CODIVA 23.DATAREG
JOIN MOV INTO NUMREG==NUMREG
JOIN CLIFO TO MOV INTO TIPOCF==TIPO CODCF==CODCF</sql>
JOIN CLIFO TO MOV INTO TIPOCF==TIPO CODCF==CODCF
JOIN REG TO MOV INTO CODTAB==ANNOIVA+REG
JOIN ATTIV TO REG INTO CODDITTA==#DITTA CODATT==S8</sql>
</report>

6
src/cg/cg7600o.rep
View File

@ -79,8 +79,10 @@
<field x="71.5" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="11" codval="" id="100" pattern="1" hide_zero="" text="###.###.###,@@" />
<field x="82.5" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="9" codval="" id="200" pattern="1" hide_zero="" text="###.###.###,@@" />
</section>
<sql>USE RMOVIVA SELECT (MOV.ANNOIVA=#ANNO)&#26;&#26;(26.SOLOIVA=="X")&#26;&#26;(26.REGSPIVA!="")
<sql>USE RMOVIVA SELECT (MOV.ANNOIVA=#ANNO)&#26;&#26;(26.SOLOIVA=="X")&#26;&#26;(26.REGSPIVA!="")&#26;&#26;(ATTIV.ATTNONCOM!="X")
JOIN MOV INTO NUMREG==NUMREG
JOIN 26 TO MOV INTO CODCAUS==CODCAUS
JOIN CLIFO TO MOV INTO TIPOCF==TIPO CODCF==CODCF</sql>
JOIN CLIFO TO MOV INTO TIPOCF==TIPO CODCF==CODCF
JOIN REG TO MOV INTO CODTAB==ANNOIVA+REG
JOIN ATTIV TO REG INTO CODDITTA==#DITTA CODATT==S8</sql>
</report>

1
src/include/attiv.h
View File

@ -33,6 +33,7 @@
#define ATT_ART74_4 "ART74_4"
#define ATT_TIPOATT "TIPOATT"
#define ATT_CODATECO "CODATECO"
#define ATT_ATTNONCOM "ATTNONCOM"
#endif