Correzioni varie

git-svn-id: svn://10.65.10.50/trunk@3028 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
nik 1996-06-20 07:24:36 +00:00
parent ad35c4e4dc
commit 3b963dab14
36 changed files with 1034 additions and 1027 deletions

View File

@ -92,7 +92,7 @@ BEGIN
OUTPUT SPF_CAUSD1 S3 OUTPUT SPF_CAUSD1 S3
FLAGS "Z" FLAGS "Z"
WARNING "Manca la causale" WARNING "Manca la causale"
ADD RUN 773 -3 %CA7 ADD RUN 773mod -3 %CA7
END END
NUMBER F_PERC_INPS 6 NUMBER F_PERC_INPS 6

View File

@ -893,6 +893,7 @@ real TSchedaPercipienti::calcola_imponibile(TMask_field& f, const real& compenso
real rPercCassaPrev=ZERO; real rPercCassaPrev=ZERO;
rPercCassaPrev = mm.get_real(F_CASSA_PREV); rPercCassaPrev = mm.get_real(F_CASSA_PREV);
imponibile_calcolato = (imponibile_calcolato / (100.00 + rPercCassaPrev)) * 100.00; imponibile_calcolato = (imponibile_calcolato / (100.00 + rPercCassaPrev)) * 100.00;
imponibile_calcolato.trunc();
} }
TString impost(imponibile_calcolato.string()); TString impost(imponibile_calcolato.string());
@ -923,6 +924,7 @@ real TSchedaPercipienti::calcola_imponibile(const real& compenso)
else else
imponibile_calcolato = (compenso * quota_imp) / 100.00; imponibile_calcolato = (compenso * quota_imp) / 100.00;
// imponibile_calcolato = round_770(imponibile_calcolato); // imponibile_calcolato = round_770(imponibile_calcolato);
imponibile_calcolato.trunc();
} }
return imponibile_calcolato; return imponibile_calcolato;
} }
@ -1112,6 +1114,7 @@ real TSchedaPercipienti::calcola_ritenuta(const real& imponibile)
rite = imponibile; rite = imponibile;
else else
rite = (imponibile * rQuotaRaCaus)/100.00; rite = (imponibile * rQuotaRaCaus)/100.00;
rite.trunc();
return rite; return rite;
} }
@ -1162,7 +1165,7 @@ real TSchedaPercipienti::calcola_netto(TMask_field& f)
const real inpsperc (m.get(MPAG_INPSPERC)); const real inpsperc (m.get(MPAG_INPSPERC));
netto = compenso - ritenuta + spesa - inpsperc; netto = compenso - ritenuta + spesa - inpsperc;
netto.trunc();
f.mask().set(MPAG_NETTO, netto.string()); f.mask().set(MPAG_NETTO, netto.string());
return netto; return netto;

View File

@ -120,7 +120,8 @@ END
STRING F_NISCRAA 10 STRING F_NISCRAA 10
BEGIN BEGIN
PROMPT 30 9 "Numero di iscrizione all'albo " PROMPT 30 9 "Numero di iscrizione all'albo "
FLAGS "D" CHECKTYPE REQUIRED
FLAGS "DG"
END END
GROUPBOX DLG_NULL 78 4 GROUPBOX DLG_NULL 78 4

View File

@ -535,7 +535,7 @@ bool TQuadroA::QA3_base_occupazionale(TMask_field& f , KEY k)
if (k == K_SPACE) if (k == K_SPACE)
{ {
TString appname(30); TString appname(30);
appname.format("773 -1 771200i 37 \"%s\" 0", "Base occupati"); appname.format("773mod -1 771200i 37 \"%s\" 0", "Base occupati");
TExternal_app a(appname); TExternal_app a(appname);
a.run(); a.run();
} }

View File

@ -60,7 +60,7 @@ BEGIN
OUTPUT F_CODANAGDIP CODIP OUTPUT F_CODANAGDIP CODIP
OUTPUT QAF_COGNOME COGNOME OUTPUT QAF_COGNOME COGNOME
OUTPUT QAF_NOME NOME OUTPUT QAF_NOME NOME
ADD RUN 773 -1 771150a 45 "Anagrafica dipendenti" ADD RUN 773mod -1 771150a 45 "Anagrafica dipendenti"
MESSAGE COPY, F_CODIP MESSAGE COPY, F_CODIP
END END

View File

@ -664,7 +664,7 @@ END
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 44 11 "63 interessi " PROMPT 44 11 "63 interessi "
GROUP 7 // GROUP 7
END END
NUMBER F_IMPVER60 15 NUMBER F_IMPVER60 15
@ -712,7 +712,7 @@ END
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 44 15 "66 Contr. versato " PROMPT 44 15 "66 Contr. versato "
GROUP 7 // GROUP 7
END END
NUMBER F_CONRIMB63 15 NUMBER F_CONRIMB63 15
@ -725,7 +725,7 @@ END
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 2 16 "67 interessi " PROMPT 2 16 "67 interessi "
GROUP 7 // GROUP 7
END END
NUMBER F_CONVER64 15 NUMBER F_CONVER64 15

View File

@ -60,11 +60,8 @@ BEGIN
OUTPUT F_CODANAGDIP CODIP OUTPUT F_CODANAGDIP CODIP
OUTPUT QAF_COGNOME COGNOME OUTPUT QAF_COGNOME COGNOME
OUTPUT QAF_NOME NOME OUTPUT QAF_NOME NOME
// CHECKTYPE REQUIRED ADD RUN 773mod -1 771150a 45 "Anagrafica dipendenti"
ADD RUN 773 -1 771150a 45 "Anagrafica dipendenti"
MESSAGE COPY, F_CODIP MESSAGE COPY, F_CODIP
// FIELD LF_QUAA1->CODIP
// KEY 1
END END
STRING QAF_COGNOME 24 STRING QAF_COGNOME 24

View File

@ -60,7 +60,7 @@ BEGIN
OUTPUT F_CODANAGDIP CODIP OUTPUT F_CODANAGDIP CODIP
OUTPUT QAF_COGNOME COGNOME OUTPUT QAF_COGNOME COGNOME
OUTPUT QAF_NOME NOME OUTPUT QAF_NOME NOME
ADD RUN 773 -1 771150a 45 "Anagrafica dipendenti" ADD RUN 773mod -1 771150a 45 "Anagrafica dipendenti"
MESSAGE COPY, F_CODIP MESSAGE COPY, F_CODIP
END END

View File

@ -99,17 +99,30 @@ BEGIN
PROMPT 1 6 "@bSALDO IRPEF PER IL 1994 " PROMPT 1 6 "@bSALDO IRPEF PER IL 1994 "
END END
/*
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 2 7 "10 Imposta rimborsata " PROMPT 2 7 "10 Imposta rimbor. "
GROUP 6 GROUP 6
END END
*/
/*
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 2 7 "11 Imposta versata " PROMPT 2 7 "11 Imposta versata "
GROUP 7 GROUP 7
END END
*/
TEXT DLG_NULL
BEGIN
PROMPT 2 7 "10 Imposta rimbor. "
END
TEXT DLG_NULL
BEGIN
PROMPT 41 7 "11 Imposta versata "
END
NUMBER F_IIRPEFVER8 15 NUMBER F_IIRPEFVER8 15
BEGIN BEGIN
@ -118,22 +131,31 @@ BEGIN
PICTURE "." PICTURE "."
END END
/*
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 41 7 "12 Interessi " PROMPT 41 7 "12 Interessi "
GROUP 6 GROUP 6
END END
*/
TEXT DLG_NULL
BEGIN
PROMPT 2 8 "12 Interessi "
END
GROUPBOX DLG_NULL 78 3 GROUPBOX DLG_NULL 78 3
BEGIN BEGIN
PROMPT 1 10 "@bPRIMA RATA ACCONTO IRPEF PER IL 1995 " PROMPT 1 10 "@bPRIMA RATA ACCONTO IRPEF PER IL 1995 "
END END
/*
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 41 7 "13 Imposta versata " PROMPT 41 7 "13 Imposta versata "
GROUP 7 GROUP 7
END END
*/
NUMBER F_IIRPEFRI9 15 NUMBER F_IIRPEFRI9 15
BEGIN BEGIN
@ -142,13 +164,13 @@ BEGIN
PICTURE "." PICTURE "."
END END
/*
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 2 8 "14 Interessi " PROMPT 2 8 "14 Interessi "
GROUP 6 GROUP 6
END END
/*
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 2 8 "1a rata acc.IRPEF96 " PROMPT 2 8 "1a rata acc.IRPEF96 "
@ -166,14 +188,16 @@ END
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 2 11 "13 Imposta versata " PROMPT 2 11 "13 Imposta versata "
GROUP 6 // GROUP 6
END END
/*
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 2 11 "14 Interessi " PROMPT 2 11 "14 Interessi "
GROUP 7 GROUP 7
END END
*/
NUMBER F_PRIRPEF10 15 NUMBER F_PRIRPEF10 15
BEGIN BEGIN
@ -185,8 +209,8 @@ END
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 41 11 "Interessi " PROMPT 41 11 "14 Interessi "
GROUP 6 // GROUP 6
END END
TEXT DLG_NULL TEXT DLG_NULL
@ -273,14 +297,21 @@ END
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 2 5 "16 Cont.a rimborso " PROMPT 2 5 "16 Cont.a rimborso "
GROUP 6 // GROUP 6
END END
TEXT DLG_NULL
BEGIN
PROMPT 41 5 "17 Cont. versato "
END
/*
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 2 5 "17 Cont. versato " PROMPT 2 5 "17 Cont. versato "
GROUP 7 GROUP 7
END END
*/
NUMBER QA2F_CSSNCRIMB 15 NUMBER QA2F_CSSNCRIMB 15
BEGIN BEGIN
@ -289,6 +320,7 @@ BEGIN
PICTURE "." PICTURE "."
END END
/*
TEXT DLG_NULL TEXT DLG_NULL
BEGIN BEGIN
PROMPT 41 5 "18 Interessi " PROMPT 41 5 "18 Interessi "
@ -300,6 +332,7 @@ BEGIN
PROMPT 41 5 "2a rata acc.CSSN 96" PROMPT 41 5 "2a rata acc.CSSN 96"
GROUP 7 GROUP 7
END END
*/
NUMBER QA2F_CSSNCVER 15 NUMBER QA2F_CSSNCVER 15
BEGIN BEGIN
@ -311,7 +344,7 @@ END
NUMBER QA2F_CSSNINT 15 NUMBER QA2F_CSSNINT 15
BEGIN BEGIN
PROMPT 2 6 "Interessi " PROMPT 2 6 "18 Interessi "
FIELD LF_QUAA2->INTER18 FIELD LF_QUAA2->INTER18
PICTURE "." PICTURE "."
END END
@ -323,21 +356,21 @@ END
NUMBER QA2F_CSSNAIV 15 NUMBER QA2F_CSSNAIV 15
BEGIN BEGIN
PROMPT 2 9 "Imposta versata " PROMPT 2 9 "19 Contrib.versato "
FIELD LF_QUAA2->CONTV19 FIELD LF_QUAA2->CONTV19
PICTURE "." PICTURE "."
END END
NUMBER QA2F_CSSNAINT 15 NUMBER QA2F_CSSNAINT 15
BEGIN BEGIN
PROMPT 41 9 "Interessi " PROMPT 41 9 "20 Interessi "
FIELD LF_QUAA2->INTE20 FIELD LF_QUAA2->INTE20
PICTURE "." PICTURE "."
END END
NUMBER QA2F_STCSSN 15 NUMBER QA2F_STCSSN 15
BEGIN BEGIN
PROMPT 2 11 "Soprattasse su C.S.S.N. saldo 94 e prima rata acc.95 " PROMPT 2 11 "21 Soprattasse su C.S.S.N. saldo 94 e prima rata acc.95 "
FIELD LF_QUAA2->SOPRAT21 FIELD LF_QUAA2->SOPRAT21
PICTURE "." PICTURE "."
END END

View File

@ -75,7 +75,7 @@ BEGIN
OUTPUT QAF_COGNOME COGNOME OUTPUT QAF_COGNOME COGNOME
OUTPUT QAF_NOME NOME OUTPUT QAF_NOME NOME
MESSAGE COPY, F_CODIP MESSAGE COPY, F_CODIP
ADD RUN 775 -0 ADD RUN 773mod -1 771150a 45 "Anagrafica dipendenti"
GROUP 2 GROUP 2
END END

View File

@ -5,6 +5,7 @@
#include <sort.h> #include <sort.h>
#include <tabutil.h> #include <tabutil.h>
#include <progind.h> #include <progind.h>
#include "caus77.h"
#include "77lib.h" #include "77lib.h"
#include "scperc.h" #include "scperc.h"
#include "rpag.h" #include "rpag.h"
@ -31,6 +32,7 @@ class TQuadroC_E2 : public TRelation_application
real rite; real rite;
real comp; real comp;
bool acim; bool acim;
bool bInps;
real inps; real inps;
}; };
righe_pag* _rig; righe_pag* _rig;
@ -81,7 +83,7 @@ class TQuadroC_E2 : public TRelation_application
bool azzera_quadro(); bool azzera_quadro();
void riempi_record(char,long,int,const real&,const real&, void riempi_record(char,long,int,const real&,const real&,
const real&,const real&,const real&,bool, const real&,const real&,const real&,bool,
const real& inps_perc); const real& inps_perc, bool bCinps=FALSE);
void init_sort(); void init_sort();
void leggi_sort(TProgind&); void leggi_sort(TProgind&);
TRectype& look_causali(int c); TRectype& look_causali(int c);
@ -268,7 +270,7 @@ bool TQuadroC_E2::imponibile_hnd(TMask_field& f, KEY k)
{ {
int causale = f.mask().get_int(F_CODCAUS); int causale = f.mask().get_int(F_CODCAUS);
TRectype& cau = app().look_causali(causale); TRectype& cau = app().look_causali(causale);
real aliquota = cau.get_real("R0"); real aliquota = cau.get_real(rPERC_RAC);
f.mask().set(F_PERC, aliquota.string()); f.mask().set(F_PERC, aliquota.string());
} }
} }
@ -300,7 +302,7 @@ void TQuadroC_E2::init_sort()
void TQuadroC_E2::riempi_record(char t,long ca,int cc,const real& p, void TQuadroC_E2::riempi_record(char t,long ca,int cc,const real& p,
const real& so,const real& im, const real& so,const real& im,
const real& ri,const real& co,bool acim, const real& ri,const real& co,bool acim,
const real& inps) const real& inps, bool bInps)
{ {
_rig->tipoa = t; _rig->tipoa = t;
sprintf(_rig->codan, "%5ld", ca); sprintf(_rig->codan, "%5ld", ca);
@ -317,6 +319,7 @@ void TQuadroC_E2::riempi_record(char t,long ca,int cc,const real& p,
_rig->comp = co; _rig->comp = co;
_rig->acim = acim; _rig->acim = acim;
_rig->inps = inps; _rig->inps = inps;
_rig->bInps = bInps;
_sort->sort((const char*)_rig); _sort->sort((const char*)_rig);
} }
@ -387,8 +390,9 @@ bool TQuadroC_E2::generazione()
nprog = scperc.get_int(SPR_NPROG); nprog = scperc.get_int(SPR_NPROG);
TRectype cau = look_causali(codcaus); TRectype cau = look_causali(codcaus);
TString16 qua = cau.get("S1"); TString16 qua = cau.get(bCODICE_QUADRO);
bool acc_imp = cau.get_bool("B0"); bool acc_imp = cau.get_bool(bSOMME_ASSOG_RAC);
bool bContrInps = cau.get_bool(bCONTRIBUTO_INPS);
if (_tipoq == 'D' && qua != "D") continue; if (_tipoq == 'D' && qua != "D") continue;
if (_tipoq == 'C' && qua != "C") continue; if (_tipoq == 'C' && qua != "C") continue;
@ -423,7 +427,7 @@ bool TQuadroC_E2::generazione()
if (perc==ZERO && comp==ZERO && rite==ZERO && impo==ZERO if (perc==ZERO && comp==ZERO && rite==ZERO && impo==ZERO
&& somme==ZERO) && somme==ZERO)
continue; continue;
riempi_record(tipoa,codan,codcaus,perc,somme,impo,rite,comp,acc_imp,inps); riempi_record(tipoa,codan,codcaus,perc,somme,impo,rite,comp,acc_imp,inps,bContrInps);
} }
rpag.readat(nrec); rpag.readat(nrec);
} }
@ -541,8 +545,7 @@ void TQuadroC_E2::leggi_sort(TProgind& p)
int codcaus_p, codcaus, nprog; int codcaus_p, codcaus, nprog;
real tot_somme=ZERO,tot_impo=ZERO,tot_rite=ZERO,tot_comp=ZERO, rQCInps=ZERO; real tot_somme=ZERO,tot_impo=ZERO,tot_rite=ZERO,tot_comp=ZERO, rQCInps=ZERO;
real rTotQCInps = ZERO; real rTotQCInps = ZERO;
bool esiste_record = FALSE; bool esiste_record = FALSE, acc_imp = FALSE, bInps = FALSE;
bool acc_imp = FALSE;
struct righe_pag* rp; struct righe_pag* rp;
keyp = key = ""; keyp = key = "";
@ -559,8 +562,8 @@ void TQuadroC_E2::leggi_sort(TProgind& p)
codcaus = atoi(rp->codcau); codcaus = atoi(rp->codcau);
perc = rp->perc; perc = rp->perc;
acc_imp = rp->acim; acc_imp = rp->acim;
rQCInps = rp->inps; bInps = rp->bInps; // se la riga aveva il contributo inps nella cau.
rQCInps = bInps ? rp->inps : ZERO;
if (QuadroE1() && !acc_imp) if (QuadroE1() && !acc_imp)
{ {
genera_prospetto(codcaus,rp->comp,rp->impo,rp->rite); genera_prospetto(codcaus,rp->comp,rp->impo,rp->rite);
@ -569,7 +572,7 @@ void TQuadroC_E2::leggi_sort(TProgind& p)
else else
{ {
key.format("%c%5ld%2d%s", tipoa, codanag, codcaus, (const char*)perc); key.format("%c%5ld%2d%s", tipoa, codanag, codcaus, (const char*)perc);
if (key != keyp && keyp != "") if ( (key != keyp) && (keyp != "") )
{ {
qd.zero(); qd.zero();
qd.put("CODDITTA", (long)get_firm_770()); qd.put("CODDITTA", (long)get_firm_770());
@ -580,7 +583,7 @@ void TQuadroC_E2::leggi_sort(TProgind& p)
// 12.6.96 aggiunto contributo inps // 12.6.96 aggiunto contributo inps
if (QuadroC()) if (QuadroC())
qd.put("CONTSSN", rQCInps); qd.put("CONTSSN", rTotQCInps);
if (QuadroD() || QuadroC()) if (QuadroD() || QuadroC())
qd.put("SOMME", tot_somme + tot_comp - tot_impo); qd.put("SOMME", tot_somme + tot_comp - tot_impo);
@ -619,13 +622,14 @@ void TQuadroC_E2::leggi_sort(TProgind& p)
else else
qd.put("NETTO", tot_impo - tot_rite); qd.put("NETTO", tot_impo - tot_rite);
qd.write(); qd.write();
tot_impo = tot_somme = tot_rite = tot_comp = ZERO; rTotQCInps = tot_impo = tot_somme = tot_rite = tot_comp = ZERO;
} }
tot_somme += rp->somme; tot_somme += rp->somme;
tot_rite += rp->rite; tot_rite += rp->rite;
tot_impo += rp->impo; tot_impo += rp->impo;
tot_comp += rp->comp; tot_comp += rp->comp;
if (bInps)
rTotQCInps += rQCInps; rTotQCInps += rQCInps;
if (tipoa_p != tipoa || codanag != codanag_p) if (tipoa_p != tipoa || codanag != codanag_p)

View File

@ -88,7 +88,7 @@ BEGIN
FLAGS "Z" FLAGS "Z"
WARNING "Manca la causale" WARNING "Manca la causale"
FIELD LF_QUAD->CODCAUS FIELD LF_QUAD->CODCAUS
ADD RUN 773 -3 %CA7 ADD RUN 773mod -3 %CA7
END END
STRING QDF_CODCAUSD 1 STRING QDF_CODCAUSD 1

View File

@ -86,7 +86,7 @@ BEGIN
FLAGS "Z" FLAGS "Z"
WARNING "Manca la causale" WARNING "Manca la causale"
FIELD LF_QUAC->CODCAUS FIELD LF_QUAC->CODCAUS
ADD RUN 773 -3 %CA7 ADD RUN 773mod -3 %CA7
END END
STRING F_DESCRCAUS 58 STRING F_DESCRCAUS 58

View File

@ -83,7 +83,7 @@ BEGIN
FLAGS "Z" FLAGS "Z"
WARNING "Manca la causale" WARNING "Manca la causale"
FIELD LF_QUAE->CODCAUS FIELD LF_QUAE->CODCAUS
ADD RUN 773 -3 %CA7 ADD RUN 773mod -3 %CA7
END END
STRING F_DESCRCAUS 58 STRING F_DESCRCAUS 58

View File

@ -10,8 +10,7 @@ END
BUTTON F_PROSPETTO 21 2 BUTTON F_PROSPETTO 21 2
BEGIN BEGIN
PROMPT -23 -3 "~Prospetto" PROMPT -23 -3 "~Prospetto"
// MESSAGE RUN,7783,771230m,89,"Prospetto del Quadro E1","E1" MESSAGE RUN,773mod,-1,771230m,89,"Prospetto del Quadro E1","E1"
MESSAGE RUN,773,-1,771230m,89,"Prospetto del Quadro E1","E1"
END END
#include <toolbar.h> #include <toolbar.h>

View File

@ -83,7 +83,7 @@ BEGIN
FLAGS "Z" FLAGS "Z"
WARNING "Manca la causale" WARNING "Manca la causale"
FIELD LF_QUAE1->CODCAUS FIELD LF_QUAE1->CODCAUS
ADD RUN 773 -3 %CA7 ADD RUN 773mod -3 %CA7
END END
STRING F_DESCRCAUS 58 STRING F_DESCRCAUS 58

View File

@ -64,7 +64,7 @@ BEGIN
FLAGS "Z" FLAGS "Z"
WARNING "Manca la causale" WARNING "Manca la causale"
FIELD LF_PROSPE1->CODCAUS FIELD LF_PROSPE1->CODCAUS
ADD RUN 773 -3 %CA7 ADD RUN 773mod -3 %CA7
KEY 1 KEY 1
GROUP 9 GROUP 9
MESSAGE COPY,PE1F_CODCAUS MESSAGE COPY,PE1F_CODCAUS

View File

@ -219,7 +219,7 @@ BEGIN
FLAGS "Z" FLAGS "Z"
WARNING "Manca la causale" WARNING "Manca la causale"
CHECKTYPE NORMAL CHECKTYPE NORMAL
ADD RUN 773 -3 %CA7 ADD RUN 773mod -3 %CA7
FIELD LF_QUAF->F_CODCAUS FIELD LF_QUAF->F_CODCAUS
END END

View File

@ -17,7 +17,7 @@ BEGIN
OUTPUT 103 R0 OUTPUT 103 R0
FLAGS "Z" FLAGS "Z"
WARNING "Manca la causale" WARNING "Manca la causale"
ADD RUN 773 -3 %CA7 ADD RUN 773mod -3 %CA7
GROUP 1 GROUP 1
END END

View File

@ -17,7 +17,7 @@ BEGIN
OUTPUT 103 R0 OUTPUT 103 R0
FLAGS "Z" FLAGS "Z"
WARNING "Manca la causale" WARNING "Manca la causale"
ADD RUN 773 -3 %CA7 ADD RUN 773mod -3 %CA7
GROUP 1 GROUP 1
END END

View File

@ -17,7 +17,7 @@ BEGIN
OUTPUT 103 R0 OUTPUT 103 R0
FLAGS "Z" FLAGS "Z"
WARNING "Manca la causale" WARNING "Manca la causale"
ADD RUN 773 -3 %CA7 ADD RUN 773mod -3 %CA7
GROUP 1 GROUP 1
END END

View File

@ -17,7 +17,7 @@ BEGIN
FLAGS "Z" FLAGS "Z"
WARNING "Manca la causale" WARNING "Manca la causale"
VALIDATE REQIF_FUNC 6 102 103 104 105 VALIDATE REQIF_FUNC 6 102 103 104 105
ADD RUN 773 -3 %CA7 ADD RUN 773mod -3 %CA7
GROUP 1 GROUP 1
END END

View File

@ -161,44 +161,9 @@ bool M71310_application::auto_premi(TMask_field& f, KEY k)
{ {
if (k == K_TAB && f.mask().is_running()) if (k == K_TAB && f.mask().is_running())
{ {
// TLocalisamfile qual (LF_QUAL,FALSE);
TRelation* rel = app()._rel; TRelation* rel = app()._rel;
TMask& m = f.mask(); TMask& m = f.mask();
m.autosave(rel); m.autosave(rel);
/* long codditta = m.get_long(F_CODDITTA);
TDate datavers (m.get(F_QLDATAVERS));
TString data = datavers.string();
int mesepag = m.get_int(F_QLMESEPAG);
int annopag = m.get_int(F_QLANNOPAG);
char luovers = m.get (F_QLLUOVERS)[0];
char tipovers = m.get (F_QLTIPOVERS)[0];
long codtrib = m.get_long(F_QLCODTRIB);
int artbil = m.get_int(F_ARTBIL);
TString serie(m.get(FH_ABISERIE));
TString numero(m.get(FH_NUMERO)); */
// TString cab(m.get(FH_CAB));
// TString nprog(m.get(FH_NPROG));
// Se abi/cab devo attaccare al cab il progressivo vers.banca
// if (tipovers == DELEGA_BANCARIA)
// numero << nprog;
/*
qual.setkey(1);
qual.zero();
qual.put(QUL_CODDITTA, codditta);
qual.put(QUL_QLDV, datavers);
qual.put(QUL_QLMP, mesepag);
qual.put(QUL_QLAP, annopag);
qual.put(QUL_QLLV, luovers);
qual.put(QUL_QLTV, tipovers);
qual.put(QUL_QLCT, (long)codtrib);
qual.put(QUL_QLAB, (long)artbil);
qual.put(QUL_QLSERIE, serie);
qual.put(QUL_QLNUMERO, numero); */
// if (qual.read() == NOERR)
if (rel->read() == NOERR) if (rel->read() == NOERR)
f.mask().stop_run(K_AUTO_ENTER); f.mask().stop_run(K_AUTO_ENTER);
else else

View File

@ -198,6 +198,7 @@ NUMBER F_ABI 5
BEGIN BEGIN
PROMPT 23 10 "" PROMPT 23 10 ""
FIELD LF_QUAL->QLSERIE FIELD LF_QUAL->QLSERIE
FLAGS "Z"
GROUP ABI_CAB GROUP ABI_CAB
KEY 1 KEY 1
END END
@ -206,6 +207,7 @@ NUMBER F_CAB1 5
BEGIN BEGIN
PROMPT 63 10 "" PROMPT 63 10 ""
FIELD LF_QUAL->QLNUMERO[1,5] FIELD LF_QUAL->QLNUMERO[1,5]
FLAGS "Z"
GROUP ABI_CAB GROUP ABI_CAB
KEY 1 KEY 1
END END

View File

@ -1,3 +1,4 @@
// 773100 - Parametri di studio 770
#include <confapp.h> #include <confapp.h>
class M73_App : public TConfig_application class M73_App : public TConfig_application

View File

@ -20,8 +20,11 @@ BEGIN
DISPLAY "Codice Causale" CODTAB DISPLAY "Codice Causale" CODTAB
DISPLAY "Descrizione@60" S0 DISPLAY "Descrizione@60" S0
OUTPUT F_CODCAU1015 CODTAB OUTPUT F_CODCAU1015 CODTAB
CHECKTYPE NORMAL
WARNING "Causale non valida"
FIELD CoCa1015 FIELD CoCa1015
FLAGS "RZ" FLAGS "Z"
ADD RUN 773mod -3 %ca7
END END
LIST F_FSTAMPAQL 35 LIST F_FSTAMPAQL 35

26
m770/773mod.url Executable file
View File

@ -0,0 +1,26 @@
#include <default.url>
MENU TASK_MENUBAR
SUBMENU MENU_FILE "~File"
MENUBAR MENU_BAR(1)
MENU MENU_BAR(1)
SUBMENU MENU_FILE "~File"
MENUBAR MENU_BAR(2)
MENU MENU_BAR(2)
SUBMENU MENU_FILE "~File"
MENUBAR MENU_BAR(3)
MENU MENU_BAR(3)
SUBMENU MENU_FILE "~File"
MENUBAR MENU_BAR(4)
MENU MENU_BAR(4)
SUBMENU MENU_FILE "~File"

View File

@ -191,14 +191,19 @@ bool TGenera::azzera_quadroL()
TLocalisamfile ql(LF_QUAL); TLocalisamfile ql(LF_QUAL);
TProgind progn(ql.items(), "Azzeramento quadro L", FALSE, TRUE); TProgind progn(ql.items(), "Azzeramento quadro L", FALSE, TRUE);
for (ql.first(); !ql.eof(); ql.next(), progn.addstatus(1)) for (ql.first(_lock); !ql.eof(); ql.next(_lock))
{ {
progn.addstatus(1);
const long codditta = ql.get_long(QUL_CODDITTA); const long codditta = ql.get_long(QUL_CODDITTA);
if (codditta != dittafirm) continue; if (codditta != dittafirm) continue;
// 21.12.95 Azzera solo quelli dell'anno dichiarazione // 21.12.95 Azzera solo quelli dell'anno dichiarazione
const int ap = ql.get_int(QUL_QLAP); const int ap = ql.get_int(QUL_QLAP);
if (ap != _annodic) continue; if (ap != _annodic)
{
ql.reread(_unlock);
continue;
}
quadro = ql.get(QUL_QLCODQUA); quadro = ql.get(QUL_QLCODQUA);
if (quadro == "C" || quadro == "D" || quadro == "D1" if (quadro == "C" || quadro == "D" || quadro == "D1"

View File

@ -1935,7 +1935,6 @@ void TRiporti::calcola_riporti_G1 (TCursor* cur, const long dich)
i27_1 = i27_2 = i27_3 = i27_4 = i27_5 = ZERO; i27_1 = i27_2 = i27_3 = i27_4 = i27_5 = ZERO;
(*cur) = 0L; (*cur) = 0L;
TRecnotype items = cur->items(); TRecnotype items = cur->items();
almeno_una_riga = items > 0L;
i27_1 = cur->curr().get_real(QG1_P12TOT); i27_1 = cur->curr().get_real(QG1_P12TOT);
i27_2 = cur->curr().get_real(QG1_P13TOT); i27_2 = cur->curr().get_real(QG1_P13TOT);
@ -1943,6 +1942,8 @@ void TRiporti::calcola_riporti_G1 (TCursor* cur, const long dich)
i27_4 = cur->curr().get_real(QG1_P16TOT); i27_4 = cur->curr().get_real(QG1_P16TOT);
i27_5 = cur->curr().get_real(QG1_P17TOT); i27_5 = cur->curr().get_real(QG1_P17TOT);
almeno_una_riga = (i27_1 != ZERO) || (i27_2 != ZERO) || (i27_3 != ZERO) ||
(i27_4 != ZERO) || (i27_5 != ZERO);
TString scritta(60); TString scritta(60);
scritta.format("Calcolo riporti del quadro G-1 per la ditta %ld", _codditta); scritta.format("Calcolo riporti del quadro G-1 per la ditta %ld", _codditta);
TProgind progn(items, scritta, FALSE, TRUE); TProgind progn(items, scritta, FALSE, TRUE);

View File

@ -77,7 +77,7 @@ BEGIN
PROMPT 1 7 "" PROMPT 1 7 ""
PICTURE 123 PICTURE 123
GROUP 1 GROUP 1
MESSAGE RUN,773,-1,771150a,45,"Anagrafica dipendenti",/uPRASSI MESSAGE RUN,773mod,-1,771150a,45,"Anagrafica dipendenti",/uPRASSI
END END
TEXT DLG_NULL TEXT DLG_NULL
@ -218,7 +218,7 @@ BUTTON DLG_STOPREC_B 1 1
BEGIN BEGIN
PROMPT 1 14 "" PROMPT 1 14 ""
PICTURE 123 PICTURE 123
MESSAGE RUN,773,-4,77qb,59,"Quadro B","B"|K_TAB,RILEGGI_QUADRI MESSAGE RUN,773mod,-4,77qb,59,"Quadro B","B"|K_TAB,RILEGGI_QUADRI
GROUP 1 GROUP 1
END END
@ -232,7 +232,7 @@ BUTTON DLG_STOPREC_B1 1 1
BEGIN BEGIN
PROMPT 1 15 "" PROMPT 1 15 ""
PICTURE 123 PICTURE 123
MESSAGE RUN,773,-4,77qb1,60,"Quadro B1","B1"|K_TAB,RILEGGI_QUADRI MESSAGE RUN,773mod,-4,77qb1,60,"Quadro B1","B1"|K_TAB,RILEGGI_QUADRI
GROUP 1 GROUP 1
END END
@ -460,7 +460,7 @@ BUTTON DLG_STOPREC_N 1 1
BEGIN BEGIN
PROMPT 39 16 "" PROMPT 39 16 ""
PICTURE 123 PICTURE 123
MESSAGE RUN,773,-2,77qn,72,"Quadro N","N"|K_TAB,RILEGGI_QUADRI MESSAGE RUN,773mod,-2,77qn,72,"Quadro N","N"|K_TAB,RILEGGI_QUADRI
GROUP 1 GROUP 1
END END
// Fine terza colonna // Fine terza colonna
@ -476,7 +476,7 @@ BUTTON DLG_STOPREC_P 1 1
BEGIN BEGIN
PROMPT 58 10 "" PROMPT 58 10 ""
PICTURE 123 PICTURE 123
MESSAGE RUN,773,-2,77qp,73,"Quadro P","P"|K_TAB,RILEGGI_QUADRI MESSAGE RUN,773mod,-2,77qp,73,"Quadro P","P"|K_TAB,RILEGGI_QUADRI
GROUP 1 GROUP 1
END END
@ -489,7 +489,7 @@ END
BUTTON DLG_STOPREC_Q 1 1 BUTTON DLG_STOPREC_Q 1 1
BEGIN BEGIN
PROMPT 58 11 "" PROMPT 58 11 ""
MESSAGE RUN,773,-2,77qq,74,"Quadro Q","Q"|K_TAB,RILEGGI_QUADRI MESSAGE RUN,773mod,-2,77qq,74,"Quadro Q","Q"|K_TAB,RILEGGI_QUADRI
PICTURE 123 PICTURE 123
GROUP 1 GROUP 1
END END
@ -504,7 +504,7 @@ BUTTON DLG_STOPREC_R 1 1
BEGIN BEGIN
PROMPT 58 12 "" PROMPT 58 12 ""
PICTURE 123 PICTURE 123
MESSAGE RUN,773,-2,77qr,75,"Quadro R","R"|K_TAB,RILEGGI_QUADRI MESSAGE RUN,773mod,-2,77qr,75,"Quadro R","R"|K_TAB,RILEGGI_QUADRI
GROUP 1 GROUP 1
END END
@ -518,7 +518,7 @@ BUTTON DLG_STOPREC_S 1 1
BEGIN BEGIN
PROMPT 58 13 "" PROMPT 58 13 ""
PICTURE 123 PICTURE 123
MESSAGE RUN,773,-2,77qs,76,"Quadro S","S"|K_TAB,RILEGGI_QUADRI MESSAGE RUN,773mod,-2,77qs,76,"Quadro S","S"|K_TAB,RILEGGI_QUADRI
GROUP 1 GROUP 1
END END
@ -532,7 +532,7 @@ BUTTON DLG_STOPREC_T 1 1
BEGIN BEGIN
PROMPT 58 14 "" PROMPT 58 14 ""
PICTURE 123 PICTURE 123
MESSAGE RUN,773,-2,77qt,77,"Quadro T","T"|K_TAB,RILEGGI_QUADRI MESSAGE RUN,773mod,-2,77qt,77,"Quadro T","T"|K_TAB,RILEGGI_QUADRI
GROUP 1 GROUP 1
END END
// Fine QUARTA colonna // Fine QUARTA colonna
@ -663,7 +663,7 @@ BUTTON DLG_STOPREC_SOCTRA 1 1
BEGIN BEGIN
PROMPT 1 12 "" PROMPT 1 12 ""
PICTURE 123 PICTURE 123
MESSAGE RUN,773,-1,771100h,102,"Manutenzione dati societa' trasformate" MESSAGE RUN,773mod,-1,771100h,102,"Manutenzione dati societa' trasformate"
FLAGS "H" FLAGS "H"
GROUP 2 GROUP 2
END END

View File

@ -23,7 +23,6 @@ class TParametri_genera : public TApplication
int _risposta; int _risposta;
bool init_print(); bool init_print();
protected: protected:
static bool ProgBancaHnd(TMask_field& f, KEY k);
virtual void on_config_change(); virtual void on_config_change();
virtual bool create() ; virtual bool create() ;
virtual bool destroy(); virtual bool destroy();
@ -42,32 +41,11 @@ void TParametri_genera::on_config_change()
_anno_dic = (int)conf.get_long(ANNO_SEL, _section); _anno_dic = (int)conf.get_long(ANNO_SEL, _section);
} }
// Copia su NUMERO CAB+PROGBANCA
bool TParametri_genera::ProgBancaHnd(TMask_field& f, KEY k)
{
TMask& m = f.mask();
if (k == K_TAB && m.is_running())
{
char tipov = m.get(F_TIPOVERS)[0];
TString cab(m.get(F_CAB));
TString prg(m.get(F_PROGBANCA));
TString numero;
if (tipov == DELEGA_BANCARIA)
{
numero = cab;
numero << prg;
m.set(FH_NUMERO, numero);
}
}
return TRUE;
}
bool TParametri_genera::main_loop() bool TParametri_genera::main_loop()
{ {
KEY tasto; KEY tasto;
TMask msk ("776500a"); TMask msk ("776500a");
msk.set_handler(F_CAB, ProgBancaHnd);
msk.set_handler(F_PROGBANCA, ProgBancaHnd);
long codditta, codditta_prec; long codditta, codditta_prec;
int i = 0; int i = 0;

View File

@ -110,32 +110,23 @@ NUMBER F_ABI 5
BEGIN BEGIN
PROMPT 18 13 "" PROMPT 18 13 ""
FIELD LF_BASE->SERIE FIELD LF_BASE->SERIE
FLAGS "RZ" FLAGS "Z"
GROUP ABI_CAB GROUP ABI_CAB
END END
STRING FH_NUMERO 11
BEGIN
PROMPT 0 1 ""
FLAGS "D"
KEY 1
FIELD LF_BASE->NUMERO
END
NUMBER F_CAB 5 NUMBER F_CAB 5
BEGIN BEGIN
PROMPT 63 13 "" PROMPT 63 13 ""
// FIELD LF_BASE->NUMERO FIELD LF_BASE->NUMERO[1,5]
// MESSAGE COPY,FH_NUMERO FLAGS "Z"
FLAGS "RZ"
GROUP ABI_CAB GROUP ABI_CAB
END END
NUMBER F_PROGBANCA 6 NUMBER F_PROGBANCA 6
BEGIN BEGIN
PROMPT 69 13 "" PROMPT 69 13 ""
FLAGS "RZ" FLAGS "Z"
// MESSAGE ADD,FH_NUMERO FIELD LF_BASE->NUMERO[6,11]
GROUP ABI_CAB GROUP ABI_CAB
END END

View File

@ -80,7 +80,7 @@ BEGIN
FLAGS "Z" FLAGS "Z"
WARNING "Manca la causale" WARNING "Manca la causale"
FIELD LF_QUAE2->CODCAUS FIELD LF_QUAE2->CODCAUS
ADD RUN 773 -3 %CA7 ADD RUN 773mod -3 %CA7
END END
STRING F_DESCRCAUS 60 STRING F_DESCRCAUS 60

5
m770/caus77.h Executable file
View File

@ -0,0 +1,5 @@
// caus77.h - campi tabella causali
#define bCONTRIBUTO_INPS "B4"
#define bCODICE_QUADRO "S1"
#define bSOMME_ASSOG_RAC "B0"
#define rPERC_RAC "R0"

View File

@ -35,7 +35,6 @@ class TQuadriBB1_application : public TRelation_application
bool _MaskConAnnoDic, _MaskConCodditta; bool _MaskConAnnoDic, _MaskConCodditta;
bool MaskConAnnoDic() const; bool MaskConAnnoDic() const;
bool MaskConCodditta() const { return _MaskConCodditta; } bool MaskConCodditta() const { return _MaskConCodditta; }
bool EsisteUnRec();
bool QuadroB() const { return _num == LF_QUAB; } bool QuadroB() const { return _num == LF_QUAB; }
bool QuadroB1() const { return _num == LF_QUAB1; } bool QuadroB1() const { return _num == LF_QUAB1; }
bool CheckImporti(const TMask& m); bool CheckImporti(const TMask& m);
@ -47,6 +46,7 @@ class TQuadriBB1_application : public TRelation_application
protected: protected:
virtual bool user_create(); virtual bool user_create();
virtual bool user_destroy(); virtual bool user_destroy();
// virtual int read(TMask& m);
virtual int rewrite(const TMask& m); virtual int rewrite(const TMask& m);
virtual int write (const TMask& m); virtual int write (const TMask& m);
virtual bool remove(); virtual bool remove();
@ -145,8 +145,6 @@ TMask* TQuadriBB1_application::load_mask(int n)
switch (n) switch (n)
{ {
case 0: case 0:
if (m)
{}
break; break;
case 1: case 1:
if (m) if (m)
@ -191,19 +189,6 @@ bool TQuadriBB1_application::user_create()
return TRUE; return TRUE;
} }
bool TQuadriBB1_application::EsisteUnRec()
{
TLocalisamfile q(_num);
q.zero();
q.put(QB_CODDITTA, (long)app()._codditta);
TRectype dep(q.curr());
q.read(_isgteq);
if (q.curr() > dep || q.eof())
return FALSE;
else
return TRUE;
}
bool TQuadriBB1_application::user_destroy() bool TQuadriBB1_application::user_destroy()
{ {
if (_quadro != "") if (_quadro != "")
@ -257,6 +242,21 @@ int TQuadriBB1_application::rewrite(const TMask& m)
_registra = err == NOERR; _registra = err == NOERR;
return err; return err;
} }
/*
int TQuadriBB1_application::read(TMask& m)
{
int err;
TLocalisamfile q(_num);
const long codip = m.get_long(QuadroB()? QBF_CODDIP : QB1F_CODDIP);
const long nprog = m.get_long(QuadroB()? QBF_NPROG : QB1F_NPROG);
q.zero();
q.put(QB_CODDITTA, _codditta);
q.put(QB_CODDIP, codip);
q.put(QB_NPROG, nprog);
err = q.read();
err = _rel->read();
return err;
} */
int TQuadriBB1_application::write(const TMask& m) int TQuadriBB1_application::write(const TMask& m)
{ {
@ -312,18 +312,10 @@ void TQuadriBB1_application::init_insert_mode(TMask& m)
void TQuadriBB1_application::init_query_mode(TMask& m) void TQuadriBB1_application::init_query_mode(TMask& m)
{ {
m.set(ANNODIC77, _anno_dic); m.set(ANNODIC77, _anno_dic);
/* m.send_key(K_SHIFT+K_CTRL+'s', -RICERCA_QB); // Ricerca su quadro B
m.send_key(K_SHIFT+K_CTRL+'h', -RICERCA_DIP); // Ricerca su ANAGR.DIP.
init_mask(m);*/
} }
void TQuadriBB1_application::init_query_insert_mode(TMask& m) void TQuadriBB1_application::init_query_insert_mode(TMask& m)
{ {}
/*
m.send_key(K_SHIFT+K_CTRL+'h', -RICERCA_QB); // Nasconde ricerca su quadro B
m.send_key(K_SHIFT+K_CTRL+'s', -RICERCA_DIP); // Ricerca su ANAGR.DIP.
init_mask(m); */
}
bool TQuadriBB1_application::codditta77_handler(TMask_field& f, KEY k) bool TQuadriBB1_application::codditta77_handler(TMask_field& f, KEY k)
{ {
@ -376,8 +368,10 @@ bool TQuadriBB1_application::CodDipHandler(TMask_field& f, KEY k)
const long codip = atol(f.get()); const long codip = atol(f.get());
if (codip==0L) if (codip==0L)
return TRUE; return TRUE;
if (!esiste_dipendente(app()._codditta, codip)) if (!esiste_dipendente(app()._codditta, codip))
return f.warning_box("Dipendente inesistente"); return f.warning_box("Dipendente inesistente");
PrimoNprogLibero(m, app()._codditta, codip); PrimoNprogLibero(m, app()._codditta, codip);
} }
return TRUE; return TRUE;
@ -388,7 +382,6 @@ bool TQuadriBB1_application::NprogExitHandler(TMask_field& f, KEY k)
TMask& m = f.mask(); TMask& m = f.mask();
if (!m.is_running()) return TRUE; if (!m.is_running()) return TRUE;
// if (k == K_TAB && ricerca(m))
if (k == K_TAB) if (k == K_TAB)
{ {
TString nprog(f.get()); TString nprog(f.get());