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

Patch level :2.2 160

Browse Source 
Files correlati     :ca3700a.rep
Ricompilazione Demo : [ ]
Commento            :rendiconto! prime modifiche richieste dal CREPA


git-svn-id: svn://10.65.10.50/trunk@13296 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2005-07-26 17:55:00 +00:00
parent c718396297
commit 555197d9dd
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ca/ca3700.cpp
View File

@ -82,7 +82,7 @@ bool TPrint_rendiconto_ca_mask::on_field_event(TOperable_field& o, TField_event
{
TEsercizi_contabili esc; //..le date devono essere incluse nell'esercizio selezionato!
const TDate data = o.get();
if (esc.date2esc(data) != anno)
if (!data.empty() && esc.date2esc(data) != anno)
return error_box(TR("La data deve appartenere all'anno selezionato"));
}
}
@ -585,7 +585,7 @@ void TPrint_rendiconto_ca_recordset::salva_rmovana(const TRectype& rmovana, cons
(_a_conto_riclas.not_empty() && conto_riclassificato.compare(_a_conto_riclas, _a_conto_riclas.len()) > 0))
return;
}
} //if(_riclassificato)
else //...sennò si usa il normale piano dei conti analitico (cioè tutti tranne che il CRPA)
tmpcurr.put("CONTO", rmovana.get(RMOVANA_CODCONTO)); //conto
@ -667,12 +667,12 @@ void TPrint_rendiconto_ca_recordset::salva_rmovana(const TRectype& rmovana, cons
break;
}
tmpcurr.put("DOCORIG", riferimento);
}
} //if(newdoc != NULL)
//campi comuni
tmpcurr.put("DESC", movana.get(MOVANA_DESCR)); //descrizione movana
tmpcurr.put("NRIGA", rmovana.get(RMOVANA_NUMRIG));
tmpcurr.put("NRIGA", rmovana.get(RMOVANA_NUMRIG)); //numero riga
tmpcurr.put("DESCRIGA", rmovana.get(RMOVANA_DESCR)); //descrizione rmovana
/*[Tipo documento]
@ -712,7 +712,7 @@ F=IMF*/
if (should_delete)
delete newdoc;
}
} //if (tipomov == ..)
}
@ -860,9 +860,9 @@ void TPrint_rendiconto_ca_recordset::crea_righe_rdoc(const TPrint_rendiconto_ca_
{
salva_rmovana(mov.body()[j], mov, &doc);
} //for int j...
} //for cur_doc..
} //if doc_items
}
} //for cur_rdoc..
} //if rdoc_items
} //FOR_EACH_SHEET_ROW
}

10
ca/ca3700a.rep
View File

@ -77,6 +77,16 @@ MESSAGE RESET,F2.103</prescript>
<font italic="1" face="Courier New" bold="1" size="8" />
<prescript description="H2.0 PRESCRIPT">MESSAGE ISAMREAD,PCONANA,CODCONTO=CONTO,DESCR</prescript>
</field>
<field x="74" y="0.5" type="Testo" align="right" bg_color="#C0C0C0" width="51" text="Budget &#3E;&#3E;&#3E;">
<font face="Courier New" bold="1" size="8" />
</field>
<field x="125" y="0.5" type="Valuta" align="right" bg_color="#C0C0C0" width="15" id="101" hide_zero="1" text="###.###.###,@@">
<font italic="1" face="Courier New" bold="1" size="8" />
</field>
<field x="140" y="0.5" type="Valuta" align="right" bg_color="#C0C0C0" width="15" id="102" hide_zero="1" text="###.###.###,@@">
<font italic="1" face="Courier New" bold="1" size="8" />
<source>#VARIAZIONE</source>
</field>
<field x="155" y="0.5" type="Valuta" align="right" bg_color="#C0C0C0" width="15" id="103" hide_zero="1" text="###.###.###,@@">
<font italic="1" face="Courier New" bold="1" size="8" />
<source>#PREVENTIVO</source>