diff --git a/ve/sconti.cpp b/ve/sconti.cpp index 4c07ba675..9e1074cbf 100755 --- a/ve/sconti.cpp +++ b/ve/sconti.cpp @@ -506,7 +506,7 @@ void TCond_vendita::ricerca(bool full_load) if (catven.not_empty()) { - TTable cve("%CVE"); + TTable cve("CVE"); cve.put("CODART", codage); if (cve.read() == NOERR) diff --git a/ve/ve0300a.src b/ve/ve0300a.src index 516b42637..32158abb0 100755 --- a/ve/ve0300a.src +++ b/ve/ve0300a.src @@ -587,7 +587,7 @@ TYPE=T_STRINGA PROMPT="C.vendita " SIZE=2 FLAG=U -USE=%CVE +USE=CVE INPUT=CODTAB F_CATVEN DISPLAY="Cat.Ven." CODTAB~"Descrizione@50" S0 OUTPUT=F_CATVEN CODTAB~F_DESCATVEN S0 @@ -630,8 +630,8 @@ FLAG=U USE=LF_CONDV SE CATVEN!="" INPUT=TIPO "L"~CATVEN F_CATVEN~COD F_CODLIST1 DISPLAY="Cat.Ven." LF_CONDV->CATVEN~"Codice" LF_CONDV->COD~"Descrizione@50" LF_CONDV->DESCR -OUTPUT=F_CATVEN LF_CONDV->CATVEN~F_DESCATVEN %CVE->S0~F_CODLIST1 LF_CONDV->COD~F_DESLIST LF_CONDV->DESCR -SPECIAL=ADD RUN ve2 -1 l~JOIN %CVE TO LF_CONDV INTO CODTAB=CATVEN~ME CO,F_CODLIST +OUTPUT=F_CATVEN LF_CONDV->CATVEN~F_DESCATVEN CVE->S0~F_CODLIST1 LF_CONDV->COD~F_DESLIST LF_CONDV->DESCR +SPECIAL=ADD RUN ve2 -1 l~JOIN CVE TO LF_CONDV INTO CODTAB=CATVEN~ME CO,F_CODLIST [DESLIST] GROUP=800 diff --git a/ve/ve2100i.uml b/ve/ve2100i.uml index 983a6ffbf..265e51de4 100755 --- a/ve/ve2100i.uml +++ b/ve/ve2100i.uml @@ -29,7 +29,7 @@ BEGIN FLAG "HU" KEY 1 USE LF_SCONTI SELECT CODCAT != "" - JOIN %CVE ALIAS 201 INTO CODTAB==CODCAT + JOIN CVE ALIAS 201 INTO CODTAB==CODCAT INPUT TIPO F_I_TIPO SELECT INPUT CODCAT F_I_CATVEN INPUT CODART[1,2] F_I_SCCLIENTI @@ -53,7 +53,7 @@ BEGIN FIELD CODCAT FLAG "U" KEY 1 - USE %CVE + USE CVE INPUT CODTAB F_I_CATVEN DISPLAY "Cat. vend." CODTAB DISPLAY "Descrizione@50" S0 diff --git a/ve/ve2100r.uml b/ve/ve2100r.uml index da52980ab..82374b7f8 100755 --- a/ve/ve2100r.uml +++ b/ve/ve2100r.uml @@ -20,7 +20,7 @@ BEGIN FLAG "HU" KEY 1 USE LF_SCONTI SELECT CODCAT != "" - JOIN %CVE ALIAS 201 INTO CODTAB==CODCAT + JOIN CVE ALIAS 201 INTO CODTAB==CODCAT INPUT TIPO F_R_TIPO SELECT INPUT CODCAT F_R_RICERCA INPUT CODART F_R_CODART @@ -54,7 +54,7 @@ BEGIN FIELD CODCAT FLAG "U" KEY 1 - USE %CVE + USE CVE INPUT CODTAB F_R_CODCAT DISPLAY "Codice" CODTAB DISPLAY "Descrizione@50" S0 @@ -77,7 +77,7 @@ BEGIN KEY 1 USE LF_SCONTI JOIN LF_ANAMAG INTO CODART==CODART - JOIN %CVE ALIAS 201 INTO CODTAB==CODCAT + JOIN CVE ALIAS 201 INTO CODTAB==CODCAT INPUT TIPO F_R_TIPO SELECT INPUT CODCAT F_R_RICERCA SELECT INPUT CODART F_R_RICERCA_A diff --git a/ve/ve2200x.uml b/ve/ve2200x.uml index 76cc42acd..ac02b1c94 100755 --- a/ve/ve2200x.uml +++ b/ve/ve2200x.uml @@ -39,7 +39,7 @@ BEGIN FIELD LF_CONDV->CATVEN FLAG "U" KEY 1 - USE %CVE + USE CVE INPUT CODTAB F_L_CATVEN DISPLAY "Cat." CODTAB DISPLAY "Descrizione@50" S0 diff --git a/ve/ve2300x.uml b/ve/ve2300x.uml index 38b29ea87..b4bf78054 100755 --- a/ve/ve2300x.uml +++ b/ve/ve2300x.uml @@ -28,7 +28,7 @@ BEGIN FIELD LF_RCONDV->CATVEN FLAG "UP" KEY 1 - USE %CVE + USE CVE INPUT CODTAB F_R_L_CATVEN DISPLAY "Cat." CODTAB DISPLAY "Descrizione@50" S0 diff --git a/ve/ve2400.uml b/ve/ve2400.uml index eac65dbcd..0890e518d 100755 --- a/ve/ve2400.uml +++ b/ve/ve2400.uml @@ -399,7 +399,7 @@ STRING F_RAGGFIS 5 BEGIN PROMPT 2 4 "Raggrupp. fiscale " FIELD LF_ANAMAG->RAGGFIS - USE %RFA + USE RFA JOIN %ASF ALIAS 200 INTO CODTAB=S8 INPUT CODTAB F_RAGGFIS DISPLAY "Codice " CODTAB diff --git a/ve/ve3100.cpp b/ve/ve3100.cpp index ff09b8fb7..d0abfe872 100755 --- a/ve/ve3100.cpp +++ b/ve/ve3100.cpp @@ -61,14 +61,14 @@ bool TStampa_sconti::user_create() { _rel= new TRelation(LF_SCONTI); // crea la relazione principale _rel->add(LF_ANAMAG, "CODART==CODART"); _rel->add("%UMS", "CODTAB==UM", 1, LF_SCONTI, UMS1); - _rel->add("%CVE", "CODTAB==CODCAT", 1, LF_SCONTI, CVE1); + _rel->add("CVE", "CODTAB==CODCAT", 1, LF_SCONTI, CVE1); gotcha= TRUE; break; case 'I': // sconti incondizionati _gessco= prassid.get("GESSCO"); // legge lo stato del parametro di abilitazione degli sconti if (_gessco=="A") { _rel= new TRelation(LF_SCONTI); // crea la relazione principale - _rel->add("%CVE", "CODTAB==CODCAT", 1, LF_SCONTI, CVE1); + _rel->add("CVE", "CODTAB==CODCAT", 1, LF_SCONTI, CVE1); _rel->add(LF_SCONTI, "TIPO==\"D\"|CODCAT==CODART[1,2]", 1, LF_SCONTI, SCON1); _rel->add("%ZON", "CODTAB==CODART[3,4]", 1, LF_SCONTI, ZON1); _rel->add("%CPG", "CODTAB==CODART[5,8]", 1, LF_SCONTI, CPG1); diff --git a/ve/ve3100i.uml b/ve/ve3100i.uml index 623bc374f..196c48618 100755 --- a/ve/ve3100i.uml +++ b/ve/ve3100i.uml @@ -14,7 +14,7 @@ STRING F_I_CATVEN_DA 2 BEGIN PROMPT 2 1 "Cat. vendite " FLAG "U" - USE %CVE + USE CVE INPUT CODTAB F_I_CATVEN_DA DISPLAY "Cat. vend." CODTAB DISPLAY "Descrizione@50" S0 @@ -64,7 +64,7 @@ STRING F_I_CATVEN_A 2 BEGIN PROMPT 2 7 "Cat. vendite " FLAG "U" - USE %CVE + USE CVE INPUT CODTAB F_I_CATVEN_A DISPLAY "Cat. vend." CODTAB DISPLAY "Descrizione@50" S0 diff --git a/ve/ve3100r.uml b/ve/ve3100r.uml index f7db70e1e..08a44f7a3 100755 --- a/ve/ve3100r.uml +++ b/ve/ve3100r.uml @@ -14,7 +14,7 @@ STRING F_R_CODCAT_DA 2 BEGIN PROMPT 2 1 "Cat. vendita " FLAG "U" - USE %CVE + USE CVE INPUT CODTAB F_R_CODCAT_DA DISPLAY "Codice" CODTAB DISPLAY "Descrizione@50" S0 @@ -41,7 +41,7 @@ STRING F_R_CODCAT_A 2 BEGIN PROMPT 2 5 "Cat. vendita " FLAG "U" - USE %CVE + USE CVE INPUT CODTAB F_R_CODCAT_A DISPLAY "Codice" CODTAB DISPLAY "Descrizione@50" S0 diff --git a/ve/ve3200.cpp b/ve/ve3200.cpp index e106e1193..16a4242ed 100755 --- a/ve/ve3200.cpp +++ b/ve/ve3200.cpp @@ -94,11 +94,11 @@ bool TStampa_condizioni_vendita::user_create() { _rel= new TRelation(LF_RCONDV); // crea la relazione principale _rel->add(LF_ANAMAG, "CODART==CODRIGA", 1, LF_RCONDV, ART1); _rel->add(LF_ANAMAG, "CODART==CODARTOM", 1, LF_RCONDV, ART2); - _rel->add("%GMC", "CODTAB[1,3]==CODRIGA", 1, LF_RCONDV, GMC1); - _rel->add("%GMC", "CODTAB[4,5]==CODRIGA", 1, LF_RCONDV, GMC2); - _rel->add("%RFA", "CODTAB==CODRIGA", 1, LF_RCONDV, RFA); + _rel->add("GMC", "CODTAB[1,3]==CODRIGA", 1, LF_RCONDV, GMC1); + _rel->add("GMC", "CODTAB[4,5]==CODRIGA", 1, LF_RCONDV, GMC2); + _rel->add("RFA", "CODTAB==CODRIGA", 1, LF_RCONDV, RFA); _rel->add(LF_CONDV, "TIPO==TIPO|CATVEN==CATVEN|TIPOCF==TIPOCF|CODCF==CODCF|COD==COD"); - _rel->add("%CVE", "CODTAB==CATVEN", 1, LF_CONDV, CVE); + _rel->add("CVE", "CODTAB==CATVEN", 1, LF_CONDV, CVE); _rel->add(LF_CLIFO, "TIPOCF==TIPOCF|CODCF==CODCF", 1, LF_CONDV); _rel->add("%VAL", "CODTAB==CODVAL", 1, LF_CONDV, VAL); _rel->add("%UMS", "CODTAB==UM", 1, LF_RCONDV, UMS1); diff --git a/ve/ve3200x.uml b/ve/ve3200x.uml index ae85bbd07..facd5b346 100755 --- a/ve/ve3200x.uml +++ b/ve/ve3200x.uml @@ -13,7 +13,7 @@ STRING F_L_CATVEN 2 // categoria di vendita, solo listini BEGIN PROMPT 2 1 "Cat. vendita " FLAG "U" - USE %CVE + USE CVE INPUT CODTAB F_L_CATVEN DISPLAY "Cat." CODTAB DISPLAY "Descrizione@50" S0 @@ -116,7 +116,7 @@ END STRING F_DARIGA_G 20 // riga gruppo merceologico di inizio BEGIN PROMPT 2 7 "Da " - USE %GMC + USE GMC INPUT CODTAB F_DARIGA_G DISPLAY "Gr. merc." CODTAB DISPLAY "Descrizione@50" S0 @@ -127,7 +127,7 @@ END STRING F_DARIGA_R 20 // riga raggruppamento fiscale di inizio BEGIN PROMPT 2 7 "Da " - USE %RFA + USE RFA INPUT CODTAB F_DARIGA_R DISPLAY "Ragg. fisc." CODTAB DISPLAY "Descrizione@50" S0 @@ -148,7 +148,7 @@ END STRING F_ARIGA_G 20 // riga gruppo merceologico di fine BEGIN PROMPT 2 8 "A " - USE %GMC + USE GMC INPUT CODTAB F_ARIGA_G DISPLAY "Gr. merc." CODTAB DISPLAY "Descrizione@50" S0 @@ -159,7 +159,7 @@ END STRING F_ARIGA_R 20 // riga raggruppamento fiscale di fine BEGIN PROMPT 2 8 "A " - USE %RFA + USE RFA INPUT CODTAB F_ARIGA_R DISPLAY "Ragg. fisc." CODTAB DISPLAY "Descrizione@50" S0 diff --git a/ve/ve3300.uml b/ve/ve3300.uml index 1f10cbe76..fa5e6c1b5 100755 --- a/ve/ve3300.uml +++ b/ve/ve3300.uml @@ -20,7 +20,7 @@ STRING F_CODCAT 2 BEGIN PROMPT 3 2 "Categoria vendita " // FIELD LF_SCONTI->CODART[1,2] - USE %CVE // CATEGORIE VENDITA + USE CVE FLAG "U" INPUT CODTAB F_CODCAT DISPLAY "Codice" CODTAB @@ -33,7 +33,7 @@ END STRING F_CODCAT1 40 BEGIN PROMPT 30 2 "" - USE %CVE KEY 2 + USE CVE KEY 2 FLAG "U" INPUT S0 F_CODCAT1 DISPLAY "Codice" CODTAB diff --git a/ve/ve3400.cpp b/ve/ve3400.cpp index 386c39c9a..3b4fdd7c8 100755 --- a/ve/ve3400.cpp +++ b/ve/ve3400.cpp @@ -45,9 +45,9 @@ protected: bool TStampa_anagrafica_magazzino::user_create() { _rel= new TRelation(LF_ANAMAG); // crea la relazione principale - _rel->add("%GMC", "CODTAB==GRMERC1", 1, 0, GMC1); // aggancia la tabella Gruppi Merceologici al primo campo GRMERC1 - _rel->add("%GMC", "CODTAB==GRMERC2", 1, 0, GMC2); // aggancia la tabella Gruppi Merceologici al secondo campo GRMERC2 - _rel->add("%GMC", "CODTAB==GRMERC3", 1, 0, GMC3); // aggancia la tabella Gruppi Merceologici al terzo campo GRMERC3 + _rel->add("GMC", "CODTAB==GRMERC1", 1, 0, GMC1); // aggancia la tabella Gruppi Merceologici al primo campo GRMERC1 + _rel->add("GMC", "CODTAB==GRMERC2", 1, 0, GMC2); // aggancia la tabella Gruppi Merceologici al secondo campo GRMERC2 + _rel->add("GMC", "CODTAB==GRMERC3", 1, 0, GMC3); // aggancia la tabella Gruppi Merceologici al terzo campo GRMERC3 _rel->add(LF_UMART, "CODART==CODART"); // aggancia il file con le unità di misura dell'articolo _rel->add(LF_CODCORR, "CODART==CODART"); // aggancia il file con i codici corrispondenti _rel->add(LF_CLIFO, "TIPOCF==\"F\"|CODCF==CODFORN"); // aggancia il file clienti/fornitori