diff --git a/src/cg/cg7401.cpp b/src/cg/cg7401.cpp index 32a456476..4090b0413 100644 --- a/src/cg/cg7401.cpp +++ b/src/cg/cg7401.cpp @@ -73,7 +73,7 @@ void TQuadro_IVA_mask::build_ditte_sheet() FOR_EACH_ARRAY_ITEM(firms, i, obj) { const long codditta = firms.get_long(i); - TString key; key.format("%05ld%04d", codditta, _year); + TString key; key.format("%05ld%04d", codditta, _year - 1); const bool good = cache().get("%LIA", key).full(); TToken_string & row = sf.row(sf.items()); const int pos = sf.items() - 1; diff --git a/src/cg/cg7a00a.uml b/src/cg/cg7a00a.uml index dbbd4576b..17d4c6380 100644 --- a/src/cg/cg7a00a.uml +++ b/src/cg/cg7a00a.uml @@ -23,6 +23,34 @@ END #include ENDPAGE + +PAGE "Quadro VL - Stampa" 0 0 0 0 + +NUMBER F_YEAR 4 +BEGIN + PROMPT 3 2 "Anno " + FLAGS "A-" +END + +SPREADSHEET F_DITTE 66 8 +BEGIN + PROMPT 7 4 " " + ITEM "" + ITEM "Codice" + ITEM "Ragione Sociale@50" +END + +SPREADSHEET F_REPORTS 83 10 +BEGIN + PROMPT 1 14 "" + ITEM "" + ITEM "Codice" + ITEM "Descrizione@60" + ITEM "Nome@6" +END + +ENDPAGE + PAGE "Quadro VL - Dati" 0 0 0 0 NUMBER F_FIRM 5 @@ -178,33 +206,6 @@ END ENDPAGE -PAGE "Quadro VL - Stampa" 0 0 0 0 - -NUMBER F_YEAR 4 -BEGIN - PROMPT 3 2 "Anno " - FLAGS "A-" -END - -SPREADSHEET F_DITTE 66 8 -BEGIN - PROMPT 7 4 " " - ITEM "" - ITEM "Codice" - ITEM "Ragione Sociale@50" -END - -SPREADSHEET F_REPORTS 83 10 -BEGIN - PROMPT 1 14 "" - ITEM "" - ITEM "Codice" - ITEM "Descrizione@60" - ITEM "Nome@6" -END - -ENDPAGE - ENDMASK PAGE "Ditte" -1 -1 78 6