diff --git a/ve/bollaclv.src b/ve/bollaclv.src index bcbe3ae20..6b0087e5d 100755 --- a/ve/bollaclv.src +++ b/ve/bollaclv.src @@ -159,7 +159,7 @@ NOTECLI = S_NOCHECK //2500 Default(0)=F_CAUSTRASP|VEN [SHEET] -Col(0)=FR_CODAGG1|Causale Lavanderie +Col(0)=FR_CAULAV|Causale Lavanderie Col(1)=FR_CODMAG Col(2)=FR_CODDEP Col(3)=FR_CODART @@ -170,7 +170,7 @@ Col(7)=FR_LIV4 Col(8)=FR_DESCR Col(9)=FR_UMQTA Col(10)=FR_QTA|Consegnato|18 -Col(11)=FR_QTAGG1|Ritirato|18 +Col(11)=FR_RITIRO|Ritirato|18 Col(12)=FR_PREZZO Col(13)=FR_SCONTO Col(14)=FR_PERCPROV @@ -186,6 +186,7 @@ Col(23)=FR_CODDEPC Col(24)=FR_TIPORIGA [RIGHE] +Tipo(0)=16 [HANDLERS] // Handler(0) = F_ORAPART|1 diff --git a/ve/velib03.cpp b/ve/velib03.cpp index 0f60ade9e..e8cc1660d 100755 --- a/ve/velib03.cpp +++ b/ve/velib03.cpp @@ -1139,14 +1139,14 @@ int TDocumento::write_rewrite(TBaseisamfile & f, bool re) const if (!caulav.empty()) { const real qta = r.get(RDOC_QTAGG1); - const TString & causcons = caulav.get("S6"); + const TString & causcons = caulav.get("S2"); if (causcons.full()) mov[LF_RMOVMAG][j - 1].put(RMOVMAG_CODCAUS, causcons); if (r_num == num_movmag && !qta.is_zero()) { - const TString & causrit = caulav.get("S7"); + const TString & causrit = caulav.get("S1"); TRectype & rm = mov.insert_row(j++); rm.put(RMOVMAG_IMPIANTO, r.get(RDOC_IMPIANTO)); diff --git a/ve/verig.uml b/ve/verig.uml index d9d4168f1..81061aa25 100755 --- a/ve/verig.uml +++ b/ve/verig.uml @@ -1455,8 +1455,8 @@ INPUT CODTAB FR_CAULAV DISPLAY "Codice" CODTAB DISPLAY "Descrizione@50" S0 OUTPUT FR_CAULAV CODTAB -OUTPUT FR_FLCONS B0 -OUTPUT FR_FLRIT B1 +OUTPUT FR_FLCONS B1 +OUTPUT FR_FLRIT B0 FLAGS "UZ" IFDEF(MS_CAULAV) MESSAGE MS_CAULAV