diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialAssignment.java index f3578d521..155cdfce3 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialAssignment.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/MaterialAssignment.java @@ -21,7 +21,6 @@ package org.navalplanner.business.materials.entities; import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.Date; import org.hibernate.validator.Valid; @@ -105,13 +104,6 @@ public class MaterialAssignment extends BaseEntity implements Comparable { return result.multiply(getUnitPrice()); } - public void setTotalPrice(BigDecimal totalPrice) { - BigDecimal unitPrice = totalPrice; - unitPrice = unitPrice.divide(new BigDecimal(getUnits()), 3, - RoundingMode.HALF_UP); - setUnitPrice(unitPrice); - } - public Date getEstimatedAvailability() { return estimatedAvailability; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementController.java index 702397b85..d5c4aeebf 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementController.java @@ -204,18 +204,6 @@ public class AssignedMaterialsToOrderElementController extends } } - /** - * On changing unit price, recalculate total price and refresh categories tree - * - * @param row - */ - public void updateUnitPrice(Row row) { - final MaterialAssignment materialAssignment = (MaterialAssignment) row.getValue(); - Doublebox unitPrice = (Doublebox) row.getChildren().get(4); - unitPrice.setValue(materialAssignment.getUnitPrice().doubleValue()); - refreshTotalPriceAndTotalUnits(materialAssignment); - } - /** * Finds which {@link Treeitem} in tree is associated with category * diff --git a/navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul b/navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul index a13ddb149..cce0da3d4 100644 --- a/navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul +++ b/navalplanner-webapp/src/main/webapp/orders/_assignmentsBox.zul @@ -26,8 +26,7 @@ selectedItem="@{assignedMaterial.material.unitType}" disabled="true" /> - +