Merge remote-tracking branch 'origin/R_10_00' into R_10_00

This commit is contained in:
Simone Palacino 2020-07-01 10:20:18 +02:00
commit 722382afd5
2 changed files with 8 additions and 7 deletions

Binary file not shown.

View File

@ -2,6 +2,8 @@
#define FULL_SCREEN #define FULL_SCREEN
#define IS_MERCE #define IS_MERCE
#define HAS_CONAI
// else // else
// #define MASK_WIDTH 60 // #define MASK_WIDTH 60
// #define MASK_HEIGHT 14 // #define MASK_HEIGHT 14
@ -36,12 +38,12 @@ DEFINE_FIELD(CODART)
// DEFINE_FIELD(QTAGG4) // DEFINE_FIELD(QTAGG4)
// F_PROMPT(QTAGG4, "Q 4") // F_PROMPT(QTAGG4, "Q 4")
// DEFINE_FIELD(QTAGG5) // DEFINE_FIELD(QTAGG5)
// DEFINE_FIELD(CODAGG1) // DEFINE_FIELD(JOLLY1)
// F_X(CODAGG1, 20) // F_X(JOLLY1, 20)
// F_Y(CODAGG1, 15) // F_Y(JOLLY1, 15)
// F_PROMPT(CODAGG1, "Cod.Importazione ") // F_LEN(JOLLY1, 30)
// DEFINE_FIELD(CODAGG2) // F_PROMPT(JOLLY1, "Riferimento Flexform ")
// F_FIELD(CODAGG1, CODIMP) // F_FIELD(JOLLY1, CODIMP)
DEFINE_FIELD(DESCRART) DEFINE_FIELD(DESCRART)
DEFINE_FIELD(UMQTA) DEFINE_FIELD(UMQTA)
DEFINE_FIELD(QTA) DEFINE_FIELD(QTA)
@ -70,6 +72,5 @@ DEFINE_FIELD(DESDEPC)
DEFINE_FIELD(IMPIANTO) DEFINE_FIELD(IMPIANTO)
DEFINE_FIELD(LINEA) DEFINE_FIELD(LINEA)
#include "verig.uml" #include "verig.uml"