Patch level :4.0 430

Files correlati     :
Ricompilazione Demo : [ ]
Commento            :stampa rendiconto: aggiunta voce Tipo piano dei conti in testata


git-svn-id: svn://10.65.10.50/trunk@14096 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2006-06-16 12:16:31 +00:00
parent 90e223f55e
commit 56cfaad1b5
2 changed files with 22 additions and 7 deletions

View File

@ -238,7 +238,7 @@ class TPrint_rendiconto_ca_recordset : public TISAM_recordset
protected: protected:
int _anno; int _anno;
int _tipoconti; TString4 _piano;
TDate _dadata, _adata; TDate _dadata, _adata;
long _danumreg, _anumreg; long _danumreg, _anumreg;
TString _daconto, _aconto, _codcosto, _codcms, _codfas; TString _daconto, _aconto, _codcosto, _codcms, _codfas;
@ -365,6 +365,15 @@ const TVariant& TPrint_rendiconto_ca_recordset::get(const char* column_name) con
var = _codfas; var = _codfas;
return var; return var;
} }
if (strcmp(column_name, "#PIANO") == 0)
{
TVariant& var = get_tmp_var();
if (_piano == "A")
var = "Analitico";
else
var = "Contabile";
return var;
}
if (strcmp(column_name, "#DACONTO") == 0) if (strcmp(column_name, "#DACONTO") == 0)
{ {
TVariant& var = get_tmp_var(); TVariant& var = get_tmp_var();
@ -966,7 +975,7 @@ void TPrint_rendiconto_ca_recordset::set_filter(const TPrint_rendiconto_ca_mask&
_tmp->zap(); _tmp->zap();
//prende un po' di dati dalla maschera... //prende un po' di dati dalla maschera...
_daconto, _aconto, _codcosto = _codcms = _codfas = ""; _piano, _daconto, _aconto, _codcosto, _codcms, _codfas = "";
if (cms_row >= 0) if (cms_row >= 0)
{ {
TSheet_field& sf = msk.sfield(F_RIGHE); TSheet_field& sf = msk.sfield(F_RIGHE);
@ -985,7 +994,8 @@ void TPrint_rendiconto_ca_recordset::set_filter(const TPrint_rendiconto_ca_mask&
//si utilizza la riclassificazione dei conti? //si utilizza la riclassificazione dei conti?
if (msk.get(F_PIANO) == "A") _piano = msk.get(F_PIANO);
if (_piano == "A")
{ {
TConfig& cfg = ca_config(); TConfig& cfg = ca_config();
const bool use_pdcc = cfg.get_bool("UsePdcc"); const bool use_pdcc = cfg.get_bool("UsePdcc");

View File

@ -99,14 +99,19 @@ MESSAGE RESET,F1.102</prescript>
<prescript description="H1.0 PRESCRIPT">MESSAGE ISAMREAD,COMMESSE,CODCMS=#COMMESSA,CHIUSA</prescript> <prescript description="H1.0 PRESCRIPT">MESSAGE ISAMREAD,COMMESSE,CODCMS=#COMMESSA,CHIUSA</prescript>
</field> </field>
<field x="1" y="6.08" type="Testo" width="5" pattern="1" text="Fase:" /> <field x="1" y="6.08" type="Testo" width="5" pattern="1" text="Fase:" />
<field x="1" y="7.5" type="Testo" width="10" pattern="1" text="Da conto:" /> <field x="1" y="7.5" type="Testo" width="15" pattern="1" text="Piano dei conti:" />
<field x="14" y="7.5" type="Stringa" width="23" pattern="1"> <field x="17" y="7.5" type="Stringa" width="12" pattern="1">
<font face="Courier New" bold="1" size="8" />
<source>#PIANO</source>
</field>
<field x="30" y="7.5" type="Testo" width="10" pattern="1" text="Da conto:" />
<field x="43" y="7.5" type="Stringa" width="23" pattern="1">
<font face="Courier New" bold="1" size="8" /> <font face="Courier New" bold="1" size="8" />
<source>#DACONTO</source> <source>#DACONTO</source>
<prescript description="H1.0 PRESCRIPT">CA_FORMAT_CONTO</prescript> <prescript description="H1.0 PRESCRIPT">CA_FORMAT_CONTO</prescript>
</field> </field>
<field x="40" y="7.5" type="Testo" width="10" pattern="1" text="A conto:" /> <field x="69" y="7.5" type="Testo" width="10" pattern="1" text="A conto:" />
<field x="50" y="7.5" type="Stringa" width="23" pattern="1"> <field x="79" y="7.5" type="Stringa" width="23" pattern="1">
<font face="Courier New" bold="1" size="8" /> <font face="Courier New" bold="1" size="8" />
<source>#ACONTO</source> <source>#ACONTO</source>
<prescript description="H1.0 PRESCRIPT">CA_FORMAT_CONTO</prescript> <prescript description="H1.0 PRESCRIPT">CA_FORMAT_CONTO</prescript>