diff --git a/build/770.vcxproj b/build/770.vcxproj index f68783b1b..ab315e391 100644 --- a/build/770.vcxproj +++ b/build/770.vcxproj @@ -51,6 +51,9 @@ false false + + true + _DEBUG;%(PreprocessorDefinitions) @@ -90,6 +93,7 @@ MachineX86 false + 12.0 true diff --git a/build/770.vcxproj.filters b/build/770.vcxproj.filters index 16c0e95c2..182fdff88 100644 --- a/build/770.vcxproj.filters +++ b/build/770.vcxproj.filters @@ -387,6 +387,9 @@ Headers + + Headers + diff --git a/build/771mod.vcxproj b/build/771mod.vcxproj index 1e0554cc6..833accea1 100644 --- a/build/771mod.vcxproj +++ b/build/771mod.vcxproj @@ -46,7 +46,7 @@ false ..\exe\ ..\obj\$(SolutionName)\$(ProjectName)\ - false + true false false false diff --git a/build/772mod.vcxproj b/build/772mod.vcxproj index 5e12556c1..e7902016f 100644 --- a/build/772mod.vcxproj +++ b/build/772mod.vcxproj @@ -46,7 +46,7 @@ false ..\exe\ ..\obj\$(SolutionName)\$(ProjectName)\ - false + true false false false diff --git a/build/773mod.vcxproj b/build/773mod.vcxproj index 03e172d65..6b2e12df2 100644 --- a/build/773mod.vcxproj +++ b/build/773mod.vcxproj @@ -43,7 +43,7 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ ..\obj\$(SolutionName)\$(ProjectName)\ - false + true ..\exe\ ..\obj\$(SolutionName)\$(ProjectName)\ false diff --git a/build/774.vcxproj b/build/774.vcxproj index 708143edb..16d974220 100644 --- a/build/774.vcxproj +++ b/build/774.vcxproj @@ -42,7 +42,7 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ - false + true ..\exe\ ..\obj\$(SolutionName)\$(ProjectName)\ false diff --git a/build/775.vcxproj b/build/775.vcxproj index 9c8dd9581..30b047aa2 100644 --- a/build/775.vcxproj +++ b/build/775.vcxproj @@ -46,7 +46,7 @@ false ..\exe\ ..\obj\$(SolutionName)\$(ProjectName)\ - false + true false false false diff --git a/build/777.vcxproj b/build/777.vcxproj index 17f112f41..fef9c0510 100644 --- a/build/777.vcxproj +++ b/build/777.vcxproj @@ -43,7 +43,7 @@ <_ProjectFileVersion>10.0.30319.1 ..\exe\ ..\obj\$(SolutionName)\$(ProjectName)\ - false + true ..\exe\ ..\obj\$(SolutionName)\$(ProjectName)\ false diff --git a/src/include/form.h b/src/include/form.h index 50f34c74f..41c9708ba 100755 --- a/src/include/form.h +++ b/src/include/form.h @@ -595,7 +595,16 @@ public: // @cmember Ritorna l'

-esimo campo da stampare TForm_item& field(int n) const { return (TForm_item&)_item[n]; } - + // @cmember Ritorna il primo campo da stampare + TForm_item* first_field() + { return (TForm_item *)_item.first_item(); } + // @cmember Ritorna il campo successivo da stampare + TForm_item* succ_field() + { return (TForm_item *)_item.succ_item(); } + // @cmember Ritorna l'ultimo campo da stampare + TForm_item* last_field() + { return (TForm_item *)_item.last_item(); } + // @cmember Cerca e ritorna l'

-esimo campo nella sezione TForm_item* exist_field(short id) const; // @cmember Cerca e ritorna la sottosezione

nella sezione diff --git a/src/m770/777100.cpp b/src/m770/777100.cpp index b0cbc5229..3a8291788 100755 --- a/src/m770/777100.cpp +++ b/src/m770/777100.cpp @@ -175,10 +175,11 @@ void TForm770::transfer_section(TPrint_section& body, int rigo, TString str; body.update(); - for (word f = 0; f < body.fields(); f++) + for (TForm_item * f = body.first_field(); f != NULL; f = body.succ_field()) { - TForm_item& fi = body.field(f); - str = fi.get(); str.trim(); + TForm_item& fi = *f; + + str = fi.get(); str.trim(); if (fi.shown() && str.not_empty()) { basecode = fi.get_special_value("TRASFER"); @@ -1027,8 +1028,8 @@ bool TTrasferimento770::split(const char* path) rec.set(6, totale['F'-'A']); // Totale F rec.set(7, totale['G'-'A']); // Totale G rec.set(8, totale['H'-'A']); // Totale H - rec.set(9, totale['I'-'A']); // Totale I - rec.set(10,totale['J'-'A']); // Totale J +// rec.set(9, totale['I'-'A']); // Totale I +// rec.set(10,totale['J'-'A']); // Totale J // Scrive record di coda outfile << rec; diff --git a/src/m770/77qst.frm b/src/m770/77qst.frm index 5b31efe3d..b44fc7395 100755 --- a/src/m770/77qst.frm +++ b/src/m770/77qst.frm @@ -32,43 +32,20 @@ BEGIN PROMPT 79 2 "" FIELD QLRITEFF SPECIAL STRINGA TRASFER "ST002002" "NP" -END - -VALUTA 3 -BEGIN - KEY "CREDITI RECUPERATI" - PROMPT 79 2 "" - FIELD QLRITCOMP - SPECIAL STRINGA TRASFER "ST002003" "NP" -END - -VALUTA 4 -BEGIN - KEY "IMPORTI A SCOMPUTO" - PROMPT 79 2 "" - SPECIAL STRINGA TRASFER "ST002004" "NP" -END - -VALUTA 5 -BEGIN - KEY "VERSAMENTI IN ECCESSO" - PROMPT 79 2 "" - FIELD QLRITVEREC - SPECIAL STRINGA TRASFER "ST002005" "NP" -END +End VALUTA 6 BEGIN KEY "CREDITI D'IMPOSTA UTILIZZATI A SCOMPUTO" PROMPT 79 2 "" - SPECIAL STRINGA TRASFER "ST002004" "NP" + SPECIAL STRINGA TRASFER "ST002006" "NP" END VALUTA 7 BEGIN KEY "IMPORTO VERSATO" PROMPT 79 2 "" - MESSAGE _NUMEXPR,#2-#3-#4-#5-#6 + MESSAGE _NUMEXPR,#2-#6 SPECIAL STRINGA TRASFER "ST002007" "NP" END @@ -100,31 +77,14 @@ BEGIN PROMPT 79 2 "" FIELD QLCT SPECIAL STRINGA TRASFER "ST002011" "AN" -END - -LISTA 100 -BEGIN - KEY "Tesoreria" - PROMPT 79 2 "" - FIELD QLLV - ITEM " | " MESSAGE " ",10 - ITEM "C| " MESSAGE " ",10 - ITEM "T|X" MESSAGE "X",10 -END - -NUMERO 12 -BEGIN - KEY "Tesoreria" - PROMPT 79 2 "" - SPECIAL STRINGA TRASFER "ST002012" "CB" -END +End NUMERO 13 BEGIN KEY "Regione" PROMPT 79 2 "" FIELD QLREGIONE -END +End STRINGA 14 BEGIN