Patch level : 10.0

Files correlati     : pi0002.exe pi0002100a.msk
Ricompilazione Demo : [ ]
Commento            :
Sistemata maschera di riga


git-svn-id: svn://10.65.10.50/trunk@20513 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2010-05-28 08:05:05 +00:00
parent ae42a8ea83
commit 7e34655ce0
3 changed files with 54 additions and 39 deletions

View File

@ -11,6 +11,5 @@ int main(int argc, char** argv)
default:
pi0002100(argc, argv); break; //gestione anticipi fatture
}
exit(0);
return 0;
}

View File

@ -220,8 +220,8 @@ bool TPF_mask::fill_row(const TRiga_partite& rp, const TRiga_scadenze& rs, TToke
row.add(rs.get(SCAD_IMPORTOANT)); // importo anticipato
row.add(rs.get(SCAD_CODABIPR));
row.add(rs.get(SCAD_CODCABPR));
row.add(rp.get(PART_IMPTOTDOC)); // importo fattura
row.add(impres.string()); // residuo
row.add(rp.get(PART_IMPTOTDOC)); // importo fattura
row.add(impres.string()); // residuo
row.add(rs.get(SCAD_ANNO));
row.add(rs.get(SCAD_NUMPART));
row.add(rs.get(SCAD_NRIGA));
@ -250,14 +250,11 @@ void TPF_mask::update_sheet()
sheet.destroy();
TRelation rel(LF_PARTITE);
TRectype filter(LF_PARTITE);
filter.put(PART_TIPOCF, "C");
filter.put(PART_GRUPPO, 0);
filter.put(PART_CONTO, 0);
TRectype& filter = rel.curr();
filter.put(PART_TIPOCF, 'C');
filter.put(PART_SOTTOCONTO, get(F_CLIFO));
TString filtro;
filtro << "(CHIUSA!=\"X\")";
const char* filtro = "(CHIUSA!=\"X\")&&(TIPOMOV==1)";
TCursor partite(&rel, filtro, 1, &filter, &filter);
const long items = partite.items();
@ -266,18 +263,17 @@ void TPF_mask::update_sheet()
{
TRectype& partita = partite.curr();
TProgind pi(items, "Caricamento partite aperte", TRUE, TRUE);
TProgind pi(items, TR("Caricamento partite aperte"));
long last_cf = 0;
int last_year = 0;
int last_year = 0, games = 0;
TString16 last_game;
TToken_string row;
for (partite = 0L; partite.pos() < items; ++partite)
{
pi.addstatus(1);
if (pi.iscancelled())
if (!pi.addstatus(1))
break;
if (sheet.items() > 900) // Anche troppe righe
break;
@ -290,6 +286,7 @@ void TPF_mask::update_sheet()
last_cf = cur_cf;
last_year = cur_year;
last_game = cur_game;
games++;
const TPartita game(partita);
const int last = game.last();
@ -314,6 +311,9 @@ void TPF_mask::update_sheet()
} // if e' una fattura
} // for ogni fattura
} // for ogni partita
TString msg; msg << games << ' ' << TR("partite") << " : " << sheet.items() << ' ' << TR("scadenze aperte");
xvtil_statbar_set(msg);
} // if ci sono partite
sheet.force_update();
}
@ -343,11 +343,11 @@ public:
void TPresent_fatture::main_loop()
{
open_files(LF_TABCOM, LF_TAB, LF_CLIFO, LF_CFVEN,
LF_PARTITE, LF_SCADENZE, LF_PAGSCA, 0);
open_files(LF_TABCOM, LF_TAB, LF_CLIFO, LF_CFVEN, LF_PARTITE, LF_SCADENZE, LF_PAGSCA, 0);
TPF_mask m;
while (m.run() == K_ENTER)
while (m.run() != K_QUIT)
{
m.reset();
}
}

View File

@ -17,39 +17,42 @@ PAGE "Gestione anticipi fatture" 0 2 0 0
GROUPBOX DLG_NULL 78 4
BEGIN
PROMPT 1 0 "Parametri"
PROMPT 1 0 "@bParametri"
END
NUMBER F_CLIFO 6
BEGIN
PROMPT 2 1 "Cliente "
USE LF_CLIFO
PROMPT 2 1 "Cliente "
USE LF_CLIFO SELECT LF_PARTITE->ANNO>0
JOIN LF_PARTITE INTO TIPOC=TIPOCF SOTTOCONTO=CODCF
INPUT TIPOCF "C" SELECT
INPUT CODCF F_CLIFO
DISPLAY "Codice" CODCF
DISPLAY "Ragione Sociale@50" RAGSOC
DISPLAY "Partita IVA" PAIV
OUTPUT F_CLIFO CODCF
OUTPUT F_RAGSOCCF RAGSOC
CHECKTYPE NORMAL
CHECKTYPE REQUIRED
ADD RUN cg0 -1
END
STRING F_RAGSOCCF 50 37
STRING F_RAGSOCCF 50
BEGIN
PROMPT 25 1 ""
PROMPT 22 1 ""
USE LF_CLIFO KEY 2
INPUT TIPOCF "C" SELECT
INPUT RAGSOC F_RAGSOCCF
DISPLAY "Ragione Sociale@50" RAGSOC
DISPLAY "Partita IVA" PAIV
DISPLAY "Codice" CODCF
COPY OUTPUT F_CLIFO
CHECKTYPE NORMAL
CHECKTYPE SEARCH
ADD RUN cg0 -1
END
DATE F_DATAMOV
BEGIN
PROMPT 2 2 "Data mov. "
PROMPT 2 2 "Data movimento "
END
CURRENCY F_TOTALEANT
@ -60,17 +63,17 @@ END
CURRENCY F_TOTALEPAG
BEGIN
PROMPT 52 4 "Totale pagato "
PROMPT 45 4 "Totale pagato "
FLAGS "D"
END
SPREADSHEET F_SHEET 0 -2
SPREADSHEET F_SHEET
BEGIN
PROMPT 0 6 "Partite aperte"
ITEM "Importo pagato@18"
ITEM "Importo anticipato@18"
ITEM "Abi@5"
ITEM "Cab@5"
ITEM "ABI@5"
ITEM "CAB@5"
ITEM "Importo fattura@18"
ITEM "Residuo@18"
ITEM "Anno"
@ -78,7 +81,7 @@ BEGIN
ITEM "Riga"
ITEM "Rata"
ITEM "Scadenza@10"
ITEM "Tipo pag."
ITEM "Tipo pagamento"
END
ENDPAGE
@ -89,7 +92,7 @@ PAGE "Fatture" -1 -1 70 10
CURRENCY F_PAGATO 18
BEGIN
PROMPT 1 1 "Importo pagato "
PROMPT 1 1 "Importo pagato "
END
CURRENCY F_IMPORTOANT 18
@ -100,59 +103,72 @@ END
NUMBER F_ABI 5
BEGIN
PROMPT 1 3 "ABI "
USE BNP
JOIN %BAN INTO CODTAB=CODTAB
INPUT CODTAB[1,5] F_ABI
INPUT CODTAB[6,10] F_CAB
DISPLAY "ABI@5" CODTAB[1,5]
DISPLAY "CAB@5" CODTAB[6,10]
DISPLAY "Denominazione@50" 4->S0
OUTPUT F_ABI CODTAB[1,5]
OUTPUT F_CAB CODTAB[6,10]
CHECKTYPE NORMAL
FLAGS "Z"
END
NUMBER F_CAB 5
BEGIN
PROMPT 1 4 "CAB "
PROMPT 16 3 "CAB "
COPY ALL F_ABI
FLAGS "Z"
END
CURRENCY F_IMPORTO 18
BEGIN
PROMPT 1 5 "Importo fattura "
PROMPT 1 4 "Importo fattura "
FLAGS "D"
END
CURRENCY F_RESIDUO 18
BEGIN
PROMPT 1 6 "Residuo "
PROMPT 1 5 "Residuo "
NUM_CALC #F_IMPORTO-#F_IMPORTOANT
FLAGS "D"
END
NUMBER F_ANNO 4
BEGIN
PROMPT 1 7 "Anno "
PROMPT 1 6 "Anno "
FLAGS "D"
END
STRING F_PARTITA 7
BEGIN
PROMPT 21 7 "Partita "
PROMPT 20 6 "Partita "
FLAGS "D_"
END
NUMBER F_RIGA 4
BEGIN
PROMPT 38 7 "Riga "
PROMPT 38 6 "Riga "
FLAGS "D"
END
NUMBER F_RATA 4
BEGIN
PROMPT 50 7 "Rata "
PROMPT 50 6 "Rata "
FLAGS "D"
END
DATE F_DATA
BEGIN
PROMPT 1 8 "Scadenza"
PROMPT 1 7 "Scadenza "
FLAGS "D"
END
STRING F_TIPOPAG 30
BEGIN
PROMPT 1 7 "Tipo pagamento "
PROMPT 23 7 "Tipo pagamento "
FLAGS "D"
END