Patch level : 12.0 1130

Files correlati     : cg, fp
Commento:
Modifica maschera e funzionamento del programma di invio integrazioni
This commit is contained in:
smen 2022-03-29 17:54:56 +02:00
parent d8d564f4d3
commit 3c8a2943e9
7 changed files with 109 additions and 91 deletions

View File

@ -181,7 +181,7 @@ BEGIN
ITEM "TD17|TD17 Integ./autof. acq. servizi estero"
ITEM "TD18|TD18 Integ. acq. beni intracomunitari"
ITEM "TD19|TD19 Integ./autof. acq. beni ex art. 17"
ITEM "TDCOD0|TD20 Autofattura"
ITEM "TD20|TD20 Autofattura"
END
BOOLEAN F_SOLAIVA

View File

@ -340,6 +340,7 @@ public:
tipo_movimento tipomov() const;
const TString& tipodoc() const;
const TString& tipodocsdi() const;
bool saldaconto(const TDate& datareg) const;
int link_m770() const;
char link_cespiti() const;

View File

@ -245,6 +245,11 @@ const TString& TCausale::tipodoc() const
return _rec.get(CAU_TIPODOC);
}
const TString& TCausale::tipodocsdi() const
{
return _rec.get(CAU_TIPODOCSDI);
}
bool TCausale::saldaconto(const TDate& datareg) const
{
bool yes = tipomov() > 0;

View File

@ -39,7 +39,9 @@ protected:
void init();
void force_reload_sheet();
void load_all_fields();
void load_sheet(const TString& tipo_sel);
bool _filter_changed;
bool _enable_chiave_fixer;
@ -91,7 +93,13 @@ void TPAR_mask::load_all_fields()
{
set(F_DATAINI, ini_get_string(CONFIG_DITTA, "fp", "dataini"));
set(F_DATAEND, ini_get_string(CONFIG_DITTA, "fp", "dataend"));
set(F_TIPO_SDI, ini_get_string(CONFIG_DITTA, "fp", "TIPO_SDI"));
const TString& tipo_sel = get(F_TIPO_SDI);
load_sheet(tipo_sel);
}
void TPAR_mask::load_sheet(const TString& tipo_sel)
{
TSheet_field& scaus = sfield(F_CAUSALI_TIPO);
TCursor cur(new TRelation(LF_CAUSALI));
@ -104,32 +112,18 @@ void TPAR_mask::load_all_fields()
const TRectype& rec = cur.curr();
const TString& tipodocsdi = rec.get(CAU_TIPODOCSDI);
if (tipodocsdi == "TD16" || tipodocsdi == "TD17" || tipodocsdi == "TD18" || tipodocsdi == "TD19" || tipodocsdi == "TD20")
if ((tipo_sel == "T" && tipodocsdi.full()) || tipodocsdi == tipo_sel)
{
int r = scaus.set_row_cell(S_TIPO_SDI, tipodocsdi);
scaus.set_row_cell(S_COD_CAUS, rec.get(CAU_CODCAUS), r);
scaus.set_row_cell(S_DESCR, rec.get(CAU_DESCR), r);
}
}
scaus.force_update();
if (scaus.items() == 0)
warning_box(TR("Attenzione non c'e' nessuna causale di regolarizzazione"));
for (int i = 0;; i++)
{
TString16 caus = ini_get_string(CONFIG_DITTA, "fp", "CAUSALE", "", i);
if (caus.full())
{
int r = scaus.set_row_cell(S_COD_CAUS, caus);
scaus.set_row_cell(S_DESCR, cache().get(LF_CAUSALI, caus, CAU_DESCR), r);
}
else
break;
}
scaus.force_update();
set(F_TIPO_SDI, ini_get_string(CONFIG_DITTA, "fp", "TIPO_SDI"));
}
@ -156,8 +150,6 @@ void TPAR_mask::fill()
enable(DLG_FINDREC, filter_selected == "D");
enable(DLG_KEY, _enable_chiave_fixer && filter_selected.empty());
regs.enable_column(S_ONLYGEN, diagn); // che regola si usa ??
/*
VECCHIA QUERY
@ -223,11 +215,12 @@ void TPAR_mask::fill()
regs.set_row_cell(S_ANNO, rec.get_int(MOV_ANNOES), r);
regs.set_row_cell(S_NUMREG, rec.get_string(MOV_NUMREG), r);
regs.set_row_cell(S_DATAREG, rec.get_date(MOV_DATAREG), r);
const TCausale& caus = cached_causale(rec.get_string(MOV_CODCAUS), rec.get_int(MOV_ANNOES));
regs.set_row_cell(S_TIPODOC, caus.tipodocsdi(), r);
regs.set_row_cell(S_NUMDOC, rec.get_string(MOV_NUMDOC), r);
regs.set_row_cell(S_DATADOC, rec.get_date(MOV_DATADOC), r);
regs.set_row_cell(S_CLIENTE, rec.get_long(MOV_CODCF), r);
regs.set_row_cell(S_RAGSOC, cli.get(CLI_RAGSOC), r);
regs.set_row_cell(S_TIPODOC, rec.get_string(MOV_TIPODOC), r);
// non c'è ? TString cod_ind_sped = rec.get(DOC_CODINDSP).as_string();
TString rif = get_dest_sdi(rec.get_string(MOV_TIPO)[0], rec.get_long(MOV_CODCF), EMPTY_STRING);
@ -260,8 +253,6 @@ void TPAR_mask::fill()
split = is_split_payment(mov);
}
}
if (diagn)
regs.set_row_cell(S_ONLYGEN, false, r);
}
regs.force_update();
@ -544,6 +535,10 @@ bool TPAR_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
if (e == se_query_add || e == se_query_del)
return false;
break;
case F_TIPO_SDI:
if (e == fe_modify)
load_sheet(o.get());
break;
case DLG_OK:
if (e == fe_button)
export_paf();

View File

@ -21,12 +21,11 @@
#define S_ANNO 102
#define S_NUMREG 103
#define S_DATAREG 104
#define S_NUMDOC 105
#define S_DATADOC 106
#define S_CLIENTE 107
#define S_RAGSOC 108
#define S_UFFICIO 109
#define S_RIFAMM 110
#define S_COFI 111
#define S_ONLYGEN 112
#define S_TIPODOC 113
#define S_TIPODOC 105
#define S_NUMDOC 106
#define S_DATADOC 107
#define S_CLIENTE 108
#define S_RAGSOC 109
#define S_UFFICIO 110
#define S_RIFAMM 111
#define S_COFI 112

View File

@ -2,87 +2,98 @@
<report libraries="" page_merge="" save_printer="" name="fp0700a" use_printer_font="" orientation="" page_split="" lpi="6" command="" class="">
<font face="Arial" size="8" />
<section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="" hidden="" page_break="" can_break="" pattern="1">
<field x="3" y="1" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="20" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Fattura fornitore n. " + 100@.NUMREG</source>
<field x="3" y="1" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="25" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Registrazione fornitore n. " + 100@.NUMREG</source>
</field>
<field x="25" y="1" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
<field x="29" y="1" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
<source>"del " + 100@.DATAREG</source>
</field>
<field x="60" y="1" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="1" codval="" id="" pattern="1" hide_zero="" text="">
<source>100@.TIPO</source>
</field>
<field x="62" y="1" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="6" codval="" id="" pattern="1" hide_zero="" text="">
<source>100@.CODCF</source>
<field x="60" y="1" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="30" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Codice fornitore: " + 100@.TIPO + 100@.CODCF</source>
</field>
<field x="3" y="2" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="25" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Integrazione n. " + 23.NUMREG</source>
<source>"Registrazione cliente n. " + 23.NUMREG</source>
</field>
<field x="25" y="2" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
<field x="29" y="2" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
<source>"del " + 23.DATAREG</source>
</field>
<field x="60" y="3" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="" pattern="1" hide_zero="" text="">
<source>20.RAGSOC</source>
<field x="60" y="3" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="30" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Partita IVA " + 20.STATOPAIV + 20.PAIV</source>
</field>
<field x="3" y="4" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="20" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Data Ricezione " + 100@.DATAREG</source>
</field>
<field x="60" y="4" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="" pattern="1" hide_zero="" text="">
<source>20.INDCF + " n. " + 20.CIVCF</source>
<source>20.RAGSOC</source>
</field>
<field x="3" y="5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="20" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Tipo Documento " + #TIPODOCSDI</source>
<source>"Tipo Documento " + CAUS.TIPODOCSDI</source>
<alt_source>#TIPODOCSDI</alt_source>
</field>
<field x="60" y="5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="5" codval="" id="" pattern="1" hide_zero="" text="">
<field x="60" y="5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="50" codval="" id="" pattern="1" hide_zero="" text="">
<source>20.INDCF + " n. " + 20.CIVCF</source>
</field>
<field x="60" y="6" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="5" codval="" id="" pattern="1" hide_zero="" text="">
<source>20.CAPCF</source>
</field>
<field x="67" y="5" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="40" codval="" id="" pattern="1" hide_zero="" text="">
<field x="67" y="6" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="40" codval="" id="" pattern="1" hide_zero="" text="">
<source>13.DENCOM + " " + 13.PROVCOM</source>
</field>
<field x="3" y="7" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="16" codval="" id="" pattern="1" hide_zero="" text="Totale Documento" />
<field x="16.5" y="7" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="16" codval="" id="" pattern="1" hide_zero="1" text="###.###.###,@@">
<source>23.TOTDOC</source>
<field x="3" y="8" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="25" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Protocollo IVA debito n. " + 23.PROTIVA</source>
</field>
<field x="60" y="7" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="30" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Partita IVA " + 20.STATOPAIV + 20.PAIV</source>
</field>
<field x="3" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="20" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Protocollo Debito " + 23.PROTIVA</source>
</field>
<field x="25" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
<field x="28" y="8" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
<source>"del " + 23.DATAREG</source>
</field>
<field x="60" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="" pattern="1" hide_zero="" text="">
<source>23.REG</source>
<field x="43" y="8" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Registro " + 23.REG</source>
</field>
<field x="3" y="10" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="20" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Protocollo Credito " + 100@.PROTIVA</source>
<field x="60" y="8" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="26" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Documento fornitore n. " + 23.NUMDOC </source>
</field>
<field x="25" y="10" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
<field x="86" y="8" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
<source>"del " + 23.DATADOC</source>
</field>
<field x="3" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="25" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Protocollo IVA credito n. " + 100@.PROTIVA</source>
</field>
<field x="28" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
<source>"del " + 100@.DATAREG</source>
</field>
<field x="60" y="10" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="" pattern="1" hide_zero="" text="">
<source>100@.REG</source>
<field x="43" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Registro " +100@.REG</source>
</field>
<field x="17" y="13" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="Totale">
<field x="60" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="26" codval="" id="" pattern="1" hide_zero="" text="">
<source>"Documento cliente n. " + 100@.NUMDOC </source>
</field>
<field x="86" y="9" deactivated="" type="Stringa" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="">
<source>"del " + 100@.DATADOC</source>
</field>
<field x="3" y="11" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="16" codval="" id="" pattern="1" hide_zero="" text="Totale Documento">
<font face="Arial" bold="1" size="8" />
</field>
<field x="33" y="13" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="Imponibile">
<field x="16" y="11" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="16" codval="" id="" pattern="1" hide_zero="1" text="###.###.###,@@">
<source>23.TOTDOC</source>
</field>
<field x="17" y="14" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="Totale">
<font face="Arial" bold="1" size="8" />
</field>
<field x="49" y="13" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="Imposta">
<field x="33" y="14" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="Imponibile">
<font face="Arial" bold="1" size="8" />
</field>
<field x="68" y="13" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="" pattern="1" hide_zero="" text="Cod.">
<field x="49" y="14" deactivated="" type="Testo" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="Imposta">
<font face="Arial" bold="1" size="8" />
</field>
<field x="73" y="13" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="" pattern="1" hide_zero="" text="Nat.">
<field x="68" y="14" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="" pattern="1" hide_zero="" text="Cod.">
<font face="Arial" bold="1" size="8" />
</field>
<field x="79.5" y="13" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="Conto">
<field x="73" y="14" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="4" codval="" id="" pattern="1" hide_zero="" text="Nat.">
<font face="Arial" bold="1" size="8" />
</field>
<field border="2" y="14" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="125" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
<field x="79" y="14" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="" pattern="1" hide_zero="" text="Conto">
<font face="Arial" bold="1" size="8" />
</field>
<field border="2" y="15" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="125" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
</section>
<section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="1" hidden="" height="4" page_break="" can_break="" pattern="1">
<field x="12" deactivated="" type="Testo" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="90" codval="" height="2" id="" pattern="1" hide_zero="" text="PROSPETTO INTEGRAZIONE ACQUISTO CEE">
@ -142,6 +153,7 @@ JOIN CLIFO TO 100@ INTO TIPOCF==TIPO CODCF==CODCF
JOIN COMUNI TO CLIFO INTO STATO==STATOCF COM==COMCF
JOIN PCON INTO GRUPPO==GRUPPO CONTO==CONTO SOTTOCONTO==SOTTOCONTO
JOIN %IVA ALIAS 201 INTO CODTAB==CODIVA
JOIN CAUS TO MOV INTO CODCAUS==CODCAUS
FROM NUMREG=#NUM
TO NUMREG=#NUM</sql>
</report>

View File

@ -81,7 +81,7 @@ BEGIN
END
SPREADSHEET F_CAUSALI_TIPO 80 5
SPREADSHEET F_CAUSALI_TIPO 80 11
BEGIN
PROMPT 1 7 ""
ITEM "Tipo documento SDI"
@ -91,7 +91,8 @@ END
LIST F_TIPO_SDI 40
BEGIN
PROMPT 1 13 "@bDocumento SDI da generare"
PROMPT 1 19 "@bDocumento SDI da generare"
ITEM "T|Tutti"
ITEM "TD16|TD16 Integraz. fatt. rev.ch. interno"
ITEM "TD17|TD17 Integ./autof. acq. servizi estero"
ITEM "TD18|TD18 Integ. acq. beni intracomunitari"
@ -99,15 +100,15 @@ BEGIN
ITEM "TD20|TD20 Autofattura"
END
GROUPBOX DLG_NULL 80 4
GROUPBOX DLG_NULL 80 3
BEGIN
PROMPT 1 14 "@bConfigurazione"
PROMPT 1 20 "@bConfigurazione"
GROUP 1
END
BOOLEAN F_DIAGN
BEGIN
PROMPT 2 15 "Esporta in stato diagnosticato"
PROMPT 2 21 "Esporta in stato diagnosticato"
END
STRING DLG_PROFILE 50
@ -126,6 +127,7 @@ BEGIN
ITEM "Anno"
ITEM "Num.\nReg.@7"
ITEM "Data\nReg.@10"
ITEM "Tipo SDI@4"
ITEM "Num.\nDoc.@7"
ITEM "Data\nDoc.@10"
ITEM "Cliente"
@ -133,7 +135,6 @@ BEGIN
ITEM "Codice destinatario@20"
ITEM "Riferimento\nAmministrazione@20"
ITEM "Codice Fiscale@16"
ITEM "Solo generazione"
END
ENDPAGE
@ -152,7 +153,7 @@ BEGIN
ITEM "TD17|TD17 Integ./autof. acq. servizi estero"
ITEM "TD18|TD18 Integ. acq. beni intracomunitari"
ITEM "TD19|TD19 Integ./autof. acq. beni ex art. 17"
ITEM "TDCOD0|TD20 Autofattura"
ITEM "TD20|TD20 Autofattura"
END
STRING S_COD_CAUS 3
@ -220,51 +221,56 @@ BEGIN
FLAGS "D"
END
LIST S_TIPODOC 40
BEGIN
PROMPT 2 3 "Tipo documento SDI "
FLAGS "D"
ITEM "TD16|TD16 Integraz. fatt. rev.ch. interno"
ITEM "TD17|TD17 Integ./autof. acq. servizi estero"
ITEM "TD18|TD18 Integ. acq. beni intracomunitari"
ITEM "TD19|TD19 Integ./autof. acq. beni ex art. 17"
ITEM "TD20|TD20 Autofattura"
END
STRING S_NUMDOC 7
BEGIN
PROMPT 21 2 "Numero Doc. "
PROMPT 21 4 "Numero Doc. "
FLAGS "D"
END
DATE S_DATADOC
BEGIN
PROMPT 50 3 "Data Doc."
PROMPT 50 4 "Data Doc."
FLAGS "D"
END
NUMBER S_CLIENTE 6
BEGIN
PROMPT 1 4 "Cliente "
PROMPT 1 5 "Cliente "
FLAGS "D"
END
STRING S_RAGSOC 50
BEGIN
PROMPT 21 4 ""
PROMPT 21 5 ""
FLAGS "D"
END
STRING S_UFFICIO 50 20
BEGIN
PROMPT 1 5 ""
PROMPT 1 6 ""
FLAGS "D"
END
STRING S_RIFAMM 20
BEGIN
PROMPT 21 5 ""
PROMPT 21 6 ""
FLAGS "D"
END
STRING S_COFI 20
BEGIN
PROMPT 1 6 ""
FLAGS "D"
END
BOOLEAN S_ONLYGEN
BEGIN
PROMPT 20 8 "Solo generazione"
PROMPT 1 7 ""
FLAGS "D"
END