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

Patch level :10.0 950

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
correzioni stampa rendiconto (filtro sui conti) e sulla stima ricavi di competenza (commesse di supporto)


git-svn-id: svn://10.65.10.50/branches/R_10_00@21753 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2011-03-08 11:43:06 +00:00
parent 79ac8df4e2
commit 6cabedc493
4 changed files with 60 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ca/ca2100a.uml
View File

@ -106,7 +106,7 @@ BEGIN
OUTPUT F_CODCAUS CODCAUS
OUTPUT F_DESCAUS DESCR
CHECKTYPE REQUIRED
FLAGS "U"
FLAGS "UG"
FIELD CODCAUS
GROUP 5
END

11
ca/ca3700.cpp
View File

@ -408,6 +408,8 @@ TPrint_rendiconto_ca_recordset::~TPrint_rendiconto_ca_recordset()
//filtro ulteriore sul file rendy.dbf già creato
//questo filtro, all'apparenza inutile, serve per filtrare sulle rmovana create al volo dagli rdoc..
//..che potrebbero presentare conti non pertinenti dovuti ai conti stessi legati ai codart ecc.
void TPrint_rendiconto_ca_recordset::set_custom_filter(TCursor& cur) const
{
//la region serve solo nella chiave 1!!!
@ -1286,8 +1288,13 @@ int TPrint_rendiconto_ca_recordset::crea_filtro_rmovana(const TMask& msk, TRecty
//adesso tocca al filtro
//conti
if (!_riclassificato)
filtro << "BETWEEN(CODCONTO,\"" << _daconto << "\",\"" << _aconto << "\")";
if (!_riclassificato && (_daconto.full() || _aconto.full()))
{
if (_daconto == _aconto)
filtro << "(CODCONTO[1," << _daconto.len() << "]==\"" << _daconto << "\")";
else
filtro << "BETWEEN(CODCONTO,\"" << _daconto << "\",\"" << _aconto << "~\")";
}
//date
if (!_vitaintera)

7
ca/ca3883.cpp
View File

@ -1549,7 +1549,12 @@ const TVariant& TPrint_saldana_recordset::get(const char* column_name) const
if (strcmp(column_name, "COS_PERC") == 0)
{
const int indice = get("LEVEL").as_int();
if (_forza_maturato && indice <= 1)
if (indice == 4)
int cazzone = 100;
//la % dei costi, in caso si forzi il maturato (considerare finite le commesse che terminano nell'esercizio selezionato)..
//..viene posta artificialmente pari a 100% nelle sezioni delle commesse che terminano nell'esercizio selezionato (sez. 0 e 1)..
//..e nella sezione delle commesse di supporto (sez. 4). Richiesta Adolfica del 08/03/2011
if (_forza_maturato && (indice <= 1 || indice == 4))
var.set(CENTO);
else
{

83
ca/ca3900a.rep
View File

@ -2,7 +2,7 @@
<report libraries="ve1300" name="ca3900a" orientation="2" lpi="6" class="ca3900a">
<description>Stima ricavi di competenza CA</description>
<font face="Arial Narrow" size="8" />
<section type="Head">
<section type="Head" pattern="1">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<field x="1" type="Stringa" width="50" pattern="1">
<source>#SYSTEM.RAGSOC</source>
@ -34,10 +34,10 @@
<field border="1" x="1" y="4" type="Linea" width="164" height="0" pattern="1" />
<field x="1" y="3" type="Testo" width="15" id="121" pattern="1" text="Commessa" />
</section>
<section type="Head" level="1" height="4">
<section type="Head" level="1" height="4" pattern="1">
<prescript description="H1 PRESCRIPT">MESSAGE RESET,F1
</prescript>
<field border="1" radius="100" x="2" type="Testo" valign="center" align="center" shade_offset="25" width="162" height="2.5" text="STIMA RICAVI DI COMPETENZA">
<field border="1" radius="100" x="2" type="Testo" valign="center" align="center" shade_offset="25" width="162" height="2.5" pattern="2" text="STIMA RICAVI DI COMPETENZA">
<font face="Courier New" bold="1" size="16" />
</field>
<field border="2" x="1" y="3.5" type="Linea" width="164" height="0" pattern="1" />
@ -45,8 +45,8 @@
<source>ANNO</source>
</field>
</section>
<section type="Head" level="2" height="1.5" page_break="1">
<groupby>LEVEL &#3C; 2</groupby>
<section type="Head" level="2" height="1.5" page_break="1" pattern="1">
<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>
@ -55,40 +55,42 @@
<source>LEVEL</source>
<postscript description="H2.97 POSTSCRIPT">MESSAGE COPY,F2.97</postscript>
</field>
<field x="1" type="Array" bg_color="#C0C0C0" width="22" id="98">
<field x="1" type="Array" bg_color="#C0C0C0" width="22" id="98" pattern="2">
<source>LEVEL</source>
<list>
<li Value="Commesse terminate nel" Code="0" />
<li Value="Commesse terminate nel" Code="1" />
<li Value="Commesse in corso entro fine" Code="2" />
<li Value="Commesse in corso entro fine" Code="3" />
<li Value="Commesse di supporto del" Code="4" />
</list>
</field>
<field x="23" type="Numero" align="right" bg_color="#C0C0C0" width="6" id="99">
<field x="23" type="Numero" align="right" bg_color="#C0C0C0" width="6" id="99" pattern="2">
<source>ANNO</source>
</field>
</section>
<section type="Head" level="3" height="1.5">
<section type="Head" level="3" height="1.5" pattern="1">
<groupby>LEVEL</groupby>
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<prescript description="H3 PRESCRIPT">MESSAGE RESET,F3</prescript>
<field x="3" type="Array" bg_color="#C0C0C0" width="40" pattern="1">
<field border="1" x="2" y="1.25" type="Linea" width="164" height="0" pattern="1" />
<field type="Numero" hidden="1" align="right" width="1" id="97" pattern="1">
<source>LEVEL</source>
<postscript description="H3.97 POSTSCRIPT">MESSAGE COPY,F3.97</postscript>
</field>
<field x="3" type="Array" bg_color="#C0C0C0" width="40" id="98" pattern="1">
<source>LEVEL</source>
<list>
<li Value="Commesse avviate in esercizi precedenti" Code="0" />
<li Value="Commesse avviate nell'esercizio selezionato" Code="1" />
<li Value="Commesse avviate in esercizi precedenti" Code="2" />
<li Value="Commesse avviate nell'esercizio selezionato" Code="3" />
<li Value="Commesse di supporto dell'esercizio" Code="4" />
</list>
</field>
<field border="1" x="2" y="1.25" type="Linea" width="164" height="0" pattern="1" />
<field type="Numero" hidden="1" align="right" width="1" id="97" pattern="1">
<source>LEVEL</source>
<postscript description="H3.97 POSTSCRIPT">MESSAGE COPY,F3.97</postscript>
</field>
</section>
<section type="Body" />
<section type="Body" level="1">
<section type="Body" pattern="1" />
<section type="Body" level="1" pattern="1">
<field x="1" type="Stringa" width="17" pattern="1">
<source>CODCMS</source>
</field>
@ -160,7 +162,7 @@ THEN
#THIS !</prescript>
</field>
</section>
<section type="Foot">
<section type="Foot" pattern="1">
<field border="1" x="1" y="0.25" type="Linea" width="164" height="0" pattern="1" />
<field x="2" y="0.5" type="Testo" width="20" pattern="1" text="Stima ricavi di competenza">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
@ -170,10 +172,10 @@ THEN
<source>H1.2</source>
</field>
</section>
<section type="Foot" level="1" height="3">
<section type="Foot" level="1" height="3" pattern="1">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<field border="2" x="1" y="0.75" type="Linea" width="164" height="0" pattern="1" />
<field x="1" y="1.5" type="Testo" fg_color="#FFFFFF" bg_color="#000000" width="25" height="1.5" text="TOTALI GENERALI " />
<field x="1" y="1.5" type="Testo" fg_color="#FFFFFF" bg_color="#000000" width="25" height="1.5" pattern="2" text="TOTALI GENERALI " />
<field x="83" y="1.5" type="Testo" align="center" width="2" pattern="1" text="%" />
<field x="164" y="1.5" type="Testo" align="center" width="2" pattern="1" text="%" />
<field x="45" y="1.5" type="Valuta" align="right" width="14" id="101" pattern="1" text="###.###.###,@@" />
@ -218,23 +220,9 @@ THEN
#THIS !</prescript>
</field>
</section>
<section type="Foot" level="2" height="2.5">
<section type="Foot" level="2" height="2.5" pattern="1">
<font italic="1" face="Courier New" bold="1" size="8" />
<field border="1" x="1" y="0.5" type="Linea" width="164" height="0" pattern="1" />
<field x="1" y="1" type="Array" bg_color="#C0C0C0" width="28">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<source>H2.98</source>
<list>
<li Value="TOTALI Commesse terminate nel" Code="0" />
<li Value="TOTALI Commesse terminate nel" Code="1" />
<li Value="TOTALI Commesse in corso entro fine" Code="2" />
<li Value="TOTALI Commesse in corso entro fine" Code="3" />
</list>
</field>
<field x="29" y="1" type="Numero" align="right" bg_color="#C0C0C0" width="6">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<source>H2.99</source>
</field>
<field x="83" y="1" type="Testo" align="center" width="2" pattern="1" text="%">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
</field>
@ -242,6 +230,21 @@ THEN
<font italic="1" face="Arial Narrow" bold="1" size="8" />
</field>
<field y="1" type="Numero" hidden="1" align="right" width="1" id="97" pattern="1" />
<field x="1" y="1" type="Array" bg_color="#C0C0C0" width="28" id="98" pattern="2">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<source>H2.98</source>
<list>
<li Value="TOTALI Commesse terminate nel" Code="0" />
<li Value="TOTALI Commesse terminate nel" Code="1" />
<li Value="TOTALI Commesse in corso entro fine" Code="2" />
<li Value="TOTALI Commesse in corso entro fine" Code="3" />
<li Value="TOTALI Commesse di supporto del" Code="4" />
</list>
</field>
<field x="29" y="1" type="Numero" align="right" bg_color="#C0C0C0" width="6" id="99" pattern="2">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<source>H2.99</source>
</field>
<field x="45" y="1" type="Valuta" align="right" width="14" id="101" pattern="1" text="###.###.###,@@">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<postscript description="F2.101 POSTSCRIPT">MESSAGE ADD,F1.101</postscript>
@ -307,20 +310,22 @@ THEN
#THIS !</prescript>
</field>
</section>
<section type="Foot" level="3" height="2">
<section type="Foot" level="3" height="2" pattern="1">
<font italic="1" face="Arial Narrow" bold="1" size="8" />
<field border="1" x="2" y="0.25" type="Linea" width="164" height="0" pattern="1" />
<field x="2" y="0.5" type="Array" bg_color="#C0C0C0" width="40" pattern="1">
<field x="83" y="0.5" type="Testo" align="center" width="2" pattern="1" text="%" />
<field x="164" y="0.5" type="Testo" align="center" width="2" pattern="1" text="%" />
<field y="0.5" type="Numero" hidden="1" align="right" width="1" id="97" pattern="1" />
<field x="2" y="0.5" type="Array" bg_color="#C0C0C0" width="40" id="98" pattern="1">
<source>H3.98</source>
<list>
<li Value="TOTALI Commesse avviate in esercizi precedenti" Code="0" />
<li Value="TOTALI Commesse avviate nell'esercizio selezionato" Code="1" />
<li Value="TOTALI Commesse avviate in esercizi precedenti" Code="2" />
<li Value="TOTALI Commesse avviate nell'esercizio selezionato" Code="3" />
<li Value="TOTALI Commesse di supporto" Code="4" />
</list>
</field>
<field x="83" y="0.5" type="Testo" align="center" width="2" pattern="1" text="%" />
<field x="164" y="0.5" type="Testo" align="center" width="2" pattern="1" text="%" />
<field y="0.5" type="Numero" hidden="1" align="right" width="1" id="97" pattern="1" />
<field x="45" y="0.5" type="Valuta" align="right" width="14" id="101" pattern="1" text="###.###.###,@@">
<postscript description="F3.101 POSTSCRIPT">MESSAGE ADD,F2.101</postscript>
</field>