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

Patch level :AGA 2.0 362

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


git-svn-id: svn://10.65.10.50/trunk@10690 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2002-12-18 11:58:58 +00:00
parent 20e9d80cde
commit 06727ef5de
8 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/msksheet.cpp
View File

@ -2648,6 +2648,12 @@ bool TSheet_field::cell_disabled(int row, int column) const
return s->cell_disabled(row, column);
}
bool TSheet_field::cell_enabled(int row, int column) const
{
TSpreadsheet* s = (TSpreadsheet*)_ctl;
return !s->cell_disabled(row, column);
}
void TSheet_field::show_column(int col, bool on) const
{
TSpreadsheet* s = (TSpreadsheet*)_ctl;

4
mr/mr2100.cpp
View File

@ -1455,7 +1455,7 @@ void TMatResMask::select_orders(char type, const char * dacatmer,const char * ac
TMatResMask::TMatResMask() : TCalendar_mask("mr2100a"), _sel_color(this->sfield(F_ORDINI))
TMatResMask::TMatResMask() : TCalendar_mask("mr2100a"), _sel_color(sfield(F_ORDINI))
{
_condv = NULL;
TSheet_field& sf = sfield(F_ORDINI);
@ -1608,7 +1608,7 @@ bool TRisalita_mask::add_total_rows()
if (padri > 0)
add_total_row(riga, totale.um(), totale.val(), "", ZERO);
sf.force_update();
return padri;
return padri != 0;
}
TRisalita_mask::compare_rows(TSheet_field &sf, int r1, int r2)

10
mr/mr2200.cpp
View File

@ -472,7 +472,7 @@ bool TPlanning_mask::elabora()
on_field_event((TOperable_field&)field(F_SHOWPRICES), fe_modify, 0L);
on_field_event((TOperable_field&)field(F_MSP_SORT), fe_init, 0L );
}
return some_lines>0;
return some_lines;
}
return FALSE;
}
@ -2241,7 +2241,7 @@ bool TPlanning_mask::pack_article_sheet(int r, int first, int last)
// controllo linee in modo interattivo
bool TPlanning_mask::test_art_row(int r, bool signal)
{
int ok = TRUE;
bool ok = TRUE;
TSheet_field& sf = sfield(F_ARTICOLI);
int first,last;
if (TRiga_articolo::find_block(sf, r, first, last))
@ -2650,7 +2650,7 @@ int TPlanning_mask::salva_documenti(TExceptions_array &excepts, TSheet_field & s
break;
case -1:
if (!yesno_box("Problemi nella registrazione dei documenti.\n(numerazione %s, tipo %s)\nRipeto l'elaborazione ?",
(const char *)save_numplan,(const char *)save_tipoplan));
(const char *)save_numplan,(const char *)save_tipoplan))
some = 0;
break;
}
@ -3179,13 +3179,13 @@ bool TPlanning_mask::on_field_event(TOperable_field& o, TField_event e, long jol
}
TPlanning_mask::TPlanning_mask(const char * name)
: TCalendar_mask(name), _sel_color(this->sfield(F_ARTICOLI))
: TCalendar_mask(name), _sel_color(sfield(F_ARTICOLI))
{
init();
}
TPlanning_mask::TPlanning_mask()
: TCalendar_mask("mr2200a"), _sel_color(this->sfield(F_ARTICOLI))
: TCalendar_mask("mr2200a"), _sel_color(sfield(F_ARTICOLI))
{
init();
}

2
mr/mr2202.cpp
View File

@ -330,7 +330,7 @@ void TMRP_line::reset_excepts()
real uo=mrprec.unsched_orders();
if (!ro.is_zero())
mrprec.add_resched_ord(-ro);
if (!uo.is_zero());
if (!uo.is_zero())
mrprec.add_unsched_ord(-uo);
} // ... for each bucket
}

1
ve/ve3300.cpp
View File

@ -69,7 +69,6 @@ bool TLCO_form::validate(TForm_item &cf, TToken_string &s)
TLCO_form::TLCO_form(const char* name) : TForm(name)
{
_umart = new TLocalisamfile (LF_UMART);
set_magic_currency(TRUE);
}

2
ve/ve6300.cpp
View File

@ -184,7 +184,7 @@ void TGenerazioneEffetti_app::build_num_sheet()
bool found = FALSE;
for (int i = _tipi_doc.last(); !found && i >= 0; i--)
found |= z.find(((TToken_string &)_tipi_doc[i]).get(0)) >= 0;
found |= (z.find(((TToken_string &)_tipi_doc[i]).get(0)) >= 0);
if (found)
_num_sheet->enable_row(pos);
else

8
ve/velib04b.cpp
View File

@ -1374,7 +1374,9 @@ void TContabilizzazione::calculate_spese(real& spese, real& sp_iva, int ndec, bo
if (!_totali_lordi.is_key(codiva_es))
_totali_lordi.add(codiva_es, new real);
real& rl = (real&) _totali_lordi[codiva_es];
rl += spese + r.imposta(ndec);
real iva = r.imposta(FALSE);
iva.round(ndec);
rl += spese + iva;
}
}
else
@ -1445,7 +1447,9 @@ error_type TContabilizzazione::adjust_sconto_rows(TDocumento& doc)
if (!_totali_lordi.is_key(cod))
_totali_lordi.add(cod, new real);
real& rl = (real&) _totali_lordi[cod];
rl += sconto + r.imposta(ndec);
real iva = r.imposta(FALSE);
iva.round(ndec);
rl += sconto + iva;
}
}
}

6
ve/velib06a.cpp
View File

@ -558,7 +558,7 @@ bool codart_handler(TMask_field& f, KEY key )
deslin.put(DESLIN_CODLIN, lingua);
if (deslin.read() == NOERR)
{
static bool __lingua_only = 3;
static int __lingua_only = 3;
if (__lingua_only > 2)
{
@ -607,7 +607,7 @@ bool codart_handler(TMask_field& f, KEY key )
else
if (key == K_F8 && !sh.sheet_mask().is_running())
{
static bool explode_db = 3;
static int explode_db = 3;
static bool valcomp = FALSE;
static bool matbase = TRUE;
static TExplosion_grouping raggart = RAGGR_EXP_NONE;
@ -741,7 +741,7 @@ bool liv_handler( TMask_field& f, KEY key )
if (key == K_ENTER && !f.get().empty())
{
static bool checkgiac = 3;
static int checkgiac = 3;
if (checkgiac > 2)
{
TConfig c(CONFIG_DITTA);