Patch level :10.0

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
euroforesi


git-svn-id: svn://10.65.10.50/branches/R_10_00@21511 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2011-01-26 09:07:16 +00:00
parent aa5cb2e27f
commit dc0f29de2c
3 changed files with 93 additions and 64 deletions

View File

@ -95,8 +95,8 @@ TDoc_cache::TDoc_cache(const char* codnum, const char* tipodoc, const TDate& dat
class TEdit_rdocs_mask : public TAutomask
{
int _pos_art, _pos_desc, _pos_um, _pos_qta, _pos_qtaev, _pos_prz, _pos_iva, _pos_lav, _pos_col,
_pos_dtprd, _pos_qtaprd, _pos_num, _pos_anno, _pos_provv, _pos_ndoc, _pos_nrig,
_pos_desiva, _pos_deslav, _pos_descol;
_pos_dtprd_lav, _pos_qtaprd_lav, _pos_dtprd_col, _pos_qtaprd_col, _pos_num, _pos_anno,
_pos_provv, _pos_ndoc, _pos_nrig, _pos_desiva, _pos_deslav, _pos_descol;
protected:
virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
@ -123,9 +123,11 @@ TEdit_rdocs_mask::TEdit_rdocs_mask() : TAutomask ("ps1002100a")
_pos_prz = sf_righe.cid2index(S_PREZZO);
_pos_iva = sf_righe.cid2index(S_CODIVA);
_pos_lav = sf_righe.cid2index(S_LAV);
_pos_dtprd_lav = sf_righe.cid2index(S_DATAPROD_LAV);
_pos_qtaprd_lav = sf_righe.cid2index(S_QTAPROD_LAV);
_pos_col = sf_righe.cid2index(S_COLORE);
_pos_dtprd = sf_righe.cid2index(S_DATAPROD);
_pos_qtaprd = sf_righe.cid2index(S_QTAPROD);
_pos_dtprd_col = sf_righe.cid2index(S_DATAPROD_COL);
_pos_qtaprd_col = sf_righe.cid2index(S_QTAPROD_COL);
_pos_num = sf_righe.cid2index(S_CODNUM);
_pos_anno = sf_righe.cid2index(S_ANNO);
_pos_provv = sf_righe.cid2index(S_PROVV);

View File

@ -17,23 +17,25 @@
#define F_RIGHE 320
//campi sheet F_RIGHE
#define S_NDOC 101
#define S_NRIGA 102
#define S_CODMAG 103
#define S_CODART 104
#define S_DESCR 105
#define S_UM 106
#define S_QTA 107
#define S_QTAEVASA 108
#define S_PREZZO 109
#define S_CODIVA 110
#define S_LAV 111
#define S_COLORE 112
#define S_DATAPROD 113
#define S_QTAPROD 114
#define S_CODNUM 115
#define S_ANNO 116
#define S_PROVV 117
#define S_NDOC 101
#define S_NRIGA 102
#define S_CODMAG 103
#define S_CODART 104
#define S_DESCR 105
#define S_UM 106
#define S_QTA 107
#define S_QTAEVASA 108
#define S_PREZZO 109
#define S_CODIVA 110
#define S_LAV 111
#define S_DATAPROD_LAV 112
#define S_QTAPROD_LAV 113
#define S_COLORE 114
#define S_DATAPROD_COL 115
#define S_QTAPROD_COL 116
#define S_CODNUM 117
#define S_ANNO 118
#define S_PROVV 119
#define S_DESMAG 133
#define S_DESIVA 140

View File

@ -1,26 +1,37 @@
#include "ps1002100a.h"
TOOLBAR "" 0 0 0 2
TOOLBAR "" 0 -3 0 3
BUTTON DLG_SELECT 2 2
BUTTON DLG_SELECT 10 2
BEGIN
PROMPT 1 1 "~Carica"
PICTURE TOOL_MULTISEL
PROMPT -14 -11 "~Carica"
GROUP 1
END
BUTTON DLG_SAVEREC 2 2
BUTTON DLG_SAVEREC 10 2
BEGIN
PROMPT 2 2 "~Salva"
PICTURE TOOL_SAVEREC
PROMPT -24 -11 "~Salva"
PICTURE BMP_SAVEREC
GROUP 2
END
#include <cancelbar.h>
BUTTON DLG_CANCEL 10 2
BEGIN
PROMPT -34 -11 "Annulla"
MESSAGE EXIT,K_ESC
PICTURE BMP_CANCEL
END
BUTTON DLG_QUIT 10 2
BEGIN
PROMPT -44 -11 "Fine"
MESSAGE EXIT,K_QUIT
PICTURE BMP_QUIT
END
ENDPAGE
PAGE "Produttivita' giornaliera" 0 2 0 0
PAGE "Produttivita' giornaliera" 0 0 0 -3
GROUPBOX DLG_NULL 76 9
BEGIN
@ -207,9 +218,11 @@ BEGIN
ITEM "Prezzo@18"
ITEM "IVA@4"
ITEM "Lav@3"
ITEM "Data Prod.Lav."
ITEM "Qta prod.Lav.@15"
ITEM "Colore"
ITEM "Data Prod."
ITEM "Qta prod.@15"
ITEM "Data Prod.Col."
ITEM "Qta prod.Col.@15"
ITEM "Num."
ITEM "Anno"
ITEM "P/D"
@ -223,8 +236,26 @@ ENDMASK
//---------------------------------------------------
//maschera di riga dello sheet (righe documenti)
TOOLBAR "topbar" 0 -3 0 3
PAGE "Riga" -1 -1 78 14
BUTTON DLG_OK 10 2
BEGIN
PROMPT -13 -11 ""
END
BUTTON DLG_DELREC 10 2
BEGIN
PROMPT -23 -11 ""
END
BUTTON DLG_CANCEL 10 2
BEGIN
PROMPT -33 -11 ""
END
ENDPAGE
PAGE "Riga" 0 0 0 -3
STRING S_CODMAG 5
BEGIN
@ -359,9 +390,22 @@ BEGIN
COPY OUTPUT S_LAV
END
DATA S_DATAPROD_LAV
BEGIN
PROMPT 1 8 "Data prod. Lav. "
FIELD CODAGG2
FLAGS "R"
END
NUMBER S_QTAPROD_LAV 13 5
BEGIN
PROMPT 1 9 "Qta prod. Lav. "
FIELD QTAGG2
END
STRING S_COLORE 20
BEGIN
PROMPT 1 8 "Colore "
PROMPT 1 10 "Colore "
USE FSC
INPUT CODTAB S_COLORE
DISPLAY "Codice" CODTAB
@ -374,7 +418,7 @@ END
STRING S_DESCOL 50 40
BEGIN
PROMPT 35 8 ""
PROMPT 35 10 ""
USE FSC KEY 2
INPUT S0 S_DESCOL
DISPLAY "Descrizione@50" S0
@ -383,77 +427,58 @@ BEGIN
COPY OUTPUT S_COLORE
END
DATA S_DATAPROD
DATA S_DATAPROD_COL
BEGIN
PROMPT 1 9 "Data prod "
PROMPT 1 11 "Data prod. Col. "
FIELD DATACONS
END
NUMBER S_QTAPROD 13 5
NUMBER S_QTAPROD_COL 13 5
BEGIN
PROMPT 1 10 "Qta prod "
PROMPT 1 12 "Qta prod. Col. "
FIELD QTAGG1
END
GROUPBOX DLG_NULL 76 3
BEGIN
PROMPT 1 11 "@bChiave riga"
PROMPT 1 13 "@bChiave riga"
END
STRING S_CODNUM 4
BEGIN
PROMPT 2 12 "Num. "
PROMPT 2 14 "Num. "
FLAGS "D"
FIELD CODNUM
END
NUMBER S_ANNO 4
BEGIN
PROMPT 13 12 "Anno "
PROMPT 13 14 "Anno "
FLAGS "D"
FIELD ANNO
END
STRING S_PROVV 1
BEGIN
PROMPT 24 12 "P "
PROMPT 24 14 "P "
FLAGS "D"
FIELD PROVV
END
NUMBER S_NDOC 7
BEGIN
PROMPT 29 12 "N.doc. "
PROMPT 29 14 "N.doc. "
FLAGS "D"
FIELD NDOC
END
NUMBER S_NRIGA 3
BEGIN
PROMPT 46 12 "N.Riga "
PROMPT 46 14 "N.Riga "
FLAGS "D"
FIELD NRIGA
END
ENDPAGE
TOOLBAR "topbar" 0 0 0 2
BUTTON DLG_OK 2 2
BEGIN
PROMPT 1 1 ""
END
BUTTON DLG_DELREC 2 2
BEGIN
PROMPT 2 1 ""
END
BUTTON DLG_CANCEL 2 2
BEGIN
PROMPT 3 1 ""
END
ENDPAGE
ENDMASK