diff --git a/lv/lv0400.cpp b/lv/lv0400.cpp index d3691696a..e8fcab6ee 100755 --- a/lv/lv0400.cpp +++ b/lv/lv0400.cpp @@ -55,7 +55,7 @@ bool TContratti_msk::on_art_select() row.add(consmonth.stringa(), ss.cid2index(S_CONSMESE)); } - const bool varclcons = rowmask.get_int(S_PPCONF)>0; + const bool varclcons = artrec.get_int(ANAMAG_PPCONF)>0; ss.enable_cell(ss.selected(),ss.cid2index(S_CALCCONS)); diff --git a/lv/lv0400.h b/lv/lv0400.h index b284073f7..1752f2839 100755 --- a/lv/lv0400.h +++ b/lv/lv0400.h @@ -69,9 +69,6 @@ #define S_RITAUDTTMP 126 #define S_FATTKG 127 #define S_ARROT 128 -#define S_PPCONF 129 -#define S_PPCOLLO 130 -#define S_PPPALLET 131 #define S_CODCF 301 #define S_RAGSOC 302 diff --git a/lv/lv0400a.uml b/lv/lv0400a.uml index b69de1a39..21f7cc44f 100755 --- a/lv/lv0400a.uml +++ b/lv/lv0400a.uml @@ -1,14 +1,29 @@ #include "lv0400.h" TOOLBAR "" 0 0 0 2 -#include +#include + +BUTTON DLG_NULL 2 2 +BEGIN + PROMPT -1 1 "" + PICTURE 0 +END + +BUTTON DLG_PLANNING 8 2 +BEGIN + PROMPT 66 2 "~Giri" + PICTURE 156 +END + +#include + ENDPAGE PAGE "Contratto" 0 2 0 0 GROUPBOX DLG_NULL 78 6 BEGIN - PROMPT 1 0 "@b Contratti" + PROMPT 1 0 "@b Dati Dettaglio" END NUMBER F_CODCF 6 @@ -102,14 +117,9 @@ BEGIN FLAGS "D" END -BUTTON DLG_PLANNING 8 2 -BEGIN - PROMPT 66 2 "~Giri" -END - LISTBOX F_PROPOSTA 15 BEGIN - PROMPT 50 4 "Tipo " + PROMPT 2 4 "Tipo " FIELD PROPOSTA ITEM "|Contratto" MESSAGE REQUIRED,F_DATAIN ITEM "X|Proposta" MESSAGE NORMAL,F_DATAIN @@ -146,9 +156,6 @@ BEGIN ITEM "Ritiro\naut.Dot.Temp.@12" ITEM "Fatturazione\na kg" ITEM "Arrotond." - ITEM "Pezzi\nper pacco" - ITEM "Pezzi\nper sacco" - ITEM "Pezzi\nper carrello" END ENDPAGE @@ -445,9 +452,6 @@ BEGIN OUTPUT S_CODART CODART OUTPUT S_DESCR DESCR OUTPUT S_PREZZOST COSTSTD - OUTPUT S_PPCONF PPCONF - OUTPUT S_PPCOLLO PPCOLLO - OUTPUT S_PPPALLET PPPALLET FIELD CODART CHECKTYPE REQUIRED ADD RUN ve2 -3 @@ -495,25 +499,6 @@ BEGIN FLAGS "D" END - -NUMBER S_PPCONF 9 -BEGIN - PROMPT 2 6 "Pezzi Pacco" - FLAGS "D" -END - -NUMBER S_PPCOLLO 9 -BEGIN - PROMPT 29 6 "Pezzi Sacco" - FLAGS "D" -END - -NUMBER S_PPPALLET 9 -BEGIN - PROMPT 53 6 "Pezzi Carrello" - FLAGS "D" -END - GROUPBOX DLG_NULL 78 7 BEGIN PROMPT 1 8 "@b Forfait/Prezzi"