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

Patch level :2.2 2006 399

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :corretti errori di riporto dalla 2.1


git-svn-id: svn://10.65.10.50/trunk@13916 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2006-04-18 16:26:03 +00:00
parent bcba34478a
commit de68d6d342
10 changed files with 63 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/uml.h
View File

@ -8,8 +8,3 @@
#undef min
#undef max

65
ve/ve1300.cpp
View File

@ -870,33 +870,19 @@ bool TReport_doc_app::print_loop(const TString& query)
doc.move_to(i);
const TString& tipodoc = doc.get(DOC_TIPODOC).as_string();
const TTipo_documento& tipo = _tipi_cache.tipo(tipodoc);
TString16 codprof(tipo.main_print_profile());
codprof.trim();
if (codprof.not_empty())
TFilename profilo;
if (tipo.main_print_profile(profilo))
{
TFilename profilo(codprof); profilo.ext("rep");
if (profilo.custom_path()) // Tenta di costruirsi il nome del report
{
int copies = _msk->get_int(F_NCOPIE);
if (copies <= 0 && is_definitive)
copies = tipo.ncopie();
if (copies <= 0)
copies = 1;
TReport_doc& report = reports.get(profilo);
if (!report.print(doc, book, is_definitive, copies, true))
break;
}
else
{
TString msg; msg << TR("Report inesistente") << " : " << codprof;
statbar_set_title(TASK_WIN, msg);
continue;
}
int copies = _msk->get_int(F_NCOPIE);
if (copies <= 0 && is_definitive)
copies = tipo.ncopie();
if (copies <= 0)
copies = 1;
TReport_doc& report = reports.get(profilo);
if (!report.print(doc, book, is_definitive, copies, true))
break;
}
else
{
@ -907,28 +893,19 @@ bool TReport_doc_app::print_loop(const TString& query)
}
// Stampa eventuali allegati
TString16 codalleg = tipo.additional_print_profile();
codalleg.trim();
if (codalleg.not_empty())
if (tipo.additional_print_profile(profilo))
{
TFilename profilo(codalleg); profilo.ext("rep");
if (profilo.custom_path())
{
int copies = tipo.additional_ncopie();
if (copies <= 0) copies = 1;
TReport_doc& allegato = reports.get(profilo);
// Il flag di definitvo deve essere false altrimenti riaggiorna lo stato e ristampa i documenti allegati
allegato.print(doc, book, false, copies, false);
}
else
{
TString msg; msg << TR("Report allegato inesistente") << " : " << codalleg;
statbar_set_title(TASK_WIN, msg);
}
int copies = tipo.additional_ncopie();
if (copies <= 0) copies = 1;
TReport_doc& allegato = reports.get(profilo);
// Il flag di definitvo deve essere false altrimenti riaggiorna lo stato e ristampa i documenti allegati
allegato.print(doc, book, false, copies, false);
}
else
{
TString msg; msg << TR("Report allegato inesistente") << " : " << profilo;
statbar_set_title(TASK_WIN, msg);
}
}

13
ve/ve6200.cpp
View File

@ -77,8 +77,17 @@ class TLista_fornitori : public TLista_clifo
protected:
virtual char tipo() const { return 'F'; }
};
TArray _clifo;
class TLista_cf : public TLista_clifo
{
char _tipo;
protected:
virtual char tipo() const { return _tipo; }
public:
TLista_cf(char tipo) : _tipo(tipo) {}
};
void TLista_clifo::TClifo::init(const TRectype& rec, const TRectype& ven)
{

2
ve/ve6700.cpp
View File

@ -12,7 +12,7 @@
#include <rdoc.h>
#include "ve6700a.h"
#include "velib.h"
#include "velib04.h"
#include "../mg/mglib.h"
///////////////////////////////////////////////////////////

10
ve/velib.h
View File

@ -404,6 +404,10 @@ public:
const TString& field_qta() const { return _field_qta;}
const TString& field_qtaevasa() const { return _field_qtaevasa;}
const int search_years() const { return _search_years;}
const TToken_string& search_nums() const { return _search_nums;}
const int max_rows_art() const { return _max_rows_art;}
const TString& provv() const { return _field_provv;}
const int incr_perc_prezzo() const { return _incrp;}
const int decr_perc_prezzo() const { return _decrp;}
@ -618,8 +622,7 @@ protected:
long get_next_key(char provv, int anno, const char* codnum) const;
virtual void put_str(const char* fieldname, const char* val);
virtual const TString & get_str(const char* fieldname) const ;
long renum_ndoc(long numdoc = 0);
virtual bool key_complete() { return numero() > 0; }
virtual bool renum() { return renum_ndoc() > 0;}
void set_riga_sconto();
@ -719,7 +722,8 @@ public:
static void set_key(TRectype& rec, char provv, int anno, const char* codnum, long numdoc);
static void copy_data(TRectype& dst, const TRectype& src);
static void copy_data(TRiga_documento& dst, const TRiga_documento& src);
void copy_contents(const TDocumento& src, bool copy_header);
void copy_contents(const TDocumento& src, bool copy_header = true);
long renum_ndoc(long numdoc = 0);
void set_fields(TAuto_variable_rectype & rec);
void set_riga_esenzione();

33
ve/velib06.cpp
View File

@ -2109,22 +2109,6 @@ bool TElabora_mask::on_field_event(TOperable_field& o, TField_event e, long joll
if (e == fe_modify)
update_ndoc_filter();
break;
case F_NDOC_ELAB:
if (e == fe_init || e == fe_modify)
{
const long ndoc = atol(o.get());
if (ndoc > 0L)
{
real val = _tree.select_doc(ndoc);
if (val != ZERO)
{
val += o.mask().get_real(F_TOTSEL);
o.mask().set(F_TOTSEL, val);
}
}
}
break;
case F_TYPE:
if (e == fe_init || e == fe_modify)
{
@ -2208,7 +2192,22 @@ bool TElabora_mask::on_field_event(TOperable_field& o, TField_event e, long joll
if (!ok)
return error_box(((TEdit_field&)o).get_warning());
}
break;
if (e == fe_init || e == fe_modify)
{
const long ndoc = atol(o.get());
if (ndoc > 0L)
{
real val = _tree.select_doc(ndoc);
if (val != ZERO)
{
val += o.mask().get_real(F_TOTSEL);
o.mask().set(F_TOTSEL, val);
}
}
}
break;
case F_ROWS:
if (e == fe_modify)
{

22
ve/velib06a.cpp
View File

@ -338,27 +338,7 @@ bool data_hndl( TMask_field& field, KEY key )
same_key = doc.curr().same_key(m.doc().head(), 1, 1);
if (same_key && datadoc < dataprev)
return field.error_box("Data documento inferiore alla data del documento precedente");
}
TLocalisamfile doc(LF_DOC);
doc.curr() = m.doc().head();
bool same_key = false;
doc.read(_isgteq);
if (doc.eof() || doc.prev() == NOERR)
{
TDate dataprev = doc.get_date(DOC_DATADOC);
same_key = doc.curr().same_key(m.doc().head(), 1, 1);
if (same_key && datadoc < dataprev)
return field.error_box("Data documento inferiore alla data del documento precedente");
}
doc.curr() = m.doc().head();
doc.read(_isgreat);
same_key = doc.curr().same_key(m.doc().head(), 1, 1);
if (doc.good() && same_key && datadoc > doc.get_date(DOC_DATADOC))
return field.error_box("Data documento superiore alla data del documento successivo");
}
}
return true;

9
ve/verig.uml
View File

@ -1820,7 +1820,6 @@ BEGIN
FLAGS "B"
END
STRING FR_CDC12 20
BEGIN
PROMPT 2 12 "Cms12 "
@ -1829,11 +1828,12 @@ END
ENDIF // Campi analitici
IFDEF(FLD_CODAGG1)
STRING FR_CODAGG1 20
BEGIN
IFDEF(X_CODAGG1)
PROMPT X_CODAGG1 Y_CODAGG1 PR_CODAGG1
PROMPT X_CODAGG1 Y_CODAGG1 PR_CODAGG1
ELSEIF
PROMPT 2 15 "Strimga 1 "
ENDIF
@ -1871,7 +1871,8 @@ ENDIF
END
ENDIF
ENDIF#ifndef FULL_SCREEN
#ifndef FULL_SCREEN
BUTTON DLG_OK 10 2
BEGIN
PROMPT -14 -1 ""
@ -1933,4 +1934,4 @@ END
ENDIF
ENDMASK
ENDMASK

4
ve/verig00.uml
View File

@ -45,6 +45,4 @@ DEFINE_FIELD(CODAGG1)
DEFINE_FIELD(CODAGG2)
//DEFINE(JOLLYP, "jolly.uml")
#include "verig.uml"
#include "verig.uml"

2
ve/veuml.h
View File

@ -110,6 +110,4 @@
#define F_DESCDC1 271
#define F_DESCDC12 282
//#define F_SELECT 101
#endif // veuml.h