diff --git a/ef/ef0100.cpp b/ef/ef0100.cpp index a1ffbe8c4..cfb217ae6 100755 --- a/ef/ef0100.cpp +++ b/ef/ef0100.cpp @@ -107,6 +107,7 @@ void TVariazione_effetti::ini2mask(TConfig& ini, TMask& m, bool query) row.add(ini.get(REFF_ANNO), righe_sheet().cid2index(F_ANNO)); row.add(ini.get(REFF_NUMPART), righe_sheet().cid2index(F_NUMPART)); row.add(ini.get(REFF_NRATA), righe_sheet().cid2index(F_NUMRATA)); + row.add(ini.get(REFF_ACCSAL), righe_sheet().cid2index(F_ACCSAL)); } @@ -202,6 +203,7 @@ void TVariazione_effetti::common_f(const TMask& m) rec.put(REFF_NUMPART, row.get()); rec.put(REFF_NRIGA, row.get_int()); rec.put(REFF_NRATA, row.get_int()); + rec.put(REFF_ACCSAL, row.get()); ii++; } _effetto->renum(_effetto->numero()); @@ -268,6 +270,7 @@ int TVariazione_effetti::read(TMask& m) riga.add(rec.get(REFF_NUMPART)); riga.add(rec.get(REFF_NRIGA)); riga.add(rec.get(REFF_NRATA)); + riga.add(rec.get(REFF_ACCSAL)); shrighe.row(i - 1) = riga; shrighe.check_row(i - 1); } diff --git a/ef/ef0100.h b/ef/ef0100.h index e9286378d..a73197075 100755 --- a/ef/ef0100.h +++ b/ef/ef0100.h @@ -73,5 +73,6 @@ #define F_NUMPART 111 #define F_NUMRIGA 112 #define F_NUMRATA 113 +#define F_ACCSAL 114 #endif // __EF0100_H diff --git a/ef/ef0100a.uml b/ef/ef0100a.uml index d80039abd..317ff6a64 100755 --- a/ef/ef0100a.uml +++ b/ef/ef0100a.uml @@ -204,6 +204,7 @@ BEGIN ITEM "Nr. partita" ITEM "Nr. riga" ITEM "Nr. rata" + ITEM "A/S" END CURRENCY F_TOTIMP 18 diff --git a/ef/ef0100c.uml b/ef/ef0100c.uml index ce4c2e3b4..fd1de3b4b 100755 --- a/ef/ef0100c.uml +++ b/ef/ef0100c.uml @@ -1,15 +1,11 @@ // DEFINIZIONE MASCHERA, DELLO SHEET DELLE RIGHE EFFETTO, PER LA GESTIONE EFFETTI #include "ef0100.h" -PAGE "Righe Effetto" -1 -1 76 22 +PAGE "Righe Effetto" -1 -1 78 16 CURRENCY F_IMPEFF 16 BEGIN PROMPT 2 1 "Importo effetto " -// PICTURE ".2" -// PICTURE "###.###.###,@@" -// NUM_EXPR #F_IMPFATT>=#F_IMPEFF -// WARNING "L'importo dell'effetto non puo' superare l'importo della fattura" END CURRENCY F_IMPEFFVAL 15 @@ -17,9 +13,6 @@ BEGIN PROMPT 2 2 "Imp.effetto val. " DRIVENBY -F_CODVAL PICTURE ".3" -// PICTURE "###.###.###,@@@" -// NUM_EXPR #F_IMPFATTVAL>=#F_IMPEFFVAL -// WARNING "L'importo dell'effetto in valuta non puo' superare l'importo della fattura in valuta" END STRING F_CODNUM 4 @@ -79,14 +72,12 @@ END CURRENCY F_IMPFATT 20 BEGIN PROMPT 2 8 "Importo fattura " -// PICTURE "###.###.###.###,@@" END CURRENCY F_IMPFATTVAL 20 BEGIN PROMPT 2 9 "Imp. fatt. val " DRIVENBY -F_CODVAL -// PICTURE "###.###.###.###,@@@" END NUMBER F_ANNO 4 @@ -97,7 +88,7 @@ END STRING F_NUMPART 7 BEGIN PROMPT 2 11 "Nr. partita " - FLAG "R" + FLAGS "_" END NUMBER F_NUMRIGA 4 @@ -111,6 +102,17 @@ BEGIN PROMPT 2 13 "Nr. rata " END +LIST F_ACCSAL 1 10 +BEGIN + PROMPT 2 14 "Acconto / Saldo " + ITEM "A|Acconto" + ITEM "S|Saldo" +END + +ENDPAGE + +TOOLBAR "bottom" 0 0 0 2 + BUTTON DLG_OK 10 2 BEGIN PROMPT -13 -1 "" diff --git a/ef/ef0a00a.uml b/ef/ef0a00a.uml index 8b8c59a24..389954d33 100755 --- a/ef/ef0a00a.uml +++ b/ef/ef0a00a.uml @@ -13,7 +13,6 @@ END BUTTON DLG_SAVEREC 10 2 BEGIN PROMPT -26 -1 "~Registra" - PICTURE BMP_SAVEREC PICTURE BMP_SAVERECDN END @@ -21,7 +20,6 @@ END BUTTON DLG_DELREC 10 2 BEGIN PROMPT -36 -1 "~Elimina" - PICTURE BMP_DELREC PICTURE BMP_DELRECDN GROUP 5