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

Patch level : 10.0 109

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

Riportata la versione 3.2 1208


git-svn-id: svn://10.65.10.50/trunk@17109 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2008-08-27 12:58:13 +00:00
parent 88a5c61f6f
commit 7baf8c5433
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/resource.ini
View File

@ -279,3 +279,11 @@ Item_00_00=30001,&Colori righe
[Menu_VE0-0] [Menu_VE0-0]
Item_00=5100,&Opzioni Item_00=5100,&Opzioni
Item_00_00=30001,&Colori righe Item_00_00=30001,&Colori righe
[Menu_MR2-0]
Item_00=5100,&Opzioni
Item_00_00=30001,&Colori righe
[Menu_MR2-1]
Item_00=5100,&Opzioni
Item_00_00=30001,&Colori righe

17
sc/sc2600.cpp
View File

@ -15,16 +15,16 @@
// Stampa prospetto scadenze // Stampa prospetto scadenze
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
#define NUMERO_FASCE 6 #define NUMERO_FASCE 9
#define LIMITI {0, 30, 60, 90, 120, 150, 180} #define LIMITI {0, 30, 60, 90, 120, 150, 180, 210, 240, 270}
enum tipo_st {clienti=0, fornitori=1}; enum tipo_st {clienti=0, fornitori=1};
class TLineTotal : public TObject //Oggetto di base per i TAssoc_array dei totali class TLineTotal : public TObject //Oggetto di base per i TAssoc_array dei totali
{ {
public: public:
real _s[6];// Scaglioni scaduto real _s[NUMERO_FASCE];// Scaglioni scaduto
real _ns[6];// Scaglioni a scadere real _ns[NUMERO_FASCE];// Scaglioni a scadere
real _es; // esposto real _es; // esposto
real _sl; // saldo real _sl; // saldo
@ -100,7 +100,7 @@ public:
void print_totali(int nriga); void print_totali(int nriga);
void print_header(); void print_header();
int calc_last_column(); int calc_last_column();
void update_totals(bool what, real& esp, real s[6], real ns[6]); void update_totals(bool what, real& esp, real s[NUMERO_FASCE], real ns[NUMERO_FASCE]);
void compute_unassigned(TPartita& p, const TDate & datalim); void compute_unassigned(TPartita& p, const TDate & datalim);
void compute_all(TPartita& p, TBill& bill); void compute_all(TPartita& p, TBill& bill);
void print_real(TString& dest, const real& num); void print_real(TString& dest, const real& num);
@ -139,8 +139,7 @@ bool TProspettoScadenze::fil_function(const TRelation *r)
} }
void TProspettoScadenze::update_totals(bool what, real& esp, void TProspettoScadenze::update_totals(bool what, real& esp,
real s[6], real s[NUMERO_FASCE], real ns[NUMERO_FASCE])
real ns[6])
{ {
TAssoc_array& a = (TAssoc_array&) _t[what]; TAssoc_array& a = (TAssoc_array&) _t[what];
TLineTotal *ll = (TLineTotal *) a.objptr(_codval); TLineTotal *ll = (TLineTotal *) a.objptr(_codval);
@ -190,8 +189,8 @@ void TProspettoScadenze::compute_unassigned(TPartita& p, const TDate & datalim)
void TProspettoScadenze::compute_all(TPartita& p, TBill& bill) void TProspettoScadenze::compute_all(TPartita& p, TBill& bill)
{ {
real residuo; real residuo;
real s[6]; real s[NUMERO_FASCE];
real ns[6]; real ns[NUMERO_FASCE];
real res_pagati; real res_pagati;
real esposto; real esposto;

10
sc/sc2600a.uml
View File

@ -214,6 +214,9 @@ BEGIN
ITEM "3|90" ITEM "3|90"
ITEM "4|120" ITEM "4|120"
ITEM "5|150" ITEM "5|150"
ITEM "6|180"
ITEM "7|210"
ITEM "8|240"
END END
BOOLEAN F_ASCADINFASCE BOOLEAN F_ASCADINFASCE
@ -233,8 +236,11 @@ BEGIN
ITEM "3|90" ITEM "3|90"
ITEM "4|120" ITEM "4|120"
ITEM "5|150" ITEM "5|150"
NUM_EXPR {#F_SCADFASCE+#F_ASCADFASCE<7} ITEM "6|180"
WARNING "E' possibile selezionare massimo 6 fasce in totale" ITEM "7|210"
ITEM "8|240"
NUM_EXPR {#F_SCADFASCE+#F_ASCADFASCE < 10}
WARNING "E' possibile selezionare massimo 9 fasce in totale"
END END
ENDPAGE ENDPAGE