RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr23S07CUIntroducionAvanceUnidadeTraballoItEr22S07: Fixing conflicts

Browse source
This commit is contained in:
Óscar González Fernández 2009-08-25 13:27:43 +02:00
parent 848be63b8c
commit addc2b4f10
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IManageOrderElementAdvancesModel.java
View file

@ -17,19 +17,13 @@ public interface IManageOrderElementAdvancesModel {
public List<AdvanceMeasurementDTO> getAdvanceMeasurements();
public void init(OrderElement orderElement);
public void addNewLine();
<<<<<<< HEAD:navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IManageOrderElementAdvancesModel.java
public void removeLine(IAdvanceMeasurementDTO advanceDTO);
public List<AdvanceType> getActivesAdvanceTypes();
public boolean isPrecisionValid(IAdvanceMeasurementDTO advanceDTO, BigDecimal value);
public boolean greatThanMaxValue(IAdvanceMeasurementDTO advanceDTO, BigDecimal value);
public boolean isGreatValidDate(IAdvanceMeasurementDTO advanceDTO, Date value);
=======
public void removeLine(AdvanceMeasurementDTO advanceDTO);
public List<AdvanceType> getActivesAdvanceTypes();
public boolean isPrecisionValid(AdvanceMeasurementDTO advanceDTO, BigDecimal value);
public boolean greatThanMaxValue(AdvanceMeasurementDTO advanceDTO, BigDecimal value);
public boolean isGreatValidDate(AdvanceMeasurementDTO advanceDTO, Date value);
>>>>>>> cb4190f... ItEr23S07CUIntroducionAvanceUnidadeTraballoItEr22S07 : Remove the interfaz IAdvanceMeasurementDTO:navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IManageOrderElementAdvancesModel.java
public void accept()throws InstanceNotFoundException,
DuplicateAdvanceAssigmentForOrderElementException,
DuplicateValueTrueReportGlobalAdvanceException;