svn commit: r1646546 - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/payment/ applications/party/src/org/ofbiz/party/contact/ specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/

[jleroux]

Author: jleroux
Date: Thu Dec 18 21:48:44 2014
New Revision: 1646546

URL: http://svn.apache.org/r1646546
Log:
Reverts part of r1645950, thanks to Scott who spotted it

Modified:
    
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java
    
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
    
ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java

Modified: 
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java?rev=1646546&r1=1646545&r2=1646546&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java
 (original)
+++ 
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java
 Thu Dec 18 21:48:44 2014
@@ -29,7 +29,6 @@ import javolution.util.FastList;
 import javolution.util.FastMap;
 
 import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilFormatOut;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilNumber;
@@ -162,7 +161,7 @@ public class PaymentWorker {
         try {
             purpose = 
EntityQuery.use(delegator).from("PartyContactWithPurpose")
                     .where("partyId", partyId, "contactMechPurposeTypeId", 
"PAYMENT_LOCATION")
-                    
.orderBy("-purposeFromDate").filterByDate(UtilDateTime.nowTimestamp(), 
"contactFromDate", "contactThruDate", "purposeFromDate", "purposeThruDate")
+                    
.orderBy("-purposeFromDate").filterByDate("contactFromDate", "contactThruDate", 
"purposeFromDate", "purposeThruDate")
                     .queryFirst();
         } catch (GenericEntityException e) {
             Debug.logError(e, "Trouble getting PartyContactWithPurpose view 
entity list", module);

Modified: 
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java?rev=1646546&r1=1646545&r2=1646546&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
 (original)
+++ 
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
 Thu Dec 18 21:48:44 2014
@@ -821,7 +821,7 @@ public class ContactMechServices {
         try {
             tempVal = 
EntityQuery.use(delegator).from("PartyContactWithPurpose")
                     .where("partyId", partyId, "contactMechId", contactMechId, 
"contactMechPurposeTypeId", contactMechPurposeTypeId)
-                    .filterByDate(UtilDateTime.nowTimestamp(), 
"contactFromDate", "contactThruDate", "purposeFromDate", "purposeThruDate")
+                    .filterByDate("contactFromDate", "contactThruDate", 
"purposeFromDate", "purposeThruDate")
                     .queryFirst();
         } catch (GenericEntityException e) {
             Debug.logWarning(e.getMessage(), module);
@@ -881,7 +881,7 @@ public class ContactMechServices {
         try {
             tempVal = 
EntityQuery.use(delegator).from("PartyContactWithPurpose")
                     .where("partyId", partyId, "contactMechId", contactMechId, 
"contactMechPurposeTypeId", contactMechPurposeTypeId)
-                    .filterByDate(UtilDateTime.nowTimestamp(), 
"contactFromDate", "contactThruDate", "purposeFromDate", "purposeThruDate")
+                    .filterByDate("contactFromDate", "contactThruDate", 
"purposeFromDate", "purposeThruDate")
                     .queryFirst();
         } catch (GenericEntityException e) {
             Debug.logWarning(e.getMessage(), module);

Modified: 
ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java?rev=1646546&r1=1646545&r2=1646546&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java
 (original)
+++ 
ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java
 Thu Dec 18 21:48:44 2014
@@ -29,7 +29,6 @@ import javolution.util.FastMap;
 
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
-import org.ofbiz.base.util.UtilDateTime;
 import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilValidate;
@@ -560,7 +559,7 @@ public class GoogleCheckoutHelper {
         // check to make sure the purpose doesn't already exist
         List<GenericValue> values = 
EntityQuery.use(delegator).from("PartyContactWithPurpose")
                 .where("partyId", partyId, "contactMechId", contactMechId, 
"contactMechPurposeTypeId", contactMechPurposeTypeId)
-                .filterByDate(UtilDateTime.nowTimestamp(), "contactFromDate", 
"contactThruDate", "purposeFromDate", "purposeThruDate")
+                .filterByDate("contactFromDate", "contactThruDate", 
"purposeFromDate", "purposeThruDate")
                 .queryList();
 
         if (UtilValidate.isEmpty(values)) {