From d59ad4f4013b9a5c7113e25b4a679827ed987868 Mon Sep 17 00:00:00 2001 From: luca Date: Thu, 5 Nov 2009 15:42:05 +0000 Subject: [PATCH] Patch level :10.0 502 Files correlati : Ricompilazione Demo : [ ] Commento : 0001464: Stampa bilancio di commessa e stampa mastrini: manca valore di sbilancio Descrizione Nella Stampa bilancio di commessa e nella stampa mastrini manca lo sbilancio DARE/AVERE . git-svn-id: svn://10.65.10.50/trunk@19580 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- ca/ca3300.uml | 4 +- ca/ca3300a.rep | 115 +++++++++++++++++++++++++++++------------------- ca/ca3300b.rep | 117 ++++++++++++++++++++++++++++--------------------- ca/ca3300d.rep | 108 ++++++++++++++++++++++++++++++++++++++++++++- ca/ca3801.cpp | 8 ++-- ca/calib01.cpp | 3 +- 6 files changed, 250 insertions(+), 105 deletions(-) diff --git a/ca/ca3300.uml b/ca/ca3300.uml index c4ec7807c..45c5ac8a4 100755 --- a/ca/ca3300.uml +++ b/ca/ca3300.uml @@ -60,7 +60,7 @@ BEGIN CHECKTYPE NORMAL WARNING "Esercizio assente" ADD RUN cg0 -5 esc - MESSAGE K_SPACE,F_STAMPA + MESSAGE K_SPACE,F_STAMPA END DATE F_DATASTAMPA @@ -88,9 +88,7 @@ RADIOBUTTON F_STAMPA 26 BEGIN PROMPT 31 4 "@bStampa" ITEM "1|Per date limite" - MESSAGE ENABLE,5@ ITEM "2|All'ultima immissione" - MESSAGE CLEAR,5@ END GROUPBOX DLG_NULL 20 4 diff --git a/ca/ca3300a.rep b/ca/ca3300a.rep index 6e96a7b56..03fb84fed 100755 --- a/ca/ca3300a.rep +++ b/ca/ca3300a.rep @@ -3,65 +3,80 @@ Bilancio normale di verifica (raffronto)
- - + + + + + + + + + + + + + + +
+
+ + "F1" AZZERA_TOTALI + + + + + + + #TIPOSTAMPA + + #SYSTEM.RAGSOC - - + + + + #SYSTEM.DATE - - #REPORT.PAGE + + + MESSAGE ISAMREAD,COMMESSE,CODCMS=#COMMESSA,DESCRIZ - - MESSAGE ISAMREAD,COMMESSE,CODCMS=#COMMESSA,DESCRIZ - - + #DATA_INIZIALE - - + + + + #DATA_FINALE - - + + + + #COSTO - - MESSAGE ISAMREAD,CDC,CODCOSTO=#COSTO,DESCRIZ + + MESSAGE ISAMREAD,CDC,CODCOSTO=#COSTO,DESCRIZ - - + + + + #COMMESSA - - MESSAGE ISAMREAD,COMMESSE,CODCMS=#COMMESSA,DESCRIZ + + MESSAGE ISAMREAD,COMMESSE,CODCMS=#COMMESSA,DESCRIZ - - + + + + #FASE - - MESSAGE ISAMREAD,FASI,CODCMSFAS=#CMSCDC!CODFASE=#FASE,DESCRIZ - - - - - - - - - - - - - - -
-
- - + + MESSAGE ISAMREAD,FASI,CODCMSFAS=#CMSCDC!CODFASE=#FASE,DESCRIZ
@@ -97,6 +112,7 @@
+ CODCONTO CA_FORMAT_CONTO @@ -183,11 +199,18 @@ MESSAGE ADD,F2.308|ADD,F3.308|ADD,F4.308
-
+
+ + + + + #REPORT.PAGE + +
#101 != "" - + CA_FORMAT_CONTO @@ -225,7 +248,7 @@
#101 != "" - + CA_FORMAT_CONTO @@ -263,7 +286,7 @@
#101 != "" - + CA_FORMAT_CONTO diff --git a/ca/ca3300b.rep b/ca/ca3300b.rep index 00da02b33..0a0ef4985 100755 --- a/ca/ca3300b.rep +++ b/ca/ca3300b.rep @@ -1,68 +1,76 @@ - Bilancio normale di verifica + Bilancio di verifica (cons - prev)
- - + + + + + + + + + + + + + + +
+
+ + "F1" AZZERA_TOTALI + + + + + #SYSTEM.RAGSOC - - + + + + #SYSTEM.DATE - - #REPORT.PAGE + + + MESSAGE ISAMREAD,COMMESSE,CODCMS=#COMMESSA,DESCRIZ - - MESSAGE ISAMREAD,COMMESSE,CODCMS=#COMMESSA,DESCRIZ - - + #DATA_INIZIALE - - + + #DATA_FINALE - - + + + + #COSTO - - MESSAGE ISAMREAD,CDC,CODCOSTO=#COSTO,DESCRIZ + + MESSAGE ISAMREAD,CDC,CODCOSTO=#COSTO,DESCRIZ - - + + + + #COMMESSA - - MESSAGE ISAMREAD,COMMESSE,CODCMS=#COMMESSA,DESCRIZ + + MESSAGE ISAMREAD,COMMESSE,CODCMS=#COMMESSA,DESCRIZ - - + + + + #FASE - - MESSAGE ISAMREAD,FASI,CODCMSFAS=#CMSCDC!CODFASE=#FASE,DESCRIZ - - - - - - - - - - - - - - -
-
- "F1" AZZERA_TOTALI - - + + MESSAGE ISAMREAD,FASI,CODCMSFAS=#CMSCDC!CODFASE=#FASE,DESCRIZ
@@ -92,6 +100,7 @@
+ SALDO:INI_DARE MESSAGE ADD,F1.103|ADD,F2.103|ADD,F3.103|ADD,F4.103 @@ -125,9 +134,17 @@ DESCR
-
+
+ + + + + #REPORT.PAGE + +
- + + MESSAGE ISAMREAD,PCONANA,CODCONTO=#102,DESCR @@ -144,8 +161,8 @@
#101 != "" - - + + #THIS @ #102 ! CA_FORMAT_CONTO @@ -166,7 +183,7 @@ CA_FORMAT_CONTO
#101 != "" - + #THIS @ #102 ! CA_FORMAT_CONTO @@ -187,7 +204,7 @@ CA_FORMAT_CONTO
#101 != "" - + #THIS @ #102 ! CA_FORMAT_CONTO diff --git a/ca/ca3300d.rep b/ca/ca3300d.rep index bb5da9a5d..70a3475b4 100755 --- a/ca/ca3300d.rep +++ b/ca/ca3300d.rep @@ -80,11 +80,24 @@
SEZIONE + MESSAGE RESET,F2 IF(SEZIONE=="AP","ATTIVITA'","COSTI") + "SEZIONE" @ +"AP" = IF + "PERDITA" "F2.405" ! +ELSE + "UTILE" "F2.405" ! +THEN IF(SEZIONE=="AP","PASSIVITA'","RICAVI") + "SEZIONE" @ +"AP" = IF + "UTILE" "F2.408" ! +ELSE + "PERDITA" "F2.408" ! +THEN
@@ -126,10 +139,20 @@ THEN 1 LEFT:SALDO + #101 @ +1 = IF + #THIS @ + "F2.104" +! +THEN 1 LEFT:SEZIONE + #101 @ +1 = IF + #THIS @ + "F2.105" ! +THEN
@@ -180,5 +213,78 @@ THEN
-
+
+ + + + + + + + + + + 1 + + + 1 + + + 1 + #105 + + + 2 + + + 2 + + + 2 + #205 + + + 1 + + + 1 + #104 @ +#406 @ ++ +#THIS ! + + + 1 + #105 + + + 2 + + + 2 + #204 @ +#409 @ ++ +#THIS ! + + + 2 + #205 + +
\ No newline at end of file diff --git a/ca/ca3801.cpp b/ca/ca3801.cpp index 9affe4243..ea426fa8b 100755 --- a/ca/ca3801.cpp +++ b/ca/ca3801.cpp @@ -198,7 +198,7 @@ void TCRPA_report::offset_and_fill_columns(TReport_section& rep_sect, const TStr TReport_field& rep_field = *rep_sect.find_field(model_id); //prende il rettangolo del campo modello.. - const TRectangle& rep_field_rect = rep_field.get_rect(); + const TReport_rct& rep_field_rect = rep_field.get_rect(); //deve spostare i campi a destra della colonna modello //si memorizza i campi a destra del campo modello per poterli mettere a destra di tutti.. @@ -210,7 +210,7 @@ void TCRPA_report::offset_and_fill_columns(TReport_section& rep_sect, const TStr //solo i campi con un identificatore vanno spostati; gli altri sono parte dello sfondo if (campo.id() > model_id) { - const TRectangle& rct = campo.get_rect(); + const TReport_rct& rct = campo.get_rect(); //se il campo e' a destra del modello lo aggiunge all'array dei campi_a_destra if (rct.left() >= rep_field_rect.right()) campi_a_destra.add(campo); @@ -311,7 +311,7 @@ void TCRPA_report::offset_and_fill_columns(TReport_section& rep_sect, const TStr //e' il campo con il totale delle commesse normali TReport_field* sub_new_field = (TReport_field*)new_field->dup(); rep_sect.add(sub_new_field); - sub_new_field->offset(TPoint(0, 250)); + sub_new_field->offset(TReport_size(0, 250)); sub_new_field->set_id(new_field->id() + 200); sub_new_field->set_groups("90"); sub_new_field->set_postscript(""); @@ -361,7 +361,7 @@ void TCRPA_report::offset_and_fill_columns(TReport_section& rep_sect, const TStr { TReport_field* sub_new_field_margine = (TReport_field*)rep_sect.find_field(169)->dup(); rep_sect.add(sub_new_field_margine); - sub_new_field_margine->offset(TPoint(0, 250)); + sub_new_field_margine->offset(TReport_size(0, 250)); sub_new_field_margine->set_id(369); sub_new_field_margine->set_groups("90"); sub_new_field_margine->set_postscript(""); diff --git a/ca/calib01.cpp b/ca/calib01.cpp index 080c64b1e..7b487ea1d 100755 --- a/ca/calib01.cpp +++ b/ca/calib01.cpp @@ -2129,7 +2129,8 @@ void ca_taglia_campo(TRectype& src, const char* campo_src, TRectype& dst, const void ca_copia_campo(const TRectype& src, const char* campo_src, TRectype& dst, const char* campo_dst) { const TString& valore = src.get(campo_src); - dst.put(campo_dst, valore); + if (valore.full()) + dst.put(campo_dst, valore); } bool ca_implode_rows(const TRecord_array& input_rows, TRecord_array& compact_rows)