cg2100.cpp Corretto MI3562 relativo all'incasso immediato

cg2100c.uml Corretto MI6300 colonne prima nota
		     MI6301 acceleratore pro-rata
                     MI3447 allargata ricerca sulla tabella cambi


git-svn-id: svn://10.65.10.50/trunk@5591 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1997-11-11 11:19:04 +00:00
parent 3697dcf6ad
commit 8476f48aa4
2 changed files with 8 additions and 4 deletions

View File

@ -39,7 +39,7 @@ public:
TPrimanota_application::TPrimanota_application() TPrimanota_application::TPrimanota_application()
: _rel(NULL), _mode(0), _iva(nessuna_iva), _causale(NULL), _giornale(NULL), : _rel(NULL), _mode(0), _iva(nessuna_iva), _causale(NULL), _giornale(NULL),
_lastreg(0), _last_dreg(TODAY), _last_dcom(TODAY), _incasso(NULL), _EasyDocPath("") _lastreg(0), _last_dreg(TODAY), _last_dcom(TODAY), _incasso(NULL)
{ {
memset(_msk, 0, sizeof(_msk)); memset(_msk, 0, sizeof(_msk));
} }
@ -617,6 +617,8 @@ const char* TPrimanota_application::get_next_key()
if (iva() == iva_vendite || _incasso->_step == 2) if (iva() == iva_vendite || _incasso->_step == 2)
{ {
_incasso->_step = 0; // Senno' vale anche per acquisti
_tmp.add(F_DATADOC); _tmp.add(m.get(F_DATADOC)); // Ricopia data documento _tmp.add(F_DATADOC); _tmp.add(m.get(F_DATADOC)); // Ricopia data documento
const long n = m.get_long(F_NUMDOC); const long n = m.get_long(F_NUMDOC);

View File

@ -7,13 +7,13 @@ TOOLBAR "" 0 19 0 3
BUTTON F_ADJUST_PRORATA 40 BUTTON F_ADJUST_PRORATA 40
BEGIN BEGIN
PROMPT 1 -3 "Corre&zione automatica righe contabili" PROMPT 1 -3 "Corre~zione automatica righe contabili"
FLAGS "H" FLAGS "H"
END END
BUTTON F_EASYDOC 10 BUTTON F_EASYDOC 10
BEGIN BEGIN
PROMPT -66 -3 "&Immagine" PROMPT -66 -3 "~Immagine"
FLAGS "H" FLAGS "H"
END END
@ -423,11 +423,13 @@ BEGIN
FIELD DATACAM FIELD DATACAM
FLAGS "R" FLAGS "R"
USE CAM USE CAM
JOIN %VAL ALIAS 104 INTO CODTAB[1,3]==CODTAB[1,3]
INPUT CODTAB[1,3] SK_VALUTA SELECT INPUT CODTAB[1,3] SK_VALUTA SELECT
INPUT CODTAB[4,11] SK_DATACAMBIO INPUT CODTAB[4,11] SK_DATACAMBIO
DISPLAY "Valuta" CODTAB[1,3] DISPLAY "Cod" CODTAB[1,3]
DISPLAY "Data@10" D0 DISPLAY "Data@10" D0
DISPLAY "Cambio@18" R10 DISPLAY "Cambio@18" R10
DISPLAY "Valuta@50" 104@->S0
OUTPUT SK_DATACAMBIO D0 OUTPUT SK_DATACAMBIO D0
OUTPUT SK_CAMBIO R10 OUTPUT SK_CAMBIO R10
GROUP 3 GROUP 3