diff --git a/lv/lv0400.cpp b/lv/lv0400.cpp index 960555f17..6df07e4cb 100755 --- a/lv/lv0400.cpp +++ b/lv/lv0400.cpp @@ -286,9 +286,12 @@ bool TContratti_msk::on_art_select(TField_event e) int ppconf = anamag.get_int(ANAMAG_PPCONF); real cosrotti = anamag.get_real(ANAMAG_ULTCOS1); rowmask.set(S_PPCONF, ppconf); - rowmask.set(S_PREZDAN, cosrotti); row.add(ppconf, ss.cid2index(S_PPCONF)); - row.add(cosrotti.string(), ss.cid2index(S_PREZDAN)); + if (rowmask.get(S_PREZDAN).empty()) + { + rowmask.set(S_PREZDAN, cosrotti); + row.add(cosrotti.string(), ss.cid2index(S_PREZDAN)); + } //ciclo i dati di interesse della riga selezionata nel dettaglio //sulla maschera principale diff --git a/lv/lv0400a.uml b/lv/lv0400a.uml index 264cf4681..ccd9406a3 100755 --- a/lv/lv0400a.uml +++ b/lv/lv0400a.uml @@ -49,6 +49,7 @@ BEGIN INPUT CODCF F_CODCF DISPLAY "Codice" CODCF DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV OUTPUT F_CODCF CODCF OUTPUT F_RAGSOC RAGSOC OUTPUT F_RICALT RICALT @@ -115,6 +116,7 @@ BEGIN INPUT TIPOCF "C" INPUT RAGSOC F_RAGSOC DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV DISPLAY "Codice" CODCF COPY OUTPUT F_CODCF CHECKTYPE REQUIRED diff --git a/lv/lv0400c.uml b/lv/lv0400c.uml index 1f240ad84..c5e49bc82 100755 --- a/lv/lv0400c.uml +++ b/lv/lv0400c.uml @@ -21,6 +21,7 @@ BEGIN INPUT CODCF F_CODCF DISPLAY "Codice" CODCF DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV OUTPUT F_CODCF CODCF OUTPUT F_RAGSOC RAGSOC CHECKTYPE REQUIRED @@ -35,6 +36,7 @@ BEGIN INPUT TIPOCF "C" INPUT RAGSOC F_RAGSOC DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV DISPLAY "Codice" CODCF COPY OUTPUT F_CODCF CHECKTYPE REQUIRED diff --git a/lv/lv0400f.uml b/lv/lv0400f.uml index 77cd275cb..a0c87a573 100755 --- a/lv/lv0400f.uml +++ b/lv/lv0400f.uml @@ -21,6 +21,7 @@ BEGIN INPUT CODCF F_DACODCF DISPLAY "Codice" CODCF DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV OUTPUT F_DACODCF CODCF OUTPUT F_DARAGSOC RAGSOC CHECKTYPE REQUIRED @@ -35,6 +36,7 @@ BEGIN INPUT TIPOCF "C" INPUT RAGSOC F_DARAGSOC DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV DISPLAY "Codice" CODCF COPY OUTPUT F_DACODCF CHECKTYPE REQUIRED @@ -50,6 +52,7 @@ BEGIN INPUT CODCF F_ACODCF DISPLAY "Codice" CODCF DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV OUTPUT F_ACODCF CODCF OUTPUT F_ARAGSOC RAGSOC CHECKTYPE REQUIRED @@ -64,6 +67,7 @@ BEGIN INPUT TIPOCF "C" INPUT RAGSOC F_ARAGSOC DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV DISPLAY "Codice" CODCF COPY OUTPUT F_ACODCF CHECKTYPE REQUIRED diff --git a/lv/lv0400g.uml b/lv/lv0400g.uml index b9b876179..0dcf12351 100755 --- a/lv/lv0400g.uml +++ b/lv/lv0400g.uml @@ -21,6 +21,7 @@ BEGIN INPUT CODCF F_DACODCF DISPLAY "Codice" CODCF DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV OUTPUT F_DACODCF CODCF OUTPUT F_DARAGSOC RAGSOC CHECKTYPE REQUIRED @@ -35,6 +36,7 @@ BEGIN INPUT TIPOCF "C" INPUT RAGSOC F_DARAGSOC DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV DISPLAY "Codice" CODCF COPY OUTPUT F_DACODCF CHECKTYPE REQUIRED @@ -50,6 +52,7 @@ BEGIN INPUT CODCF F_ACODCF DISPLAY "Codice" CODCF DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV OUTPUT F_ACODCF CODCF OUTPUT F_ARAGSOC RAGSOC CHECKTYPE REQUIRED @@ -64,6 +67,7 @@ BEGIN INPUT TIPOCF "C" INPUT RAGSOC F_ARAGSOC DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV DISPLAY "Codice" CODCF COPY OUTPUT F_ACODCF CHECKTYPE REQUIRED diff --git a/lv/lv0600a.uml b/lv/lv0600a.uml index 242f8b663..619667a4c 100755 --- a/lv/lv0600a.uml +++ b/lv/lv0600a.uml @@ -21,6 +21,7 @@ BEGIN INPUT CODCF F_CODCF_DA DISPLAY "Codice" CODCF DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV OUTPUT F_CODCF_DA CODCF OUTPUT F_RAGSOC_DA RAGSOC CHECKTYPE SEARCH @@ -35,6 +36,7 @@ BEGIN INPUT TIPOCF "C" INPUT RAGSOC F_RAGSOC_DA DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV DISPLAY "Codice" CODCF COPY OUTPUT F_CODCF_DA END @@ -48,6 +50,7 @@ BEGIN INPUT CODCF F_CODCF_A DISPLAY "Codice" CODCF DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV OUTPUT F_CODCF_A CODCF OUTPUT F_RAGSOC_A RAGSOC CHECKTYPE SEARCH @@ -61,6 +64,7 @@ BEGIN INPUT TIPOCF "C" INPUT RAGSOC F_RAGSOC_A DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV DISPLAY "Codice" CODCF OUTPUT F_CODCF_A CODCF OUTPUT F_RAGSOC_A RAGSOC diff --git a/lv/lv0700a.uml b/lv/lv0700a.uml index 749201262..b2f4cc02d 100755 --- a/lv/lv0700a.uml +++ b/lv/lv0700a.uml @@ -23,6 +23,7 @@ BEGIN INPUT CODCF 201 DISPLAY "Codice" CODCF DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV OUTPUT 201 CODCF OUTPUT 202 RAGSOC CHECKTYPE REQUIRED @@ -36,6 +37,7 @@ BEGIN INPUT TIPOCF "C" INPUT RAGSOC 202 DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV DISPLAY "Codice" CODCF COPY OUTPUT 201 FIELD #F_RAGSOC @@ -48,7 +50,8 @@ STRING 203 20 USE 47 INPUT CODART 203 DISPLAY "Codice@20" CODART - DISPAY "Descrizione@50" DESCR + DISPLAY "Descrizione@50" DESCR + DISPLAY "Partita IVA@11" PAIV OUTPUT 203 CODART OUTPUT 204 DESCR FIELD #F_CODART @@ -62,8 +65,9 @@ BE PR 2 4 "Descrizione " USE 47 KEY 2 INPUT DESCR 204 + DISPLAY "Descrizione@50" DESCR + DISPLAY "Partita IVA@11" PAIV DISPLAY "Codice@20" CODART - DISPALY "Descrizione@50" DESCR OUTPUT 203 CODART OUTPUT 204 DESCR FIELD #F_DESART diff --git a/lv/lv2400a.uml b/lv/lv2400a.uml index 2d58a86b2..0d47e3250 100755 --- a/lv/lv2400a.uml +++ b/lv/lv2400a.uml @@ -78,7 +78,7 @@ BEGIN PROMPT 23 6 "" USE &AUT KEY 2 INPUT S0 F_DESCRAUT - DISPLAY "Descrizione@50" S0 + DISPLAY "Descrizione@70" S0 DISPLAY "Codice" CODTAB OUTPUT F_CODAUT CODTAB OUTPUT F_DESCRAUT S0 @@ -94,6 +94,7 @@ BEGIN INPUT CODCF F_CODCF DISPLAY "Codice " CODCF DISPLAY "Ragione sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV OUTPUT F_CODCF CODCF OUTPUT F_RAGSOCCLI RAGSOC CHECKTYPE NORMAL @@ -106,6 +107,7 @@ BEGIN INPUT TIPOCF "C" INPUT RAGSOC F_RAGSOCCLI DISPLAY "Ragione sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV DISPLAY "Codice" CODCF COPY OUTPUT F_CODCF CHECKTYPE NORMAL diff --git a/lv/lv2500a.uml b/lv/lv2500a.uml index d2155e532..d30623594 100755 --- a/lv/lv2500a.uml +++ b/lv/lv2500a.uml @@ -36,6 +36,7 @@ BEGIN INPUT CODCF F_DACODCF DISPLAY "Codice" CODCF DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV OUTPUT F_DACODCF CODCF OUTPUT F_DARAGSOC RAGSOC CHECKTYPE SEARCH @@ -50,6 +51,7 @@ BEGIN INPUT TIPOCF "C" INPUT RAGSOC F_DARAGSOC DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV DISPLAY "Codice" CODCF COPY OUTPUT F_DACODCF CHECKTYPE SEARCH @@ -66,6 +68,7 @@ BEGIN INPUT CODCF F_ACODCF DISPLAY "Codice" CODCF DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV OUTPUT F_ACODCF CODCF OUTPUT F_ARAGSOC RAGSOC CHECKTYPE SEARCH @@ -80,6 +83,7 @@ BEGIN INPUT TIPOCF "C" INPUT RAGSOC F_ARAGSOC DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV DISPLAY "Codice" CODCF COPY OUTPUT F_ACODCF CHECKTYPE SEARCH diff --git a/lv/lv2700a.uml b/lv/lv2700a.uml index b78024f1f..e3a4f70e6 100755 --- a/lv/lv2700a.uml +++ b/lv/lv2700a.uml @@ -20,6 +20,7 @@ BEGIN INPUT CODCF F_CODCF_DA DISPLAY "Codice" CODCF DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV OUTPUT F_CODCF_DA CODCF OUTPUT F_RAGSOC_DA RAGSOC CHECKTYPE SEARCH @@ -33,6 +34,7 @@ BEGIN INPUT TIPOCF "C" INPUT RAGSOC F_RAGSOC_DA DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV DISPLAY "Codice" CODCF COPY OUTPUT F_CODCF_DA CHECKTYPE SEARCH diff --git a/lv/lv2800a.uml b/lv/lv2800a.uml index 9b1809b53..10de4c262 100755 --- a/lv/lv2800a.uml +++ b/lv/lv2800a.uml @@ -21,6 +21,7 @@ BEGIN INPUT CODCF F_CODCF_DA DISPLAY "Codice" CODCF DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV OUTPUT F_CODCF_DA CODCF OUTPUT F_RAGSOC_DA RAGSOC FIELD #F_CODCF_FROM @@ -34,6 +35,7 @@ BEGIN INPUT TIPOCF "C" INPUT RAGSOC F_RAGSOC_DA DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV DISPLAY "Codice" CODCF OUTPUT F_CODCF_DA CODCF OUTPUT F_RAGSOC_DA RAGSOC @@ -49,6 +51,7 @@ BEGIN INPUT CODCF F_CODCF_A DISPLAY "Codice" CODCF DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV OUTPUT F_CODCF_A CODCF OUTPUT F_RAGSOC_A RAGSOC FIELD #F_CODCF_TO @@ -62,6 +65,7 @@ BEGIN INPUT TIPOCF "C" INPUT RAGSOC F_RAGSOC_A DISPLAY "Ragione Sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV DISPLAY "Codice" CODCF OUTPUT F_CODCF_A CODCF OUTPUT F_RAGSOC_A RAGSOC diff --git a/lv/lv2900a.uml b/lv/lv2900a.uml index 248dc14da..60f9af855 100755 --- a/lv/lv2900a.uml +++ b/lv/lv2900a.uml @@ -59,6 +59,7 @@ BEGIN INPUT CODCF F_CODCF DISPLAY "Codice " CODCF DISPLAY "Ragione sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV OUTPUT F_CODCF CODCF OUTPUT F_RAGSOC RAGSOC CHECKTYPE NORMAL @@ -69,8 +70,9 @@ BEGIN PROMPT 23 5 "" USE LF_CLIFO KEY 2 INPUT TIPOCF "C" - INPUT RAGSOC F_RAGSOCC + INPUT RAGSOC F_RAGSOC DISPLAY "Ragione sociale@50" RAGSOC + DISPLAY "Partita IVA@11" PAIV DISPLAY "Codice" CODCF COPY OUTPUT F_CODCF CHECKTYPE NORMAL