Skip to content

Commit

Permalink
BugID: 1010 - Cambiato arrotondamento effettuato su Sigla in ROUND_HA…
Browse files Browse the repository at this point in the history 
…LF_UP
  • Loading branch information
rpucciarelli committed Jul 19, 2012
1 parent f69129a commit 388ef40
Show file tree
Hide file tree
Showing 103 changed files with 417 additions and 417 deletions.
4 changes: 2 additions & 2 deletions sigla-ejb/src/main/java/it/cnr/contab/compensi00/bp/CRUDAddizionaliBP.java
View file
Expand Up @@ -107,7 +107,7 @@ public void doCarica(ActionContext context,File file) throws BusinessProcessExce
if (c.getCellType()==1)
ali=c.getStringCellValue();
else if (c.getCellType()==0)
ali_num=new BigDecimal(c.getNumericCellValue()).setScale(2,java.math.BigDecimal.ROUND_HALF_EVEN);
ali_num=new BigDecimal(c.getNumericCellValue()).setScale(2,java.math.BigDecimal.ROUND_HALF_UP);
if (!((codcat!=null && comune!=null && prov!=null &&(ali!=null || ali_num!=null))||
(codcat==null && comune==null && prov==null &&(ali==null || ali_num==null))))
throw new ApplicationException("Formato file non valido!");
Expand All @@ -133,7 +133,7 @@ else if (c.getCellType()==0)
if (c.getCellType()==1)
ali=c.getStringCellValue();
else if (c.getCellType()==0)
ali_num=new BigDecimal(c.getNumericCellValue()).setScale(2,java.math.BigDecimal.ROUND_HALF_EVEN);
ali_num=new BigDecimal(c.getNumericCellValue()).setScale(2,java.math.BigDecimal.ROUND_HALF_UP);

if(ali!= null && ali.compareTo("0*")==0)
ali=null;
Expand Down
14 changes: 7 additions & 7 deletions sigla-ejb/src/main/java/it/cnr/contab/compensi00/bp/CRUDBonusBP.java
View file
Expand Up @@ -384,9 +384,9 @@ public void Estrazione(ActionContext context) throws ComponentException, RemoteE
// totali
if(mod==1){
bw.append("BS007004");
bw.append(Formatta((bonus.getIm_reddito_nucleo_f().setScale(0,java.math.BigDecimal.ROUND_HALF_EVEN)).toString(),"D",16," "));
bw.append(Formatta((bonus.getIm_reddito_nucleo_f().setScale(0,java.math.BigDecimal.ROUND_HALF_UP)).toString(),"D",16," "));
bw.append("BS008001");
bw.append(Formatta((bonus.getIm_bonus().setScale(0,java.math.BigDecimal.ROUND_HALF_EVEN)).toString(),"D",16," "));
bw.append(Formatta((bonus.getIm_bonus().setScale(0,java.math.BigDecimal.ROUND_HALF_UP)).toString(),"D",16," "));
}
completaRiga(bw,prog,altro,mod);
mod=mod+1;
Expand All @@ -411,7 +411,7 @@ public void Estrazione(ActionContext context) throws ComponentException, RemoteE
if(mod==1){
bw.append("BS001004");
//?? arrotondamenti ???
bw.append(Formatta((bonus.getIm_reddito().setScale(0,java.math.BigDecimal.ROUND_HALF_EVEN)).toString(),"D",16," "));
bw.append(Formatta((bonus.getIm_reddito().setScale(0,java.math.BigDecimal.ROUND_HALF_UP)).toString(),"D",16," "));
}
}
if(prog==1 && dettaglio.getTipo_componente_nucleo().compareTo(Bonus_nucleo_famBulk.CONIUGE)==0){
Expand All @@ -420,7 +420,7 @@ public void Estrazione(ActionContext context) throws ComponentException, RemoteE
bw.append("BS002003");
bw.append(Formatta(dettaglio.getCf_componente_nucleo(),"S",16," "));
bw.append("BS002004");
bw.append(Formatta((dettaglio.getIm_reddito_componente().setScale(0,java.math.BigDecimal.ROUND_HALF_EVEN)).toString(),"D",16," "));
bw.append(Formatta((dettaglio.getIm_reddito_componente().setScale(0,java.math.BigDecimal.ROUND_HALF_UP)).toString(),"D",16," "));
}
else if(prog==1 && dettaglio.getTipo_componente_nucleo().compareTo(Bonus_nucleo_famBulk.CONIUGE)!=0){
prog=prog+1;
Expand All @@ -433,7 +433,7 @@ else if(prog==1 && dettaglio.getTipo_componente_nucleo().compareTo(Bonus_nucleo_
bw.append("BS00"+(prog+1)+"003");
bw.append(Formatta(dettaglio.getCf_componente_nucleo(),"S",16," "));
bw.append("BS00"+(prog+1)+"004");
bw.append(Formatta((dettaglio.getIm_reddito_componente().setScale(0,java.math.BigDecimal.ROUND_HALF_EVEN)).toString(),"D",16," "));
bw.append(Formatta((dettaglio.getIm_reddito_componente().setScale(0,java.math.BigDecimal.ROUND_HALF_UP)).toString(),"D",16," "));
}
}

Expand All @@ -443,9 +443,9 @@ else if(prog==1 && dettaglio.getTipo_componente_nucleo().compareTo(Bonus_nucleo_
// totali
if(mod==1){
bw.append("BS007004");
bw.append(Formatta((bonus.getIm_reddito_nucleo_f().setScale(0,java.math.BigDecimal.ROUND_HALF_EVEN)).toString(),"D",16," "));
bw.append(Formatta((bonus.getIm_reddito_nucleo_f().setScale(0,java.math.BigDecimal.ROUND_HALF_UP)).toString(),"D",16," "));
bw.append("BS008001");
bw.append(Formatta((bonus.getIm_bonus().setScale(0,java.math.BigDecimal.ROUND_HALF_EVEN)).toString(),"D",16," "));
bw.append(Formatta((bonus.getIm_bonus().setScale(0,java.math.BigDecimal.ROUND_HALF_UP)).toString(),"D",16," "));
}
completaRiga(bw,prog,altro,mod);
bw.append(Formatta(null,"S",8," "));
Expand Down
2 changes: 1 addition & 1 deletion sigla-ejb/src/main/java/it/cnr/contab/compensi00/bp/CRUDEsenzioni_addizionaliBP.java
View file
Expand Up @@ -139,7 +139,7 @@ public void doCarica(ActionContext context,File file) throws BusinessProcessExce
bulk.setCd_catastale(codcat.trim());
bulk.setDs_comune(comune.trim());
bulk.setCd_provincia(prov);
bulk.setImporto(imp.setScale(2,java.math.BigDecimal.ROUND_HALF_EVEN));
bulk.setImporto(imp.setScale(2,java.math.BigDecimal.ROUND_HALF_UP));
bulk=createComponentSession().verifica_aggiornamento(context.getUserContext(),(Esenzioni_addizionaliBulk)bulk);
if(bulk !=null)
getDettagliCRUDController().add(context,bulk);
Expand Down
2 changes: 1 addition & 1 deletion sigla-ejb/src/main/java/it/cnr/contab/compensi00/bp/MinicarrieraRataCRUDController.java
View file
Expand Up @@ -70,7 +70,7 @@ public void validate(ActionContext context,OggettoBulk model) throws ValidationE
Minicarriera_rataBulk rata = (Minicarriera_rataBulk)model;
if (rata.getIm_rata() == null)
throw new ValidationException("Specificare l'importo della rata \"" + rata.getPg_rata().longValue() + "\".");
if (new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN).compareTo(rata.getIm_rata()) == 0)
if (new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP).compareTo(rata.getIm_rata()) == 0)
throw new ValidationException("L'importo della rata \"" + rata.getPg_rata().longValue() + "\" non è valido.");

if (rata.getDt_inizio_rata() == null || rata.getDt_fine_rata() == null)
Expand Down
4 changes: 2 additions & 2 deletions sigla-ejb/src/main/java/it/cnr/contab/compensi00/bp/RicercaCompensoBP.java
View file
Expand Up @@ -168,12 +168,12 @@ private Node generaDettaglio(Document xmldoc, VCompensoSIPBulk comp) {
elementCompenso.appendChild(element);

element = xmldoc.createElement("totalemensile");
node = xmldoc.createTextNode(comp.getIm_totale_compenso().setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN).divide(new BigDecimal(mesi),2, java.math.BigDecimal.ROUND_HALF_EVEN).toString());//new it.cnr.contab.util.EuroFormat().format(comp.getIm_totale_compenso().divide(new BigDecimal(mesi),2, java.math.BigDecimal.ROUND_HALF_EVEN)));
node = xmldoc.createTextNode(comp.getIm_totale_compenso().setScale(2, java.math.BigDecimal.ROUND_HALF_UP).divide(new BigDecimal(mesi),2, java.math.BigDecimal.ROUND_HALF_UP).toString());//new it.cnr.contab.util.EuroFormat().format(comp.getIm_totale_compenso().divide(new BigDecimal(mesi),2, java.math.BigDecimal.ROUND_HALF_UP)));
element.appendChild(node);
elementCompenso.appendChild(element);

element = xmldoc.createElement("totalecompenso");
node = xmldoc.createTextNode(comp.getIm_totale_compenso()==null?"": comp.getIm_totale_compenso().setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN).toString());//new it.cnr.contab.util.EuroFormat().format(comp.getIm_totale_compenso()));
node = xmldoc.createTextNode(comp.getIm_totale_compenso()==null?"": comp.getIm_totale_compenso().setScale(2, java.math.BigDecimal.ROUND_HALF_UP).toString());//new it.cnr.contab.util.EuroFormat().format(comp.getIm_totale_compenso()));
element.appendChild(node);
elementCompenso.appendChild(element);

Expand Down
2 changes: 1 addition & 1 deletion sigla-ejb/src/main/java/it/cnr/contab/compensi00/comp/MinicarrieraComponent.java
View file
Expand Up @@ -423,7 +423,7 @@ private java.math.BigDecimal callAliquotaMediaIrpef(
throws ComponentException {

LoggableStatement cs = null;
java.math.BigDecimal aliquota = new java.math.BigDecimal(0).setScale(6, java.math.BigDecimal.ROUND_HALF_EVEN);
java.math.BigDecimal aliquota = new java.math.BigDecimal(0).setScale(6, java.math.BigDecimal.ROUND_HALF_UP);

try {
try {
Expand Down
12 changes: 6 additions & 6 deletions sigla-ejb/src/main/java/it/cnr/contab/compensi00/docs/bulk/MinicarrieraBulk.java
View file
Expand Up @@ -1002,7 +1002,7 @@ private void reset(it.cnr.jada.action.ActionContext context) {
setStato(STATO_ATTIVA);
setStato_ass_compenso(STATO_NON_ASS_COMPENSO);

setIm_totale_minicarriera(new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN));
setIm_totale_minicarriera(new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP));

setNumero_rate(new Integer(1));

Expand Down Expand Up @@ -1047,9 +1047,9 @@ public void resetDefferredSaldi() {

public void resetTassazioneSeparataData() {

setImponibile_irpef_eseprec1(new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN));
setImponibile_irpef_eseprec2(new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN));
setAliquota_irpef_media(new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN));
setImponibile_irpef_eseprec1(new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP));
setImponibile_irpef_eseprec2(new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP));
setAliquota_irpef_media(new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP));
setAliquotaCalcolata(false);
}
/**
Expand Down Expand Up @@ -1319,13 +1319,13 @@ public void validaImponibiliIrpef() throws ValidationException{
if (getFl_tassazione_separata() != null && getFl_tassazione_separata().booleanValue())
throw new ValidationException("Specificare l'importo dell'imponibile irpef 1 della minicarriera.");
else
setImponibile_irpef_eseprec1(new java.math.BigDecimal(0).setScale(6, java.math.BigDecimal.ROUND_HALF_EVEN));
setImponibile_irpef_eseprec1(new java.math.BigDecimal(0).setScale(6, java.math.BigDecimal.ROUND_HALF_UP));
}
if (getImponibile_irpef_eseprec2() == null) {
if (getFl_tassazione_separata() != null && getFl_tassazione_separata().booleanValue())
throw new ValidationException("Specificare l'importo dell'imponibile irpef 2 della minicarriera.");
else
setImponibile_irpef_eseprec2(new java.math.BigDecimal(0).setScale(6, java.math.BigDecimal.ROUND_HALF_EVEN));
setImponibile_irpef_eseprec2(new java.math.BigDecimal(0).setScale(6, java.math.BigDecimal.ROUND_HALF_UP));
}
}
/**
Expand Down
2 changes: 1 addition & 1 deletion sigla-ejb/src/main/java/it/cnr/contab/compensi00/docs/bulk/Minicarriera_rataBulk.java
View file
Expand Up @@ -111,7 +111,7 @@ public void initialize() {
setDt_fine_rata(MinicarrieraBulk.getDataOdierna());
setDt_scadenza(MinicarrieraBulk.getDataOdierna());

setIm_rata(new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN));
setIm_rata(new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP));

setStato_ass_compenso(STATO_NON_ASS_COMPENSO);
}
Expand Down
16 changes: 8 additions & 8 deletions sigla-ejb/src/main/java/it/cnr/contab/config00/comp/ContrattoComponent.java
View file
Expand Up @@ -531,7 +531,7 @@ private ContrattoBulk calcolaTotDocCont (UserContext userContext,ContrattoBulk c
sql = testataHome.calcolaTotAccertamenti( userContext, contratto);
else if (contratto.getNatura_contabile().equals(ContrattoBulk.NATURA_CONTABILE_PASSIVO))
sql = testataHome.calcolaTotObbligazioni( userContext, contratto);
java.math.BigDecimal tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN);
java.math.BigDecimal tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP);
contratto.setTot_doc_cont_etr( tot_doc_cont );
contratto.setTot_doc_cont_spe( tot_doc_cont );
try {
Expand All @@ -555,7 +555,7 @@ else if (contratto.getNatura_contabile().equals(ContrattoBulk.NATURA_CONTABILE_P
throw handleException(ex);
}
if (tot_doc_cont == null)
tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN);
tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP);
if(contratto.getNatura_contabile().equals(ContrattoBulk.NATURA_CONTABILE_ATTIVO))
contratto.setTot_doc_cont_etr( tot_doc_cont );
else if (contratto.getNatura_contabile().equals(ContrattoBulk.NATURA_CONTABILE_PASSIVO))
Expand Down Expand Up @@ -592,7 +592,7 @@ private ContrattoBulk calcolaTotDocContForPadre (UserContext userContext,Contrat
sqlEtr = testataHome.calcolaTotAccertamentiPadre( userContext, contratto);
sqlSpe = testataHome.calcolaTotObbligazioniPadre( userContext, contratto);

java.math.BigDecimal tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN);
java.math.BigDecimal tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP);
contratto.setTot_doc_cont_etr( tot_doc_cont );
contratto.setTot_doc_cont_spe( tot_doc_cont );
try {
Expand All @@ -616,7 +616,7 @@ private ContrattoBulk calcolaTotDocContForPadre (UserContext userContext,Contrat
throw handleException(ex);
}
if (tot_doc_cont == null)
tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN);
tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP);
contratto.setTot_doc_cont_etr( tot_doc_cont );

try {
Expand All @@ -640,7 +640,7 @@ private ContrattoBulk calcolaTotDocContForPadre (UserContext userContext,Contrat
throw handleException(ex);
}
if (tot_doc_cont == null)
tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN);
tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP);
contratto.setTot_doc_cont_spe( tot_doc_cont );
return contratto;
}
Expand Down Expand Up @@ -674,7 +674,7 @@ private ContrattoBulk calcolaTotDocContForAttivoPassivo (UserContext userContext
sqlEtr = testataHome.calcolaTotAccertamenti( userContext, contratto);
sqlSpe = testataHome.calcolaTotObbligazioni( userContext, contratto);

java.math.BigDecimal tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN);
java.math.BigDecimal tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP);
contratto.setTot_doc_cont_etr( tot_doc_cont );
contratto.setTot_doc_cont_spe( tot_doc_cont );
try {
Expand All @@ -698,7 +698,7 @@ private ContrattoBulk calcolaTotDocContForAttivoPassivo (UserContext userContext
throw handleException(ex);
}
if (tot_doc_cont == null)
tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN);
tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP);
contratto.setTot_doc_cont_etr( tot_doc_cont );

try {
Expand All @@ -722,7 +722,7 @@ private ContrattoBulk calcolaTotDocContForAttivoPassivo (UserContext userContext
throw handleException(ex);
}
if (tot_doc_cont == null)
tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN);
tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP);
contratto.setTot_doc_cont_spe( tot_doc_cont );
return contratto;
}
Expand Down
8 changes: 4 additions & 4 deletions ...ain/java/it/cnr/contab/consultazioni/action/ConsTotaleDocContCommessaContrattoAction.java
View file
Expand Up @@ -40,7 +40,7 @@ public Forward doAccertamenti(ActionContext context) {
//clauses.addClause("AND","tipo",SQLBuilder.EQUALS,"ETR");
java.math.BigDecimal tot_doc_cont = null;
if (bp.getSelection() != null && bp.getSelection().size() != bp.getElementsCount()){
tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN);
tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP);
bp.setSelection(context);

if ( bp.getSelectedElements(context) == null )
Expand All @@ -59,7 +59,7 @@ public Forward doAccertamenti(ActionContext context) {
tot_doc_cont = tot_doc_cont.add(wpb.getTotale_entrate());
}
}
if(tot_doc_cont != null && tot_doc_cont.compareTo(new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN))==0){
if(tot_doc_cont != null && tot_doc_cont.compareTo(new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP))==0){
bp.setMessage("Non ci sono Accertamenti da visualizzare.");
return bp.findDefaultForward();
}
Expand Down Expand Up @@ -92,7 +92,7 @@ public Forward doObbligazioni(ActionContext context) {
//clauses.addClause("AND","tipo",SQLBuilder.EQUALS,"SPE");
java.math.BigDecimal tot_doc_cont = null;
if (bp.getSelection() != null && bp.getSelection().size() != bp.getElementsCount()){
tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN);
tot_doc_cont = new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP);
bp.setSelection(context);

if ( bp.getSelectedElements(context) == null )
Expand All @@ -111,7 +111,7 @@ public Forward doObbligazioni(ActionContext context) {
tot_doc_cont = tot_doc_cont.add(wpb.getTotale_spese());
}
}
if(tot_doc_cont != null && tot_doc_cont.compareTo(new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_EVEN))==0){
if(tot_doc_cont != null && tot_doc_cont.compareTo(new java.math.BigDecimal(0).setScale(2, java.math.BigDecimal.ROUND_HALF_UP))==0){
bp.setMessage("Non ci sono Obbligazioni da visualizzare.");
return bp.findDefaultForward();
}
Expand Down

0 comments on commit 388ef40

Please sign in to comment.