Patch level : 12.00 1324

Files correlati     : ca3.exe ca3100.msk ca3200.msk ca3300.msk ca3600.msk
                      ca3700.msk ca3800.msk /ca3900.msk ca3900a.rep

Commento            :

Corretta esportazione excel della stima ricavi per competenza
This commit is contained in:
Alessandro Bonazzi 2024-05-23 14:48:15 +02:00
parent a0218610eb
commit dbf7c77c0f
13 changed files with 89 additions and 78 deletions

View File

@ -2,6 +2,7 @@
#include "camask.h"
#define ALL_EXPORT
#define REPORT
#define CLASS_NAME "ca3100a"
TOOLBAR "topbar" 0 0 0 2

View File

@ -2,6 +2,7 @@
#include "camask.h"
#define ALL_EXPORT
#define REPORT
#define CLASS_NAME "ca3200a"
TOOLBAR "topbar" 0 0 0 2
@ -13,7 +14,7 @@ TOOLBAR "bottombar" 0 -3 0 1
#include <bprintbar.h>
ENDPAGE
PAGE "Selezioni" 0 0 0 2
PAGE "Selezioni" 0 -3 0 1
GROUPBOX DLG_NULL 78 3
BEGIN

View File

@ -1,6 +1,7 @@
#include "ca3300.h"
#define ALL_EXPORT
#define REPORT
#define CLASS_NAME "ca3300a"
TOOLBAR "topbar" 0 0 0 2

View File

@ -2,6 +2,7 @@
#include "camask.h"
#define ALL_EXPORT
#define REPORT
#define CLASS_NAME "ca3600"
TOOLBAR "topbar" 0 0 0 2

View File

@ -2,6 +2,7 @@
#include "camask.h"
#define ALL_EXPORT
#define REPORT
#define CLASS_NAME "ca3700"
TOOLBAR "topbar" 0 0 0 2

View File

@ -543,4 +543,4 @@ int ca3800(int argc, char* argv[])
// CA_3900
// Gestore maschera ca3900 (Stima ricavi di competenza)
// Creatore del report e dell'applicazione
// Creatore del report e dell'applicazione

View File

@ -1,6 +1,7 @@
#include "ca3883a.h"
#define ALL_EXPORT
#define REPORT
#define CLASS_NAME "ca3800a"
TOOLBAR "topbar" 0 0 0 2
@ -246,4 +247,4 @@ END
ENDPAGE
ENDMASK
ENDMASK

View File

@ -14,8 +14,8 @@ void TCRPA_report::merge_array(TString_array& c, TString_array& t,
{
while (c.items() > 0)
{
TObject* cod = c.remove(0,true);
TObject* tes = t.remove(0,true);
TObject* cod = c.TArray::remove(0,true);
TObject* tes = t.TArray::remove(0,true);
codici.TArray::add(cod);
testate.TArray::add(tes);
}

View File

@ -1,11 +1,9 @@
#ifndef __CA3883_H
#define __CA3883_H
#include <assoc.h>
#include <reprint.h>
#include "../cg/cglib.h"
#include "ca3883a.h"
///////////////////////////////////////////////////////////////

View File

@ -108,7 +108,8 @@ protected:
virtual bool get_usr_val(const TString& name, TVariant& var) const;
public:
virtual const char * get_excel_disabled_field() { return "H0.201|H0.202|H0.203|H0.204|H0.205"; }
// virtual const char * get_excel_header_section() override { return "H1"; }
virtual const char * get_excel_disabled_field() override { return "H0.100|H0.101|H0.201|H0.202|H0.203|H0.204|H0.205"; }
void set_filter(const TPrint_stima_ricavi_mask& msk);
};
@ -195,10 +196,9 @@ TTrec * TPrint_stima_ricavi::get_dbase_recdesc(TReport & rep, const TAutomask &
void TPrint_stima_ricavi::execute_print(TReport_book & book, TAutomask & mask, TReport & rep, export_type & type)
{
((TPrint_stima_ricavi_rep &)rep).set_filter((TPrint_stima_ricavi_mask &)mask);
rep.set_export_sections(type);
book.add(rep);
rep.reset_export_sections();
book.add(rep, type);
}
bool TPrint_stima_ricavi::user_destroy()
{
safe_delete(_mask);
@ -227,4 +227,4 @@ int ca3900(int argc, char* argv[])
// CA_3900
// Gestore maschera ca3900 (Stima ricavi di competenza)
// Creatore del report e dell'applicazione
// Creatore del report e dell'applicazione

View File

@ -1,6 +1,7 @@
#include "ca3883a.h"
#define ALL_EXPORT
#define REPORT
#define CLASS_NAME "ca3900"
TOOLBAR "topbar" 0 0 0 2

View File

@ -4,7 +4,6 @@
<font face="Arial Narrow" size="7" />
<section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="" hidden="" page_break="" can_break="" pattern="1">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<field border="2" x="1" y="1.5" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="174" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
<field x="1" y="1.75" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="12" codval="" id="" pattern="1" hide_zero="" text="Include inevasi">
<font italic="1" face="Arial Narrow" size="9" />
</field>
@ -82,7 +81,6 @@ IF
THEN
</prescript>
</field>
<field border="1" x="1" y="5" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="174" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
<field x="1" y="4" deactivated="" type="Testo" hidden="" align="center" link="" dynamic_height="" shade_offset="" width="6" codval="" id="5" pattern="1" hide_zero="" text="Fase">
<prescript description="H0.5 PRESCRIPT">#STAMPAFASI @
EMPTY= IF
@ -101,6 +99,8 @@ ELSE
THEN
</prescript>
</field>
<field border="2" x="1" y="1.5" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="174" codval="" height="0" id="100" pattern="1" hide_zero="" text="" />
<field border="1" x="1" y="5" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="174" codval="" height="0" id="101" pattern="1" hide_zero="" text="" />
<field x="1" y="3" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="15" codval="" id="121" pattern="1" hide_zero="" text="Commessa" />
<field x="1" deactivated="" type="Testo" hidden="" link="" dynamic_height="" shade_offset="" width="10" codval="" id="201" pattern="1" hide_zero="" text="Data stampa">
<font italic="1" face="Arial Narrow" size="8" />
@ -121,17 +121,17 @@ THEN
<section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="1" hidden="" height="4" page_break="" can_break="" pattern="1">
<prescript description="H1 PRESCRIPT">MESSAGE RESET,F1
</prescript>
<field border="1" radius="100" x="2" deactivated="" type="Testo" valign="center" hidden="" align="center" link="" dynamic_height="" shade_offset="25" width="172" codval="" height="2.5" id="" pattern="2" hide_zero="" text="STIMA RICAVI DI COMPETENZA">
<font face="Courier New" bold="1" size="16" />
</field>
<field border="2" x="1" y="3.5" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="174" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
<field x="0.96" y="3" deactivated="" type="Numero" hidden="1" align="right" link="" dynamic_height="" shade_offset="" width="4" codval="" id="2" pattern="1" hide_zero="" text="">
<source>ANNO</source>
</field>
<field border="1" radius="100" x="2" deactivated="" type="Testo" valign="center" hidden="" align="center" link="" dynamic_height="" shade_offset="25" width="172" codval="" height="2.5" id="100" pattern="2" hide_zero="" text="STIMA RICAVI DI COMPETENZA">
<font face="Courier New" bold="1" size="16" />
</field>
</section>
<section repeat="" keep_with_next="" deactivated="" hidden_if_needed="" type="Head" level="2" hidden="" height="1.5" page_break="1" can_break="" pattern="1">
<groupby>(LEVEL&#3C;2)||(LEVEL=4)</groupby>
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<groupby>(LEVEL&#3C;2)||(LEVEL=4)</groupby>
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<prescript description="H2 PRESCRIPT">MESSAGE RESET,F2
</prescript>
<field border="1" x="1" y="1.25" deactivated="" type="Linea" hidden="" link="" dynamic_height="" shade_offset="" width="174" codval="" height="0" id="" pattern="1" hide_zero="" text="" />
@ -290,21 +290,21 @@ THEN
<field x="58.5" y="1.5" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="14" codval="" id="101" pattern="1" hide_zero="" text="###.###.###,@@" />
<field x="72.5" y="1.5" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="14" codval="" id="102" pattern="1" hide_zero="" text="###.###.###,@@" />
<field x="89.5" y="1.5" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="6" codval="" id="103" pattern="1" hide_zero="" text="##@,@@">
<prescript description="F1.103 PRESCRIPT">#101 @
0 = IF
100
ELSE
#102 @
100 *
#101 @ &#2F;
2 ROUND
DUP
100 &#3E; IF
DROP
100
THEN
THEN
#THIS !</prescript>
<prescript description="F1.103 PRESCRIPT">#101 @
0 = IF
100
ELSE
#102 @
100 *
#101 @ &#2F;
2 ROUND
DUP
100 &#3E; IF
DROP
100
THEN
THEN
#THIS !</prescript>
</field>
<field x="98" y="1.5" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="14" codval="" id="104" pattern="1" hide_zero="" text="###.###.###,@@" />
<field x="112" y="1.5" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="14" codval="" id="105" pattern="1" hide_zero="" text="###.###.###,@@" />
@ -364,21 +364,21 @@ THEN
</field>
<field x="89" y="1" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="6" codval="" id="103" pattern="1" hide_zero="" text="##@,@@">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<prescript description="F2.103 PRESCRIPT">#101 @
0 = IF
100
ELSE
#102 @
100 *
#101 @ &#2F;
2 ROUND
DUP
100 &#3E; IF
DROP
100
THEN
THEN
#THIS !</prescript>
<prescript description="F2.103 PRESCRIPT">#101 @
0 = IF
100
ELSE
#102 @
100 *
#101 @ &#2F;
2 ROUND
DUP
100 &#3E; IF
DROP
100
THEN
THEN
#THIS !</prescript>
</field>
<field x="97.5" y="1" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="14" codval="" id="104" pattern="1" hide_zero="" text="###.###.###,@@">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
@ -443,21 +443,21 @@ THEN
</postscript>
</field>
<field x="89.5" y="0.5" deactivated="" type="Numero" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="6" codval="" id="103" pattern="1" hide_zero="" text="##@,@@">
<prescript description="F3.103 PRESCRIPT">#101 @
0 = IF
100
ELSE
#102 @
100 *
#101 @ &#2F;
2 ROUND
DUP
100 &#3E; IF
DROP
100
THEN
THEN
#THIS !</prescript>
<prescript description="F3.103 PRESCRIPT">#101 @
0 = IF
100
ELSE
#102 @
100 *
#101 @ &#2F;
2 ROUND
DUP
100 &#3E; IF
DROP
100
THEN
THEN
#THIS !</prescript>
</field>
<field x="97.5" y="0.5" deactivated="" type="Valuta" hidden="" align="right" link="" dynamic_height="" shade_offset="" width="14" codval="" id="104" pattern="1" hide_zero="" text="###.###.###,@@">
<postscript description="F3.104 POSTSCRIPT">MESSAGE ADD,F2.104</postscript>
@ -493,4 +493,4 @@ THEN
</field>
</section>
<sql>USE SALDANA</sql>
</report>
</report>

View File

@ -190,25 +190,31 @@ protected:
class TAnal_mov : public TMultiple_rectype
{
TAssoc_array _saldi;
TAssoc_array _saldind;
TAssoc_array _saldi;
TAssoc_array _saldind;
protected:
void saldo_set_reset(const TRectype& row, const char * contsep, bool reset);
void load_saldi(bool reset);
void kill_saldi() { _saldi.destroy(); }
void update_saldi(bool kill);
bool save_saldi(const int anno = 0);
void update_datacomp() const;
void saldo_set_reset(const TRectype& row, const char * contsep, bool reset);
void load_saldi(bool reset);
void kill_saldi() { _saldi.destroy(); }
void update_saldi(bool kill);
bool save_saldi(const int anno = 0);
void update_datacomp() const;
public:
virtual int readat(TBaseisamfile& f, TRecnotype nrec, word lockop);
virtual int read(TBaseisamfile& f, word op, word lockop);
virtual int write(TBaseisamfile& f) const;
virtual int rewrite(TBaseisamfile& f) const;
virtual int remove(TBaseisamfile& f) const;
virtual int readat(TBaseisamfile& f, TRecnotype nrec, word lockop);
virtual int read(TBaseisamfile& f, word op, word lockop);
virtual int write(TBaseisamfile& f) const;
virtual int rewrite(TBaseisamfile& f) const;
virtual int remove(TBaseisamfile& f) const;
virtual void zero(char c = '\0');
virtual int readat(TRecnotype nrec, word lockop) { return readat(TLocalisamfile(LF_MOVANA), nrec, lockop); }
virtual int read(word op, word lockop) { return read(TLocalisamfile(LF_MOVANA), op, lockop); }
virtual int write() const { TLocalisamfile f(num()); return write(f); }
virtual int rewrite() const { TLocalisamfile f(num()); return rewrite(f); }
virtual int remove() const { TLocalisamfile f(num()); return remove(f); }
public:
int read(long numreg, word lockop = _nolock); // Funzione read di comodo
int read_cgnum(long numreg, word lockop = _nolock); // Funzione read per leggere con il numero di registrazione contabile