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

Patch level :10.0

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
modifiche per la IV direttiva


git-svn-id: svn://10.65.10.50/trunk@20266 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2010-03-23 17:06:47 +00:00
parent 216e75a17c
commit f29c1b50d5
4 changed files with 77 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cg/cg0100.cpp
View File

@ -211,6 +211,7 @@ void TPianoconti_app::init_insert_mode(TMask& m)
m.show(FLD_CM1_NUMRIVD, ivd_enable); m.show(FLD_CM1_NUMRIVD, ivd_enable);
m.show(FLD_CM1_NUMIVD, ivd_enable); m.show(FLD_CM1_NUMIVD, ivd_enable);
m.show(F_SUB, ivd_enable); m.show(F_SUB, ivd_enable);
m.show(F_SOTSUB, ivd_enable);
m.show(FLD_CM1_DESCIVD, ivd_enable); // m.show(FLD_CM1_DESCIVD, ivd_enable); //
if (!ivd_enable) if (!ivd_enable)
{ {
@ -218,7 +219,8 @@ void TPianoconti_app::init_insert_mode(TMask& m)
m.set(FLD_CM1_LETTIVDH, s2); m.set(FLD_CM1_LETTIVDH, s2);
m.set(FLD_CM1_NUMRIVDH, s3); m.set(FLD_CM1_NUMRIVDH, s3);
m.set(FLD_CM1_NUMIVDH, s4.left(2)); m.set(FLD_CM1_NUMIVDH, s4.left(2));
m.set(F_SUBH, s4.mid(2)); m.set(F_SUBH, s4.mid(2,2));
m.set(F_SOTSUBH, s4.mid(4,2));
m.set(FLD_CM1_DESCIVDH, s5); // m.set(FLD_CM1_DESCIVDH, s5); //
m.enable(FLD_CM1_SEZIVDOPP); m.enable(FLD_CM1_SEZIVDOPP);
m.disable(FLD_CM1_LETTIVDH); m.disable(FLD_CM1_LETTIVDH);
@ -230,6 +232,7 @@ void TPianoconti_app::init_insert_mode(TMask& m)
m.show(FLD_CM1_NUMRIVDH, !ivd_enable); m.show(FLD_CM1_NUMRIVDH, !ivd_enable);
m.show(FLD_CM1_NUMIVDH, !ivd_enable); m.show(FLD_CM1_NUMIVDH, !ivd_enable);
m.show(F_SUBH, !ivd_enable); m.show(F_SUBH, !ivd_enable);
m.show(F_SOTSUBH, !ivd_enable);
m.show(FLD_CM1_DESCIVDH, !ivd_enable); // m.show(FLD_CM1_DESCIVDH, !ivd_enable); //
if (s.empty()) if (s.empty())

25
cg/cg0100.h
View File

@ -26,18 +26,21 @@
#define FLD_CM1_DTIPOSPRIC 117 #define FLD_CM1_DTIPOSPRIC 117
#define F_SUB 118 #define F_SUB 118
#define F_SUBOPP 119 #define F_SUBOPP 119
#define F_SOTSUB 120
#define F_SOTSUBOPP 121
#define FLD_CM1_LETTIVDH 120 #define FLD_CM1_LETTIVDH 150
#define FLD_CM1_NUMRIVDH 121 #define FLD_CM1_NUMRIVDH 151
#define FLD_CM1_NUMIVDH 122 #define FLD_CM1_NUMIVDH 152
#define FLD_CM1_RICSER 123 #define FLD_CM1_RICSER 153
#define FLD_CM1_DESCRANALISI 124 #define FLD_CM1_DESCRANALISI 154
#define FLD_CM1_IVACOMP 125 #define FLD_CM1_IVACOMP 155
#define FLD_CM1_DESCIVACOMP 126 #define FLD_CM1_DESCIVACOMP 156
#define FLD_CM1_DESCIVD 127 #define FLD_CM1_DESCIVD 157
#define FLD_CM1_DESCIVDOPP 128 #define FLD_CM1_DESCIVDOPP 158
#define FLD_CM1_DESCIVDH 129 #define FLD_CM1_DESCIVDH 159
#define F_SUBH 130 #define F_SUBH 160
#define F_SOTSUBH 161
#define FLD_CM2_STSOTTBIL 200 #define FLD_CM2_STSOTTBIL 200
#define FLD_CM2_STSOTTAB 201 #define FLD_CM2_STSOTTAB 201

79
cg/cg0100a.uml
View File

@ -214,16 +214,18 @@ BEGIN
INPUT CODTAB[3,6] FLD_CM1_NUMRIVD INPUT CODTAB[3,6] FLD_CM1_NUMRIVD
INPUT CODTAB[7,8] FLD_CM1_NUMIVD INPUT CODTAB[7,8] FLD_CM1_NUMIVD
INPUT CODTAB[9,10] F_SUB INPUT CODTAB[9,10] F_SUB
INPUT CODTAB[11,12] F_SOTSUB
DISPLAY "Sezione" CODTAB[1,1] DISPLAY "Sezione" CODTAB[1,1]
DISPLAY "Lettera" CODTAB[2,2] DISPLAY "Lettera" CODTAB[2,2]
DISPLAY "Classe @M" CODTAB[3,6] DISPLAY "Classe @M" CODTAB[3,6]
DISPLAY "Numero" CODTAB[7,10] DISPLAY "Numero" CODTAB[7,12]
DISPLAY "Descrizione@50" S0 DISPLAY "Descrizione@50" S0
OUTPUT FLD_CM1_SEZIVD CODTAB[1,1] OUTPUT FLD_CM1_SEZIVD CODTAB[1,1]
OUTPUT FLD_CM1_LETTIVD CODTAB[2,2] OUTPUT FLD_CM1_LETTIVD CODTAB[2,2]
OUTPUT FLD_CM1_NUMRIVD CODTAB[3,6] OUTPUT FLD_CM1_NUMRIVD CODTAB[3,6]
OUTPUT FLD_CM1_NUMIVD CODTAB[7,8] OUTPUT FLD_CM1_NUMIVD CODTAB[7,8]
OUTPUT F_SUB CODTAB[9,10] OUTPUT F_SUB CODTAB[9,10]
OUTPUT F_SOTSUB CODTAB[11,12]
OUTPUT FLD_CM1_DESCIVD S0 OUTPUT FLD_CM1_DESCIVD S0
CHECKTYPE NORMAL CHECKTYPE NORMAL
WARNING "Codice non presente" WARNING "Codice non presente"
@ -238,27 +240,46 @@ END
LIST F_SUB 2 9 LIST F_SUB 2 9
BEGIN BEGIN
PROMPT 65 7 "" PROMPT 64 7 ""
GROUP 1 5 GROUP 1 5
ITEM " |" ITEM " |"
ITEM "02|Bis" ITEM "02|Bis"
ITEM "03|Ter" ITEM "03|Ter"
ITEM "04|Quater" ITEM "04|Quater"
ITEM "05|Quinquies" ITEM "05|Quinquies"
ITEM "06|Sexies" ITEM "06|Sexies"
FIELD NUMIVD[3,4] FIELD NUMIVD[3,4]
END END
LIST F_SUBH 2 9 LIST F_SUBH 2 9
BEGIN BEGIN
PROMPT 65 7 "" PROMPT 64 7 ""
GROUP 1 5 GROUP 1 5
ITEM " |" ITEM " |"
ITEM "02|Bis" ITEM "02|Bis"
ITEM "03|Ter" ITEM "03|Ter"
ITEM "04|Quater" ITEM "04|Quater"
ITEM "05|Quinquies" ITEM "05|Quinquies"
ITEM "06|Sexies" ITEM "06|Sexies"
FLAGS "H"
END
STRING F_SOTSUB 2
BEGIN
PROMPT 76 7 ""
GROUP 1 5
COPY USE FLD_CM1_NUMIVD
COPY INPUT FLD_CM1_NUMIVD
COPY DISPLAY FLD_CM1_NUMIVD
COPY OUTPUT FLD_CM1_NUMIVD
FIELD NUMIVD[5,6]
END
STRING F_SOTSUBH 2
BEGIN
PROMPT 76 7 ""
GROUP 1 5
FLAGS "H"
END END
STRING FLD_CM1_DESCIVD 70 50 STRING FLD_CM1_DESCIVD 70 50
@ -276,7 +297,6 @@ BEGIN
GROUP 1 5 GROUP 1 5
END END
STRING FLD_CM1_DESCIVDH 70 50 STRING FLD_CM1_DESCIVDH 70 50
BEGIN BEGIN
PROMPT 24 8 "" PROMPT 24 8 ""
@ -329,12 +349,14 @@ BEGIN
INPUT CODTAB[3,6] FLD_CM1_NUMRIVDOPP INPUT CODTAB[3,6] FLD_CM1_NUMRIVDOPP
INPUT CODTAB[7,8] FLD_CM1_NUMIVDOPP INPUT CODTAB[7,8] FLD_CM1_NUMIVDOPP
INPUT CODTAB[9,10] F_SUBOPP INPUT CODTAB[9,10] F_SUBOPP
INPUT CODTAB[11,12] F_SOTSUBOPP
COPY DISPLAY FLD_CM1_NUMIVD COPY DISPLAY FLD_CM1_NUMIVD
OUTPUT FLD_CM1_SEZIVDOPP CODTAB[1,1] OUTPUT FLD_CM1_SEZIVDOPP CODTAB[1,1]
OUTPUT FLD_CM1_LETTIVDOPP CODTAB[2,2] OUTPUT FLD_CM1_LETTIVDOPP CODTAB[2,2]
OUTPUT FLD_CM1_NUMRIVDOPP CODTAB[3,6] OUTPUT FLD_CM1_NUMRIVDOPP CODTAB[3,6]
OUTPUT FLD_CM1_NUMIVDOPP CODTAB[7,8] OUTPUT FLD_CM1_NUMIVDOPP CODTAB[7,8]
OUTPUT F_SUBOPP CODTAB[9,10] OUTPUT F_SUBOPP CODTAB[9,10]
OUTPUT F_SOTSUBOPP CODTAB[11,12]
OUTPUT FLD_CM1_DESCIVDOPP S0 OUTPUT FLD_CM1_DESCIVDOPP S0
CHECKTYPE NORMAL CHECKTYPE NORMAL
WARNING "Codice non presente" WARNING "Codice non presente"
@ -342,17 +364,28 @@ END
LIST F_SUBOPP 9 LIST F_SUBOPP 9
BEGIN BEGIN
PROMPT 65 9 "" PROMPT 64 9 ""
GROUP 1 2 4 7 GROUP 1 2 4 7
ITEM " |" ITEM " |"
ITEM "02|Bis" ITEM "02|Bis"
ITEM "03|Ter" ITEM "03|Ter"
ITEM "04|Quater" ITEM "04|Quater"
ITEM "05|Quinquies" ITEM "05|Quinquies"
ITEM "06|Sexies" ITEM "06|Sexies"
FIELD NUMIVDOPP[3,4] FIELD NUMIVDOPP[3,4]
END END
STRING F_SOTSUBOPP 2
BEGIN
PROMPT 76 9 ""
GROUP 1 2 4 7
COPY USE FLD_CM1_NUMIVDOPP
COPY INPUT FLD_CM1_NUMIVDOPP
COPY DISPLAY FLD_CM1_NUMIVDOPP
COPY OUTPUT FLD_CM1_NUMIVDOPP
FIELD NUMIVDOPP[5,6]
END
STRING FLD_CM1_DESCIVDOPP 70 50 STRING FLD_CM1_DESCIVDOPP 70 50
BEGIN BEGIN
PROMPT 24 10 "" PROMPT 24 10 ""

6
cg/cg1100.cpp
View File

@ -35,7 +35,7 @@ class CG1100_application : public TPrintapp
char sez; char sez;
char let; char let;
char numr[5]; char numr[5];
char num[5]; char num[7];
char gruppo[4]; char gruppo[4];
char conto[4]; char conto[4];
char sottoc[8]; char sottoc[8];
@ -43,7 +43,7 @@ class CG1100_application : public TPrintapp
char sez_opp; char sez_opp;
char let_opp; char let_opp;
char numr_opp[5]; char numr_opp[5];
char num_opp[5]; char num_opp[7];
}; };
bil_ivd* _bil; bil_ivd* _bil;
@ -193,7 +193,7 @@ void CG1100_application::set_bil_key(bil_ivd* b, char sezione, char lettera,
b->sez = sezione; b->sez = sezione;
b->let = lettera; b->let = lettera;
strcpy(b->numr, numero_romano); strcpy(b->numr, numero_romano);
sprintf(b->num , "%-4s", numero); sprintf(b->num , "%-6s", numero);
sprintf(b->gruppo , "%3d", gruppo); sprintf(b->gruppo , "%3d", gruppo);
sprintf(b->conto , "%3d", conto); sprintf(b->conto , "%3d", conto);
sprintf(b->sottoc , "%6ld", sottoconto); sprintf(b->sottoc , "%6ld", sottoconto);