Projects >> Graneles-SRL >>189e86302859c663fd1a5c1ffce3d246c9731f1c

Chunk
Conflicting content 
<<<<<<< HEAD
    }

    public Collection getFacturaCollection() {
        return facturaCollection;
    }
        this.empresa = empresa;
    public void setFacturaCollection(Collection facturaCollection) {
        this.facturaCollection = facturaCollection;
    }

        
=======
>>>>>>> 7968a5ba932c576ce7cc3bd00d9dcc7c1633a2ba
    @Override
    public int hashCode() {
        int hash = 0;
Solution content 
        this.empresa = empresa;
    }

    public Collection getFacturaCollection() {
        return facturaCollection;
    }

    public void setFacturaCollection(Collection facturaCollection) {
        this.facturaCollection = facturaCollection;
    }

        
    @Override
    public int hashCode() {
        int hash = 0;
File
MovimientoCtaCte.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
    public String prepareCreate() {
        current = new MovimientoCtaCte();
        current.setEmpresa(currentEmpresa);
<<<<<<< HEAD
        facturasASeleccionar = new DualListModel();
        facturasASeleccionar.setSource(facturaF.findByPagada(currentEmpresa, false));
        facturasASeleccionar.setTarget(new ArrayList());
=======
>>>>>>> 7968a5ba932c576ce7cc3bd00d9dcc7c1633a2ba
        monto = BigDecimal.ZERO;
        selectedItemIndex = -1;
        return "Create";
Solution content 
    public String prepareCreate() {
        current = new MovimientoCtaCte();
        current.setEmpresa(currentEmpresa);
        facturasASeleccionar = new DualListModel();
        facturasASeleccionar.setSource(facturaF.findByPagada(currentEmpresa, false));
        facturasASeleccionar.setTarget(new ArrayList());
        monto = BigDecimal.ZERO;
        selectedItemIndex = -1;
        return "Create";
File
MovimientoCtaCteController.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
import com.orco.graneles.model.carga.CargaTurnoFacade;
import com.orco.graneles.model.carga.EmbarqueFacade;
import com.orco.graneles.model.miscelaneos.FixedListFacade;
<<<<<<< HEAD
import java.math.BigDecimal;
=======
>>>>>>> 7968a5ba932c576ce7cc3bd00d9dcc7c1633a2ba
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
Solution content 
import com.orco.graneles.model.carga.CargaTurnoFacade;
import com.orco.graneles.model.carga.EmbarqueFacade;
import com.orco.graneles.model.miscelaneos.FixedListFacade;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
File
FacturaFacade.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
                .setParameter("desde", null)
                .setParameter("hasta", hasta)
                .getResultList();
<<<<<<< HEAD
        
        setearSaldo(movimientos);
        
        
=======
        
        setearSaldo(movimientos);
        
        
>>>>>>> 7968a5ba932c576ce7cc3bd00d9dcc7c1633a2ba
        //Filtro los movs desde a mano asi ya los tengo con saldo
        if (desde != null) {
            List movsFiltrados = new ArrayList();
Solution content 
                .setParameter("desde", null)
                .setParameter("hasta", hasta)
                .getResultList();

        setearSaldo(movimientos);
        
        //Filtro los movs desde a mano asi ya los tengo con saldo
        if (desde != null) {
            List movsFiltrados = new ArrayList();
File
MovimientoCtaCteFacade.java
Developer's decision
Version 1
Kind of conflict
Method invocation