[OpenbravoERP-commits] devel/pi: issue 23152: 13th Period feature does not work

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/d4b59b8f02ad
changeset: 19792:d4b59b8f02ad
user:      Javier Etxarri <javier.echarri <at> openbravo.com>
date:      Mon Feb 25 16:42:21 2013 +0100
summary:   issue 23152: 13th Period feature does not work

diffstat:

 src/org/openbravo/Event/PeriodEnventHandler.java |  18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 6ac83a6c903c -r d4b59b8f02ad 
src/org/openbravo/Event/PeriodEnventHandler.java
--- a/src/org/openbravo/Event/PeriodEnventHandler.java  Mon Feb 25 11:33:24 
2013 +0100
+++ b/src/org/openbravo/Event/PeriodEnventHandler.java  Mon Feb 25 16:42:21 
2013 +0100
@@ -31,14 +31,26 @@
     if (!isValidEvent(event)) {
       return;
     }
-    checkPeriod((Period) event.getTargetInstance());
+    if (!adjustmentPeriod((Period) event.getTargetInstance())) {
+      checkPeriod((Period) event.getTargetInstance());
+    }
   }
 
   public void onSave(@Observes EntityNewEvent event) {
     if (!isValidEvent(event)) {
       return;
     }
-    checkPeriod((Period) event.getTargetInstance());
+    if (!adjustmentPeriod((Period) event.getTargetInstance())) {
+      checkPeriod((Period) event.getTargetInstance());
+    }
+  }
+
+  private boolean adjustmentPeriod(Period period) {
+    if ("A".equals(period.getPeriodType())) {
+      return true;
+    } else {
+      return false;
+    }
   }
 
   private void checkPeriod(Period period) {
@@ -50,7 +62,7 @@
     criteria.add(Restrictions.ne(Period.PROPERTY_ID, period.getId()));
     criteria.add(Restrictions.ge(Period.PROPERTY_ENDINGDATE, 
period.getStartingDate()));
     criteria.add(Restrictions.le(Period.PROPERTY_STARTINGDATE, 
period.getEndingDate()));
-    criteria.add(Restrictions.eq(Period.PROPERTY_PERIODTYPE, 
period.getPeriodType()));
+    criteria.add(Restrictions.eq(Period.PROPERTY_PERIODTYPE, "S"));
     criteria.setMaxResults(1);
 
     if (criteria.uniqueResult() != null) {

------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits