Patch level : 12.0 no-patch

Files correlati     : 
Commento            : 
- Aggiunta data registrazione sullo sheet.
- Aggiunta possibilità di includere tutti i documenti inviati

git-svn-id: svn://10.65.10.50/branches/R_10_00@23731 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
mtollari 2017-04-11 13:03:03 +00:00
parent 3de31a3aff
commit af5e8a78fa
3 changed files with 67 additions and 51 deletions

View File

@ -71,6 +71,7 @@ bool TEsportaIva_msk::on_field_event(TOperable_field& o, TField_event e, long jo
{ {
set(B_PRTAPE, "X"); set(B_PRTAPE, "X");
set(B_PRTCHIU, "X"); set(B_PRTCHIU, "X");
set(B_SOLNONINV, "X");
} }
break; break;
case DLG_RECALC: case DLG_RECALC:
@ -149,7 +150,12 @@ TISAM_recordset TEsportaIva_msk::createRecset() const
query << "BETWEEN(23.DATADOC,#DADATAFATT,#ADATAFATT)&&"; query << "BETWEEN(23.DATADOC,#DADATAFATT,#ADATAFATT)&&";
} }
query << "(23.INVIVA!=\"X\")&&(23.TIPO=\"F\")"; if(get_bool(B_SOLNONINV))
{
query << "(23.INVIVA!=\"X\")&&";
}
query << "(23.TIPO=\"F\")";
if(get_bool(B_FORNITORE)) if(get_bool(B_FORNITORE))
{ {
@ -283,7 +289,8 @@ void TEsportaIva_msk::fill()
const TRectype& rmovana = movana.body()[i]; const TRectype& rmovana = movana.body()[i];
const TString80 codcms = rmovana.get("CODCMS"); const TString80 codcms = rmovana.get("CODCMS");
row.add(codcms, 0); row.add(rmoviva.get("23.DATAREG").as_string(), 0);
row.add(codcms);
row.add(rmoviva.get("23.CODCF").as_string()); row.add(rmoviva.get("23.CODCF").as_string());
row.add(rmoviva.get("20.RAGSOC").as_string()); row.add(rmoviva.get("20.RAGSOC").as_string());
char sez = rmovana.get_char("SEZIONE"); char sez = rmovana.get_char("SEZIONE");
@ -317,7 +324,8 @@ void TEsportaIva_msk::fill()
if (codcms.full()) if (codcms.full())
{ {
TToken_string row; TToken_string row;
row.add(codcms, 0); row.add(rmoviva.get("23.DATAREG").as_string(), 0);
row.add(codcms);
row.add(rmoviva.get("23.CODCF").as_string()); row.add(rmoviva.get("23.CODCF").as_string());
row.add(rmoviva.get("20.RAGSOC").as_string()); row.add(rmoviva.get("20.RAGSOC").as_string());
row.add(rmoviva.get(RMI_IMPONIBILE).as_real()); row.add(rmoviva.get(RMI_IMPONIBILE).as_real());
@ -336,7 +344,8 @@ void TEsportaIva_msk::fill()
if (rmoviva.get("CODCMS").as_string().blank()) if (rmoviva.get("CODCMS").as_string().blank())
{ {
TToken_string row; TToken_string row;
row.add("", 0); row.add(rmoviva.get("23.DATAREG").as_string(), 0);
row.add("");
row.add(rmoviva.get("23.CODCF").as_string()); row.add(rmoviva.get("23.CODCF").as_string());
row.add(rmoviva.get("20.RAGSOC").as_string()); row.add(rmoviva.get("20.RAGSOC").as_string());
row.add(rmoviva.get(RMI_IMPONIBILE).as_real()); row.add(rmoviva.get(RMI_IMPONIBILE).as_real());
@ -487,14 +496,15 @@ void TEsportaIva_app::esporta_righe_iva(const TEsportaIva_msk& m) const
const TRectype& rmovana = movana.body()[i]; const TRectype& rmovana = movana.body()[i];
const TString80 codcms = rmovana.get("CODCMS"); const TString80 codcms = rmovana.get("CODCMS");
csv.set(0, codcms); csv.set(0, rmoviva.get("23.DATAREG").as_string());
csv.set(1, rmoviva.get("23.CODCF")); csv.set(1, codcms);
csv.set(2, rmoviva.get("20.RAGSOC")); csv.set(2, rmoviva.get("23.CODCF"));
csv.set(3, rmoviva.get("20.RAGSOC"));
char sez = rmovana.get_char("SEZIONE"); char sez = rmovana.get_char("SEZIONE");
TImporto importo(sez, rmovana.get_real("IMPORTO")); TImporto importo(sez, rmovana.get_real("IMPORTO"));
importo.normalize('D'); importo.normalize('D');
csv.set(3, importo.valore()); csv.set(4, importo.valore());
csv.set(4, rmoviva.get("23.RITFIS").as_real()); csv.set(5, rmoviva.get("23.RITFIS").as_real());
csv.set(6, rmoviva.get("23.DATADOC")); csv.set(6, rmoviva.get("23.DATADOC"));
csv.set(7, rmoviva.get("23.NUMDOC")); csv.set(7, rmoviva.get("23.NUMDOC"));
csv.set(8, last_data_pag); csv.set(8, last_data_pag);
@ -520,11 +530,12 @@ void TEsportaIva_app::esporta_righe_iva(const TEsportaIva_msk& m) const
if (codcms.full()) if (codcms.full())
{ {
csv.new_rec(""); csv.new_rec("");
csv.set(0, codcms); csv.set(0, rmoviva.get("23.DATAREG").as_string());
csv.set(1, rmoviva.get("23.CODCF")); csv.set(1, codcms);
csv.set(2, rmoviva.get("20.RAGSOC")); csv.set(2, rmoviva.get("23.CODCF"));
csv.set(3, rmoviva.get(RMI_IMPONIBILE).as_real()); csv.set(3, rmoviva.get("20.RAGSOC"));
csv.set(4, rmoviva.get("23.RITFIS").as_real()); csv.set(4, rmoviva.get(RMI_IMPONIBILE).as_real());
csv.set(5, rmoviva.get("23.RITFIS").as_real());
csv.set(6, rmoviva.get("23.DATADOC")); csv.set(6, rmoviva.get("23.DATADOC"));
csv.set(7, rmoviva.get("23.NUMDOC")); csv.set(7, rmoviva.get("23.NUMDOC"));
csv.set(8, last_data_pag); csv.set(8, last_data_pag);
@ -538,11 +549,12 @@ void TEsportaIva_app::esporta_righe_iva(const TEsportaIva_msk& m) const
if (rmoviva.get("CODCMS").as_string().blank()) if (rmoviva.get("CODCMS").as_string().blank())
{ {
csv.new_rec(""); csv.new_rec("");
csv.set(0, ""); csv.set(0, rmoviva.get("23.DATAREG").as_string());
csv.set(1, rmoviva.get("23.CODCF")); csv.set(1, "");
csv.set(2, rmoviva.get("20.RAGSOC")); csv.set(2, rmoviva.get("23.CODCF"));
csv.set(3, rmoviva.get(RMI_IMPONIBILE).as_real()); csv.set(3, rmoviva.get("20.RAGSOC"));
csv.set(4, rmoviva.get("23.RITFIS").as_real()); csv.set(4, rmoviva.get(RMI_IMPONIBILE).as_real());
csv.set(5, rmoviva.get("23.RITFIS").as_real());
csv.set(6, rmoviva.get("23.DATADOC")); csv.set(6, rmoviva.get("23.DATADOC"));
csv.set(7, rmoviva.get("23.NUMDOC")); csv.set(7, rmoviva.get("23.NUMDOC"));
csv.set(8, last_data_pag); csv.set(8, last_data_pag);

View File

@ -1,15 +1,16 @@
//campi maschera ps0713800a //campi maschera ps0713800a
#define A_IDLAVORO 101 #define A_DATAREG 101
#define A_CODF 102 #define A_IDLAVORO 102
#define A_RAGSOC 103 #define A_CODF 103
#define A_IMPORTO 104 #define A_RAGSOC 104
#define A_RITFIS 105 #define A_IMPORTO 105
#define A_DATADOC 106 #define A_RITFIS 106
#define A_NUMDOC 107 #define A_DATADOC 107
#define A_DATAPAG 108 #define A_NUMDOC 108
#define A_GRUPPO 109 #define A_DATAPAG 109
#define A_CONTO 110 #define A_GRUPPO 110
#define A_SOTTOCONTO 111 #define A_CONTO 111
#define A_SOTTOCONTO 112
#define F_PATH 201 #define F_PATH 201
#define F_NAME 202 #define F_NAME 202
@ -24,5 +25,6 @@
#define B_PRTAPE 211 #define B_PRTAPE 211
#define B_PRTCHIU 212 #define B_PRTCHIU 212
#define B_SOLRITFIS 213 #define B_SOLRITFIS 213
#define B_SOLNONINV 214
#define S_RESULT 301 #define S_RESULT 301

View File

@ -122,6 +122,12 @@ BEGIN
PROMPT 40 5 "Solo Ritenute Fiscali" PROMPT 40 5 "Solo Ritenute Fiscali"
END END
BOOLEAN B_SOLNONINV
BEGIN
PROMPT 70 5 "Solo doc. non inviati"
END
RADIOBUTTON F_JOB 15 RADIOBUTTON F_JOB 15
BEGIN BEGIN
PROMPT 70 2 "ID lavoro" PROMPT 70 2 "ID lavoro"
@ -133,6 +139,7 @@ END
SPREADSHEET S_RESULT SPREADSHEET S_RESULT
BEGIN BEGIN
PROMPT 0 6 "" PROMPT 0 6 ""
ITEM "Data\nRegistrazione@10"
ITEM "ID Lavoro@10" ITEM "ID Lavoro@10"
ITEM "Cod.\nFornitore@8" ITEM "Cod.\nFornitore@8"
ITEM "Rag. Soc.@30" ITEM "Rag. Soc.@30"
@ -152,81 +159,76 @@ ENDMASK
PAGE "Riga" -1 -1 69 10 PAGE "Riga" -1 -1 69 10
DATE A_DATAREG
BEGIN
PROMPT 1 0 "Data registrazione"
FLAGS "D"
END
NUMBER A_IDLAVORO 7 NUMBER A_IDLAVORO 7
BEGIN BEGIN
PROMPT 1 0 "N.Movimento" PROMPT 1 0 "N.Movimento"
FLAGS "D" FLAGS "D"
FIELD PROGR
END END
STRING A_CODF 6 STRING A_CODF 6
BEGIN BEGIN
PROMPT 1 0 "Codice Fornitore" PROMPT 1 0 "Codice Fornitore"
FLAGS "D" FLAGS "D"
FIELD PROGR
END END
STRING A_RAGSOC 50 STRING A_RAGSOC 50
BEGIN BEGIN
PROMPT 1 0 "Rag.Soc." PROMPT 1 0 "Rag.Soc."
FLAGS "D" FLAGS "D"
FIELD PROGR
END END
NUMBER A_IMPORTO 18 3 NUMBER A_IMPORTO 18 3
BEGIN BEGIN
PROMPT 1 0 "Importo" PROMPT 1 0 "Importo"
FLAGS "D" FLAGS "D"
FIELD PROGR
END END
NUMBER A_RITFIS 18 3 NUMBER A_RITFIS 18 3
BEGIN BEGIN
PROMPT 1 0 "Ritenute Fiscali" PROMPT 1 0 "Ritenute Fiscali"
FLAGS "D" FLAGS "D"
FIELD PROGR
END END
DATE A_DATADOC DATE A_DATADOC
BEGIN BEGIN
PROMPT 1 0 "Data Documento" PROMPT 1 0 "Data Documento"
FLAGS "D" FLAGS "D"
FIELD PROGR
END END
STING A_NUMDOC 7 STING A_NUMDOC 7
BEGIN BEGIN
PROMPT 1 0 "Numero Documento" PROMPT 1 0 "Numero Documento"
FLAGS "D" FLAGS "D"
FIELD PROGR
END END
DATE A_DATAPAG DATE A_DATAPAG
BEGIN BEGIN
PROMPT 1 0 "Data pagamento documento" PROMPT 1 0 "Data pagamento documento"
FLAGS "D" FLAGS "D"
FIELD PROGR
END END
NUMBER A_GRUPPO 3 NUMBER A_GRUPPO 3
BEGIN BEGIN
PROMPT 1 0 "Gruppo" PROMPT 1 0 "Gruppo"
FLAGS "D" FLAGS "D"
FIELD PROGR
END END
NUMBER A_CONTO 3 NUMBER A_CONTO 3
BEGIN BEGIN
PROMPT 1 0 "Conto" PROMPT 1 0 "Conto"
FLAGS "D" FLAGS "D"
FIELD PROGR
END END
NUMBER A_SOTTOCONTO 6 NUMBER A_SOTTOCONTO 6
BEGIN BEGIN
PROMPT 1 0 "Sottoconto" PROMPT 1 0 "Sottoconto"
FLAGS "D" FLAGS "D"
FIELD PROGR
END END
ENDPAGE ENDPAGE