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

Compare commits

base: root:f5c520de781363df05e24209ada27be713d4e0c3
Branches Tags
root:R12.00.1244
..
compare: root:0bd7775b4053f8adabbb38c7773a4ecc3929aab1
Branches Tags
root:R12.00.1244

No commits in common. "f5c520de781363df05e24209ada27be713d4e0c3" and "0bd7775b4053f8adabbb38c7773a4ecc3929aab1" have entirely different histories.
f5c520de78 ... 0bd7775b40

2 changed files with 30 additions and 37 deletions
Show Stats Expand all files Collapse all files

5
src/ca/ca3A00.cpp
View File

@ -165,10 +165,7 @@ void TPrint_prosp_ricerca_ca_recordset::crea_filtro_rmovana(TRectype& da_rmovana
if (_adata.ok())
al = _adata;
if (dal.ok() || al.ok())
filtro << "(BETWEEN(" << MOVANA_DATACOMP << "," << dal.date2ansi() << ',' << al.date2ansi() << "))";
if (filtro.full())
filtro << "&&";
filtro << "(" << MOVANA_TIPOMOV << "== \"\")";
filtro << "(BETWEEN(DATACOMP," << dal.date2ansi() << ',' << al.date2ansi() << "))";
}
void TPrint_prosp_ricerca_ca_recordset::crea_trr(const TFilename& trr)

62
src/ve/vetbspp.uml
View File

@ -332,20 +332,16 @@ END
LIST SPP_TIPORIT 4 37
BEGIN
PROMPT 2 20 "Tipo Ritenuta "
PROMPT 2 19 "Tipo Ritenuta "
FIELD S13[1,4]
ITEM "|"
ITEM "RT01|Ritenuta persone fisiche"
ITEM "RT02|Ritenuta persone giuridiche"
ITEM "RT03|contributo INPS"
ITEM "RT04|contributo ENASARCO"
ITEM "RT05|contributo ENPAM"
ITEM "RT06|altro contributo previdenziale"
ITEM "RT01|RT01 - Ritenuta persone fisiche"
ITEM "RT02|RT02 - Ritenuta persone giuridiche"
END
LISTBOX SPP_TIPOCAS 64
BEGIN
PROMPT 2 20 "Tipo Cassa "
PROMPT 2 19 "Tipo Cassa "
ITEM " | "
ITEM "TC01|Cassa avvocati e procuratori legali"
ITEM "TC02|Cassa dottori commercialisti"
@ -373,9 +369,9 @@ BEGIN
FLAGS "D"
END
LIST SPP_TIPOSP 1 10
LIST SPP_TIPOSP 1 20
BEGIN
PROMPT 2 21 "Tipo di spesa/prestazione "
PROMPT 2 20 "Tipologia di spesa/prestazione "
FIELD S11[1,1]
ITEM " |Altro"
ITEM "I|Incasso"
@ -383,25 +379,9 @@ BEGIN
ITEM "T|Trasporto"
END
BOOLEAN SPP_SOGGRIT
BEGIN
PROMPT 42 21 "Soggetto a ritenuta"
FLAGS "D"
FIELD B0
GROUP 4
END
BOOLEAN SPP_CALCRIT
BEGIN
PROMPT 64 21 "Soggetto al calcolo rit."
FLAGS "D"
FIELD B1
GROUP 4
END
STRING SPP_CODTRB 4
BEGIN
PROMPT 2 22 "Cod. tributo "
PROMPT 2 21 "Cod. tributo "
FIELD S10
FLAG "U"
USE %TRB
@ -415,9 +395,9 @@ END
STRING SPP_CODTRB1 50 22
BEGIN
PROMPT 25 22 ""
PROMPT 25 21 ""
USE %TRB KEY 2
INPUT S0 SPP_CODTRB1
INPUT S0 SPP_CODTRB1
DISPLAY "Descrizione@50" S0
DISPLAY "Codice " CODTAB
OUTPUT SPP_CODTRB CODTAB
@ -427,7 +407,7 @@ END
NUMBER SPP_CODCAUS770 2
BEGIN
PROMPT 2 23 "Caus. 770 "
PROMPT 2 22 "Caus. 770 "
USE %CA7 SELECT I0==#SPP_CODTRB
INPUT CODTAB SPP_CODCAUS770
DISPLAY "Cod.caus." CODTAB
@ -444,7 +424,7 @@ END
LISTBOX SPP_CODQUA 2 10
BEGIN
PROMPT 20 23 "Quadro "
PROMPT 20 22 "Quadro "
HELP "Inserire il codice quadro"
ITEM "|" MESSAGE CLEAR,SPP_CAUSD
ITEM "LA|Quadro LA" MESSAGE ENABLE,SPP_CAUSD
@ -456,7 +436,7 @@ END
STRING SPP_CAUSD 2
BEGIN
PROMPT 50 23 "Causale LA "
PROMPT 50 22 "Causale LA "
FLAGS "U"
SHEET "Codice|Descrizione@320"
INPUT SPP_CAUSD
@ -500,12 +480,28 @@ END
LISTBOX SPP_SEZIONE 6
BEGIN
PROMPT 70 23 "Sezione per cooperative "
PROMPT 70 22 "Sezione per cooperative "
FIELD S11[5,5]
ITEM "D|Dare"
ITEM "A|Avere"
END
BOOLEAN SPP_SOGGRIT
BEGIN
PROMPT 40 23 "Soggetto a ritenuta"
FLAGS "D"
FIELD B0
GROUP 4
END
BOOLEAN SPP_CALCRIT
BEGIN
PROMPT 65 23 "Soggetto al calcolo rit."
FLAGS "D"
FIELD B1
GROUP 4
END
ENDPAGE
PAGE "Analitica" 11 60 14