Patch level :10.0
Files correlati : Ricompilazione Demo : [ ] Commento : riporto da 3.2 0000864: anomalia 852 Descrizione Allego la documentazione mandata dal cliente relativa all'anomalia 852 che non viene riconosciuta come vera (e che non sono riuscita ad allegare riaprendo la segnalazione 852). Rifacendo la prova viene con la partita iva al posto del codice fiscale anche da me. Mi sono persa qualche patch? git-svn-id: svn://10.65.10.50/trunk@17001 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
parent
fd5895ea37
commit
e69a338ad2
@ -110,9 +110,18 @@ real TDichiarazione_CONAI::clifo_conai(const TCli_for& clifo, const int conai_sp
|
|||||||
if (conai_specie >= 0 && conai_specie < 6)
|
if (conai_specie >= 0 && conai_specie < 6)
|
||||||
cfven_perc_conai = cfven_rec.get_real(campi[conai_specie]);
|
cfven_perc_conai = cfven_rec.get_real(campi[conai_specie]);
|
||||||
|
|
||||||
paiv = clifo.get(CLI_PAIV);
|
//vecchio modo con piva che fa precedenza a cofi
|
||||||
|
/*paiv = clifo.get(CLI_PAIV);
|
||||||
if (paiv.empty())
|
if (paiv.empty())
|
||||||
|
paiv = clifo.get(CLI_COFI);*/
|
||||||
|
|
||||||
|
//nuovo metodo con logica rovesciata (fino al prossimo cambio di idea!)
|
||||||
paiv = clifo.get(CLI_COFI);
|
paiv = clifo.get(CLI_COFI);
|
||||||
|
if (paiv.empty())
|
||||||
|
{
|
||||||
|
paiv = clifo.get(CLI_PAIV);
|
||||||
|
paiv << " (PI)";
|
||||||
|
}
|
||||||
|
|
||||||
return cfven_perc_conai;
|
return cfven_perc_conai;
|
||||||
}
|
}
|
||||||
@ -662,9 +671,9 @@ void TDichiarazione_CONAI::elabora(const TMask& mask) const
|
|||||||
//accoppa la riga con le intestazioni dei campi
|
//accoppa la riga con le intestazioni dei campi
|
||||||
csv->destroy(0);
|
csv->destroy(0);
|
||||||
|
|
||||||
/*#ifdef DBG
|
#ifdef DBG
|
||||||
xvt_sys_goto_url(path, "open");
|
xvt_sys_goto_url(path, "open");
|
||||||
#endif*/
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
//creazione del report di stampa
|
//creazione del report di stampa
|
||||||
|
@ -279,7 +279,7 @@
|
|||||||
|
|
||||||
#THIS !</prescript>
|
#THIS !</prescript>
|
||||||
</field>
|
</field>
|
||||||
<field x="29.25" y="5.25" type="Numero" align="right" width="10" id="130" pattern="1" hide_zero="1" text="#####@,@@@">
|
<field x="29.25" y="8.25" type="Numero" valign="center" align="right" width="10" height="1.5" id="130" pattern="1" hide_zero="1" text="#####@,@@@">
|
||||||
<prescript description="F0.130 PRESCRIPT">#THIS @
|
<prescript description="F0.130 PRESCRIPT">#THIS @
|
||||||
1000 F;
|
1000 F;
|
||||||
|
|
||||||
@ -291,7 +291,7 @@
|
|||||||
|
|
||||||
#THIS !</prescript>
|
#THIS !</prescript>
|
||||||
</field>
|
</field>
|
||||||
<field x="29.25" y="8.25" type="Numero" valign="center" align="right" width="10" height="1.5" id="150" pattern="1" hide_zero="1" text="#####@,@@@">
|
<field x="29.25" y="5.25" type="Numero" align="right" width="10" id="150" pattern="1" hide_zero="1" text="#####@,@@@">
|
||||||
<prescript description="F0.150 PRESCRIPT">#THIS @
|
<prescript description="F0.150 PRESCRIPT">#THIS @
|
||||||
1000 F;
|
1000 F;
|
||||||
|
|
||||||
@ -363,7 +363,7 @@
|
|||||||
|
|
||||||
#THIS !</prescript>
|
#THIS !</prescript>
|
||||||
</field>
|
</field>
|
||||||
<field x="39.75" y="5.25" type="Numero" align="right" width="10" id="230" pattern="1" hide_zero="1" text="#####@,@@@">
|
<field x="39.75" y="8.25" type="Numero" valign="center" align="right" width="10" height="1.5" id="230" pattern="1" hide_zero="1" text="#####@,@@@">
|
||||||
<prescript description="F0.230 PRESCRIPT">#THIS @
|
<prescript description="F0.230 PRESCRIPT">#THIS @
|
||||||
1000 F;
|
1000 F;
|
||||||
|
|
||||||
@ -375,7 +375,7 @@
|
|||||||
|
|
||||||
#THIS !</prescript>
|
#THIS !</prescript>
|
||||||
</field>
|
</field>
|
||||||
<field x="39.75" y="8.25" type="Numero" valign="center" align="right" width="10" height="1.5" id="250" pattern="1" hide_zero="1" text="#####@,@@@">
|
<field x="39.75" y="5.25" type="Numero" align="right" width="10" id="250" pattern="1" hide_zero="1" text="#####@,@@@">
|
||||||
<prescript description="F0.250 PRESCRIPT">#THIS @
|
<prescript description="F0.250 PRESCRIPT">#THIS @
|
||||||
1000 F;
|
1000 F;
|
||||||
|
|
||||||
@ -397,9 +397,9 @@
|
|||||||
<field x="83.37" y="0.31" type="Valuta" hidden="1" align="right" width="10" id="320" pattern="1" hide_zero="1" text="#########,@@" />
|
<field x="83.37" y="0.31" type="Valuta" hidden="1" align="right" width="10" id="320" pattern="1" hide_zero="1" text="#########,@@" />
|
||||||
<field x="83.37" y="11.81" type="Valuta" valign="center" hidden="1" align="right" width="10" height="1.75" id="322" pattern="1" hide_zero="1" text="#########,@@" />
|
<field x="83.37" y="11.81" type="Valuta" valign="center" hidden="1" align="right" width="10" height="1.75" id="322" pattern="1" hide_zero="1" text="#########,@@" />
|
||||||
<field x="83.37" y="13.56" type="Valuta" hidden="1" align="right" width="10" id="323" pattern="1" hide_zero="1" text="#########,@@" />
|
<field x="83.37" y="13.56" type="Valuta" hidden="1" align="right" width="10" id="323" pattern="1" hide_zero="1" text="#########,@@" />
|
||||||
<field x="83.37" y="5.31" type="Valuta" hidden="1" align="right" width="10" id="330" pattern="1" hide_zero="1" text="#########,@@" />
|
<field x="83.37" y="8.31" type="Valuta" valign="center" hidden="1" align="right" width="10" height="1.5" id="330" pattern="1" hide_zero="1" text="#########,@@" />
|
||||||
<field x="83.37" y="10.81" type="Valuta" hidden="1" align="right" width="10" id="340" pattern="1" hide_zero="1" text="#########,@@" />
|
<field x="83.37" y="10.81" type="Valuta" hidden="1" align="right" width="10" id="340" pattern="1" hide_zero="1" text="#########,@@" />
|
||||||
<field x="83.37" y="8.31" type="Valuta" valign="center" hidden="1" align="right" width="10" height="1.5" id="350" pattern="1" hide_zero="1" text="#########,@@" />
|
<field x="83.37" y="5.31" type="Valuta" hidden="1" align="right" width="10" id="350" pattern="1" hide_zero="1" text="#########,@@" />
|
||||||
<field x="83.37" y="14.56" type="Valuta" hidden="1" align="right" width="10" id="399" pattern="1" hide_zero="1" text="#########,@@" />
|
<field x="83.37" y="14.56" type="Valuta" hidden="1" align="right" width="10" id="399" pattern="1" hide_zero="1" text="#########,@@" />
|
||||||
<field x="53" y="7.25" type="Valuta" align="right" width="5" id="410" pattern="1" hide_zero="1" text="#########,@@">
|
<field x="53" y="7.25" type="Valuta" align="right" width="5" id="410" pattern="1" hide_zero="1" text="#########,@@">
|
||||||
<prescript description="F0.410 PRESCRIPT">#310 @
|
<prescript description="F0.410 PRESCRIPT">#310 @
|
||||||
@ -471,7 +471,7 @@ ROUND 2
|
|||||||
ROUND 2
|
ROUND 2
|
||||||
#THIS !</prescript>
|
#THIS !</prescript>
|
||||||
</field>
|
</field>
|
||||||
<field x="53" y="5.25" type="Valuta" align="right" width="5" id="430" pattern="1" hide_zero="1" text="#########,@@">
|
<field x="53" y="8.25" type="Valuta" valign="center" align="right" width="5" height="1.5" id="430" pattern="1" hide_zero="1" text="#########,@@">
|
||||||
<prescript description="F0.430 PRESCRIPT">#330 @
|
<prescript description="F0.430 PRESCRIPT">#330 @
|
||||||
#230 @
|
#230 @
|
||||||
F;
|
F;
|
||||||
@ -485,7 +485,7 @@ ROUND 2
|
|||||||
ROUND 2
|
ROUND 2
|
||||||
#THIS !</prescript>
|
#THIS !</prescript>
|
||||||
</field>
|
</field>
|
||||||
<field x="53" y="8.25" type="Valuta" valign="center" align="right" width="5" height="1.5" id="450" pattern="1" hide_zero="1" text="#########,@@">
|
<field x="53" y="5.25" type="Valuta" align="right" width="5" id="450" pattern="1" hide_zero="1" text="#########,@@">
|
||||||
<prescript description="F0.450 PRESCRIPT">#350 @
|
<prescript description="F0.450 PRESCRIPT">#350 @
|
||||||
#250 @
|
#250 @
|
||||||
F;
|
F;
|
||||||
@ -559,7 +559,7 @@ ROUND 2
|
|||||||
|
|
||||||
#THIS !</prescript>
|
#THIS !</prescript>
|
||||||
</field>
|
</field>
|
||||||
<field x="70.75" y="5.25" type="Numero" align="right" width="10" id="530" pattern="1" hide_zero="1" text="#####@,@@@">
|
<field x="70.75" y="8.25" type="Numero" valign="center" align="right" width="10" height="1.5" id="530" pattern="1" hide_zero="1" text="#####@,@@@">
|
||||||
<prescript description="F0.530 PRESCRIPT">#THIS @
|
<prescript description="F0.530 PRESCRIPT">#THIS @
|
||||||
1000 F;
|
1000 F;
|
||||||
|
|
||||||
@ -571,7 +571,7 @@ ROUND 2
|
|||||||
|
|
||||||
#THIS !</prescript>
|
#THIS !</prescript>
|
||||||
</field>
|
</field>
|
||||||
<field x="70.75" y="8.25" type="Numero" valign="center" align="right" width="10" height="1.5" id="550" pattern="1" hide_zero="1" text="#####@,@@@">
|
<field x="70.75" y="5.25" type="Numero" align="right" width="10" id="550" pattern="1" hide_zero="1" text="#####@,@@@">
|
||||||
<prescript description="F0.550 PRESCRIPT">#THIS @
|
<prescript description="F0.550 PRESCRIPT">#THIS @
|
||||||
1000 F;
|
1000 F;
|
||||||
|
|
||||||
@ -643,7 +643,7 @@ ROUND 2
|
|||||||
*
|
*
|
||||||
#THIS !</prescript>
|
#THIS !</prescript>
|
||||||
</field>
|
</field>
|
||||||
<field x="60.5" y="5.25" type="Valuta" align="right" width="10" id="630" pattern="1" hide_zero="1" text="#########,@@">
|
<field x="60.5" y="8.25" type="Valuta" valign="center" align="right" width="10" height="1.5" id="630" pattern="1" hide_zero="1" text="#########,@@">
|
||||||
<prescript description="F0.630 PRESCRIPT">#230 @
|
<prescript description="F0.630 PRESCRIPT">#230 @
|
||||||
#430 @
|
#430 @
|
||||||
*
|
*
|
||||||
@ -655,7 +655,7 @@ ROUND 2
|
|||||||
*
|
*
|
||||||
#THIS !</prescript>
|
#THIS !</prescript>
|
||||||
</field>
|
</field>
|
||||||
<field x="60.5" y="8.25" type="Valuta" valign="center" align="right" width="10" height="1.5" id="650" pattern="1" hide_zero="1" text="#########,@@">
|
<field x="60.5" y="5.25" type="Valuta" align="right" width="10" id="650" pattern="1" hide_zero="1" text="#########,@@">
|
||||||
<prescript description="F0.650 PRESCRIPT">#250 @
|
<prescript description="F0.650 PRESCRIPT">#250 @
|
||||||
#450 @
|
#450 @
|
||||||
*
|
*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user