root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 12.0 820

Browse Source 
Files correlati     : cg2.exe
Commento            :
- Correzione maschera cg2300a per compatibilita' con schermi piu' piccoli
- Visualizzate solo registrazioni con flag liq. mese prec.
- Modificate posizioni campi prima nota
This commit is contained in:
Simone Palacino 2019-06-11 10:21:35 +02:00
parent 37704d8ef8
commit 9c5bbf8a20
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cg/cg2100c.uml
View File

@ -611,13 +611,13 @@ END
BOOLEAN F_COLFPPRO BOOLEAN F_COLFPPRO
BEGIN BEGIN
PROMPT 1 18 "Registrazione collegata a FPPRO" PROMPT 1 20 "Registrazione collegata a FPPRO"
FLAGS "D" FLAGS "D"
END END
STRING F_PROKEY 80 STRING F_PROKEY 80
BEGIN BEGIN
PROMPT 1 18 "db key" PROMPT 1 19 "db key"
HELP "Chiave database" HELP "Chiave database"
FIELD KEYFPPRO FIELD KEYFPPRO
FLAGS "H" FLAGS "H"

6
src/cg/cg2300.cpp
View File

@ -214,9 +214,9 @@ void TCompetenze_mask::fill()
for (; movs.next() == NOERR && movs.get_date(MOV_DATAREG) <= dataend; ) for (; movs.next() == NOERR && movs.get_date(MOV_DATAREG) <= dataend; )
{ {
const int month_liq = movs.get_int(MOV_MESELIQ); const int month_liq = movs.get_int(MOV_MESELIQ);
TDate datareg(movs.get(MOV_DATAREG)); const TDate datareg(movs.get(MOV_DATAREG));
TDate datacomp(movs.get(MOV_DATACOMP)); const TDate datacomp(movs.get(MOV_DATACOMP));
if (month_liq == 0 && datacomp < datareg || month_liq != 0 && month_liq < datareg.month()) if (month_liq != 0)
{ {
_regs.insert(_regs.end(), movs.get_int(MOV_NUMREG)); _regs.insert(_regs.end(), movs.get_int(MOV_NUMREG));

4
src/cg/cg2300a.uml
View File

@ -50,7 +50,7 @@ BEGIN
CHECKTYPE REQUIRED CHECKTYPE REQUIRED
END END
SPREADSHEET F_MOVS 0 10 SPREADSHEET F_MOVS 0 9
BEGIN BEGIN
PROMPT 1 1 "" PROMPT 1 1 ""
ITEMS "Numero" ITEMS "Numero"
@ -71,7 +71,7 @@ BEGIN
FLAGS "Z" FLAGS "Z"
END END
SPREADSHEET F_CONTC 0 -1 SPREADSHEET F_CONTC 0 -2
BEGIN BEGIN
PROMPT 1 14 "" PROMPT 1 14 ""
ITEMS "Gruppo\nControp.@5" ITEMS "Gruppo\nControp.@5"