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

Patch level :4.0 649

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :errori di compilazione nel riporto


git-svn-id: svn://10.65.10.50/trunk@15019 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2007-03-07 16:22:28 +00:00
parent 2f61a3b274
commit 2a5a2a54e3
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ve/velib.h
View File

@ -816,7 +816,6 @@ class TDocumento_mask : public TVariable_mask // velib06
protected: protected:
virtual void next_page(int p); virtual void next_page(int p);
virtual void start_run(); virtual void start_run();
virtual bool stop_run(KEY key);
void sconto_testa2mask(); void sconto_testa2mask();
void spese2mask(); void spese2mask();
@ -829,7 +828,6 @@ protected:
public: public:
virtual bool is_omaggio_enabled() { return true;} virtual bool is_omaggio_enabled() { return true;}
void update_progs(bool stop_run = false); void update_progs(bool stop_run = false);
TVariable_mask* riga_mask(int numriga);
virtual bool on_key(KEY key); virtual bool on_key(KEY key);
virtual bool stop_run(KEY key); virtual bool stop_run(KEY key);
@ -853,7 +851,6 @@ public:
void reset_masks(const TString& tipo_doc); void reset_masks(const TString& tipo_doc);
TVariable_mask* riga_mask(int numriga); TVariable_mask* riga_mask(int numriga);
virtual bool on_key(KEY key);
TDocumento& doc() { return _doc; } TDocumento& doc() { return _doc; }
const TDocumento& doc() const { return _doc; } const TDocumento& doc() const { return _doc; }

4
ve/velib02.cpp
View File

@ -941,9 +941,9 @@ void TRiga_documento::autosave(TSheet_field& f)
const int prezzo_id = f.cid2index(FR_PREZZO); const int prezzo_id = f.cid2index(FR_PREZZO);
real prezzo(row.get(prezzo_id)); real prezzo(row.get(prezzo_id));
const TString8 codiva(row.get(f.cid2index(FR_CODIVA))); const TString8 codiva(row.get(f.cid2index(FR_CODIVA)));
if (lordo) if (doc().tipo().calcolo_lordo())
{ {
put( RDOC_PREZZOL, prezzo); put(RDOC_PREZZOL, prezzo);
iva(codiva).scorpora(prezzo, doc().decimals(TRUE)); iva(codiva).scorpora(prezzo, doc().decimals(TRUE));
} }
put( RDOC_PREZZO, prezzo); put( RDOC_PREZZO, prezzo);

25
ve/velib06.cpp
View File

@ -494,7 +494,7 @@ void TDocumento_mask::update_progs(bool stop_run)
doc().set_riga_esenzione(); // da verificare doc().set_riga_esenzione(); // da verificare
for (f = last_field; f >= 0; f--) for (int f = last_field; f >= 0; f--)
{ {
const TMask_field & mf = fld(f); const TMask_field & mf = fld(f);
const int id = mf.dlg(); const int id = mf.dlg();
@ -1299,17 +1299,18 @@ bool TDocumento_mask::ss_notify( TSheet_field& ss, int r, KEY key )
{ {
if (r < doc.rows()) if (r < doc.rows())
{ {
TRiga_documento & riga = doc[r + 1]; TRiga_documento & riga = doc[r + 1];
if (riga.is_omaggio() && riga.is_generata()) if (riga.is_omaggio() && riga.is_generata())
{ {
const bool enabled = ss.cell_enabled(r, 0); const bool enabled = ss.cell_enabled(r, 0);
if (!enabled) ss.enable_row(r); if (!enabled) ss.enable_row(r);
ss.force_update(r); ss.force_update(r);
ss.select(r); ss.select(r);
m.send_key(K_CTRL + '+', 0); m.send_key(K_CTRL + '+', 0);
if (!enabled) ss.disable_row(r); if (!enabled) ss.disable_row(r);
ss.force_update(r); ss.force_update(r);
}
} }
doc.insert_row(r + 1, m.get( F_LBTIPORIGA )); doc.insert_row(r + 1, m.get( F_LBTIPORIGA ));
} }