Move placelocking from billing to accountevent.

When accountevent is bougt to user placegroup, etc should also be created, so move
placelocking code from bill paid marking to accounteventcreation.

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/BillBean.java

@@ -244,10 +244,6 @@ public class BillBean implements BillBeanLocal {
 			if (prod != null && prod.getProductFlags().contains(ProductFlag.PREPAID_INSTANT_CREATE)) {
 
 				logger.debug("Creating Bill prepaidInstant product {}, {}", prod.getName(), bl.getQuantity());
-				if (prod.getProductFlags().contains(ProductFlag.RESERVE_PLACE_WHEN_BOUGHT)
-						|| prod.getProductFlags().contains(ProductFlag.CREATE_NEW_PLACE_WHEN_BOUGHT)) {
-					placebean.lockPlaceProduct(bill.getUser(), prod, bl.getQuantity());
-				}
 
 				AccountEvent ac2 = productPBean.createAccountEvent(prod, bl.getQuantity(), user, bill.getSentDate(), bl.getFoodwave());
 				logger.info("Created ac from product. {}, userproducts {}", ac2, user.getAccountEvents().size());
@@ -320,8 +316,6 @@ public class BillBean implements BillBeanLocal {
 	@Override
 	public Bill addProductToBill(Bill bill, Product product, BigDecimal count, FoodWave foodwave) {
 
-		
-		
 		// If bill number > 0 bill has been sent and extra privileges are needed
 		// to modify.
 		// if (!iscurrent || billnr != null) {
@@ -342,7 +336,4 @@ public class BillBean implements BillBeanLocal {
 		return bill;
 	}
 
-	
-	
-
 }

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/ProductPBean.java

@@ -20,6 +20,7 @@ import fi.codecrew.moya.model.DiscountInstance;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.FoodWave;
 import fi.codecrew.moya.model.Product;
+import fi.codecrew.moya.model.ProductFlag;
 
 /**
  * Session Bean implementation class ProductPBean
@@ -35,6 +36,10 @@ public class ProductPBean {
 	private DiscountBean discountBean;
 	@EJB
 	private AccountEventFacade accounteventfacade;
+
+	@EJB
+	private PlaceBean placebean;
+
 	private static final Logger logger = LoggerFactory
 			.getLogger(ProductPBean.class);
 
@@ -94,6 +99,11 @@ public class ProductPBean {
 			foodwave.getAccountEvents().add(ret);
 		}
 
+		if (product.getProductFlags().contains(ProductFlag.RESERVE_PLACE_WHEN_BOUGHT)
+				|| product.getProductFlags().contains(ProductFlag.CREATE_NEW_PLACE_WHEN_BOUGHT)) {
+			placebean.lockPlaceProduct(user, product, quantity);
+		}
+
 		List<DiscountInstance> accEventdiscounts = ret.getDiscountInstances();
 		for (Discount d : discounts) {
 			// discountsArray.add(discInst);