You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2012/05/12 23:18:14 UTC
svn commit: r1337663 [2/2] - in /ofbiz/trunk/applications/accounting:
src/org/ofbiz/accounting/finaccount/ src/org/ofbiz/accounting/invoice/
src/org/ofbiz/accounting/payment/ src/org/ofbiz/accounting/tax/
src/org/ofbiz/accounting/test/ src/org/ofbiz/ac...
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy?rev=1337663&r1=1337662&r2=1337663&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/PrintChecks.groovy Sat May 12 21:18:13 2012
@@ -45,7 +45,7 @@ if (!security.hasEntityPermission("ACCOU
// in the case of a single payment, the paymentId will be supplied
paymentId = context.paymentId;
if (paymentId) {
- payment = delegator.findByPrimaryKey("Payment", [paymentId : paymentId]);
+ payment = delegator.findOne("Payment", [paymentId : paymentId], false);
if (payment) payments.add(payment);
context.payments = payments;
return;
@@ -54,7 +54,7 @@ if (paymentId) {
// in the case of a multi form, parse the multi data and get all of the selected payments
selected = UtilHttp.parseMultiFormData(parameters);
selected.each { row ->
- payment = delegator.findByPrimaryKey("Payment", [paymentId : row.paymentId]);
+ payment = delegator.findOne("Payment", [paymentId : row.paymentId], false);
if (payment) {
payments.add(payment);
}
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy?rev=1337663&r1=1337662&r2=1337663&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/period/EditCustomTimePeriod.groovy Sat May 12 21:18:13 2012
@@ -33,7 +33,7 @@ if (currentCustomTimePeriodId) {
context.currentCustomTimePeriodId = currentCustomTimePeriodId;
}
-currentCustomTimePeriod = currentCustomTimePeriodId ? delegator.findByPrimaryKey("CustomTimePeriod", [customTimePeriodId : currentCustomTimePeriodId]) : null;
+currentCustomTimePeriod = currentCustomTimePeriodId ? delegator.findOne("CustomTimePeriod", [customTimePeriodId : currentCustomTimePeriodId], false) : null;
if (currentCustomTimePeriod) {
context.currentCustomTimePeriod = currentCustomTimePeriod;
}
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/AuthorizeTransaction.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/AuthorizeTransaction.groovy?rev=1337663&r1=1337662&r2=1337663&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/AuthorizeTransaction.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/AuthorizeTransaction.groovy Sat May 12 21:18:13 2012
@@ -26,7 +26,7 @@ orderPaymentPreferenceId = context.order
if ((!orderId) || (!orderPaymentPreferenceId)) return;
if (orderId) {
- orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId : orderId]);
+ orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false);
context.orderHeader = orderHeader;
}
@@ -37,7 +37,7 @@ if (orderHeader) {
}
if (orderPaymentPreferenceId) {
- orderPaymentPreference = delegator.findByPrimaryKey("OrderPaymentPreference", [orderPaymentPreferenceId : orderPaymentPreferenceId]);
+ orderPaymentPreference = delegator.findOne("OrderPaymentPreference", [orderPaymentPreferenceId : orderPaymentPreferenceId], false);
context.orderPaymentPreference = orderPaymentPreference;
}
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy?rev=1337663&r1=1337662&r2=1337663&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/CaptureTransaction.groovy Sat May 12 21:18:13 2012
@@ -29,12 +29,12 @@ orderPaymentPreferenceId = context.order
if ((!orderId) || (!orderPaymentPreferenceId)) return;
if (orderId) {
- orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId : orderId]);
+ orderHeader = delegator.findOne("OrderHeader", [orderId : orderId], false);
context.orderHeader = orderHeader;
}
if (orderPaymentPreferenceId) {
- orderPaymentPreference = delegator.findByPrimaryKey("OrderPaymentPreference", [orderPaymentPreferenceId : orderPaymentPreferenceId]);
+ orderPaymentPreference = delegator.findOne("OrderPaymentPreference", [orderPaymentPreferenceId : orderPaymentPreferenceId], false);
context.orderPaymentPreference = orderPaymentPreference;
}
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy?rev=1337663&r1=1337662&r2=1337663&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy Sat May 12 21:18:13 2012
@@ -42,7 +42,7 @@ if (!orderPaymentPreferenceId) {
context.orderPaymentPreferenceId = orderPaymentPreference.orderPaymentPreferenceId;
} else {
// second purpose: grab the latest gateway response of the orderpaymentpreferenceId
- orderPaymentPreference = delegator.findByPrimaryKey("OrderPaymentPreference", [orderPaymentPreferenceId : orderPaymentPreferenceId]);
+ orderPaymentPreference = delegator.findOne("OrderPaymentPreference", [orderPaymentPreferenceId : orderPaymentPreferenceId], false);
gatewayResponses = orderPaymentPreference.getRelated("PaymentGatewayResponse", ["transactionDate DESC"]);
EntityUtil.filterByCondition(gatewayResponses, EntityCondition.makeCondition("transCodeEnumId", EntityOperator.EQUALS, "PGT_AUTHORIZE"));
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign?rev=1337663&r1=1337662&r2=1337663&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign Sat May 12 21:18:13 2012
@@ -327,7 +327,7 @@ module = "PaymentReport.rptdesign";]]></
userLogin = null;
parameters = null;
try {
- userLogin = delegator.findByPrimaryKey("UserLogin",UtilMisc.toMap("userLoginId","admin"));
+ userLogin = delegator.findOne("UserLogin",UtilMisc.toMap("userLoginId","admin"), false);
} catch(e) {
Debug.logError(e,"");
}