root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 10.0 163

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :

Riportata la versione 3.2 patch 1262


git-svn-id: svn://10.65.10.50/trunk@17646 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2008-11-15 09:41:12 +00:00
parent ffb1216450
commit f6833c4dd7
7 changed files with 53 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
or/orlib01.cpp
View File

@ -398,11 +398,11 @@ bool TOrdine_form::validate(TForm_item &cf, TToken_string &s)
} else
if (action == "VALORE")
{
cf.set(rdoc.valore(TRUE, AUTO_DECIMALS).string());
cf.set(rdoc.valore(true, false,AUTO_DECIMALS).string());
} else
if (action == "VALRES")
{
cf.set(rdoc.valore(FALSE, AUTO_DECIMALS).string());
cf.set(rdoc.valore(true, false, AUTO_DECIMALS).string());
} else
if (action == "GIACENZA")
{

5
ve/ve2.cpp
View File

@ -1,3 +1,4 @@
#include <checks.h>
#include <xvt.h>
extern int ve2100(int argc, char* argv[]); // tabelle sconti (di riga/di documento/incondizionati)
@ -8,7 +9,7 @@ extern int ve2600(int argc, char* argv[]); // relazioni articoli livelli di gia
int main( int argc, char** argv)
{
const int r = argc > 1 ? argv[1][1]-'0' : -1;
const int r = (argc>1)?(atoi(&argv[1][1])):(-1);
switch (r)
{
case 0: ve2100(argc, argv); break;
@ -18,5 +19,5 @@ int main( int argc, char** argv)
case 5: ve2600(argc, argv); break;
default: error_box("Sintassi: %s -[0 [R|D|I] | 1 [L|C|O] | 2 [L|C|O] | 3]", argv[0]); break;
}
return 0;
exit(0);
}

5
ve/ve2400.cpp
View File

@ -401,7 +401,10 @@ void TMask_anamag::create_user_fields()
bool disable_user_page = true;
TString80 prompt;
int page = PAGE_USER;
int row = 4;
TBit_array pages;
for (int i = 1; i <= 20; i++)
{
if (c.get_bool("CHK_USER", "ve", i))

17
ve/velib02.cpp
View File

@ -906,7 +906,7 @@ void TRiga_documento::autosave(TSheet_field& f)
if (num >= 0 && num < f.items())
{
TMask& m = f.sheet_mask();
TMask& m = f.sheet_row_mask(num);
TToken_string & row = f.row(num);
@ -986,7 +986,6 @@ void TRiga_documento::autosave(TSheet_field& f)
put( RDOC_CODAGG2, row.get( f.cid2index(FR_CODAGG2)) );
put( RDOC_RIDPREZZO, row.get( f.cid2index(FR_RIDPREZZO)) );
f.select(num); // Seleziona la riga in modo da selezionare la maschera di riga giusta
for (short cdcid = FR_CDC1; cdcid <= FR_CDC12; cdcid++)
{
const int pos = m.id2pos(cdcid);
@ -1043,14 +1042,13 @@ void TRiga_documento::autosave(TSheet_field& f)
} //if(m.field(...
// Salvo i campi con un FIELD manuale
const TMask& m = f.sheet_row_mask(num);
for (short id = FR_JOLLY1; id <= FR_JOLLY10; id++)
{
const int pos = m.id2pos(id);
{
const int pos = m.id2pos(id);
if (pos > 0)
{
{
const char* val = row.get(f.cid2index(id));
if (val != NULL)
@ -1060,9 +1058,10 @@ void TRiga_documento::autosave(TSheet_field& f)
if (fld != NULL)
fld->write(val, *this);
}
else
break;
}
else
break;
}
}
}
}

14
ve/velib06.cpp
View File

@ -1411,15 +1411,15 @@ bool TDocumento_mask::ss_notify( TSheet_field& ss, int r, KEY key )
case K_TAB: // ingresso nella riga
if (!selecting && m.is_running())
{
const TRectype& rdoc = doc[r + 1];
if (r < doc.physical_rows())
{
m.update_giacenza();
const TRectype& rdoc = doc[r + 1];
set_curr_um(rdoc.get(RDOC_UMQTA));
const bool on = rdoc.get(RDOC_DACODNUM).not_empty();
ss.sheet_mask().enable(DLG_USER, on);
}
m.update_giacenza();
set_curr_um(rdoc.get(RDOC_UMQTA));
const bool on = rdoc.get(RDOC_DACODNUM).not_empty();
ss.sheet_mask().enable(DLG_USER, on);
}
if (rdoc.get(RDOC_CODART).empty() && rdoc.get(RDOC_DESCR).empty())
{

7
ve/velib06a.cpp
View File

@ -2,6 +2,7 @@
#include <defmask.h>
#include <modaut.h>
#include <progind.h>
#include <recset.h>
#include <sheet.h>
#include <smartcard.h>
#include <tabutil.h>
@ -377,9 +378,7 @@ void row_set_handler( TMask& m, const int field, const int index)
m.set_handler( field, evasion_check_handler );
break;
default:
default:
yesnofatal_box( false, "Funzione di handler sulla riga non definita( %d ).", index );
yesnofatal_box( false, "Funzione di handler sulla riga non definita( %d ).", index );
break;
}
@ -1459,7 +1458,7 @@ bool link_row_handler(TMask_field& f, KEY key )
father_row.set_doc(&doc);
r.put(RDOC_LIVELLO, livello);
r.put(RDOC_QTA, row.qtaresidua());
r.put(RDOC_QTA, father_row.qtaresidua());
TToken_string flds = tipo.fields_to_update();
FOR_EACH_TOKEN(flds, fld)

26
ve/verig.uml
View File

@ -1899,6 +1899,31 @@ BEGIN
END
ENDIF
IFDEF(FLD_RIDPREZZO)
CURRENCY FR_RIDPREZZO 18
BEGIN
IFDEF(X_RIDPREZZO)
PROMPT X_RIDPREZZO Y_RIDPREZZO PR_RIDPREZZO
ELSEIF
PROMPT 42 17 "Rid.prezzo "
ENDIF
IFDEF(FL_RIDPREZZO)
FLAGS FL_RIDPREZZO
ELSEIF
FLAGS "U"
ENDIF
IFDEF(MS_RIDPREZZO)
MESSAGE MS_RIDPREZZO
ENDIF
IFDEF(NC_RIDPREZZO)
NUM_CALC NC_RIDPREZZO
ENDIF
FIELD RIDPREZZO
END
ENDIF
#endif
#ifndef FULL_SCREEN
@ -2045,6 +2070,7 @@ IFDEF(TY_CODAGG2)
TY_CODAGG2 FR_CODAGG2 20
ELSEIF
STRING FR_CODAGG2 13 5
ENDIF
BEGIN
IFDEF(X_CODAGG2)
PROMPT X_CODAGG2 Y_CODAGG2 PR_CODAGG2