svn commit: r1305581 [4/36] - in /ofbiz/branches/20111205EmailH
Locked
svn commit: r1305581 [4/36] - in /ofbiz/branches/20111205EmailH
 
|
Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java Mon Mar 26 20:56:02 2012 @@ -651,7 +651,7 @@ public class AIMPaymentServices { results.put("authRefNum", ar.getTransactionId()); results.put("cvCode", ar.getCvResult()); results.put("avsCode", ar.getAvsResult()); - if (ar.getAmount() == BigDecimal.ZERO) { + if (BigDecimal.ZERO.compareTo(ar.getAmount()) == 0) { results.put("processAmount", getXAmount(request)); } else { results.put("processAmount", ar.getAmount()); @@ -673,7 +673,7 @@ public class AIMPaymentServices { results.put("captureRefNum", ar.getTransactionId()); if (captureResult.booleanValue()) { //passed results.put("captureCode", ar.getAuthorizationCode()); - if (ar.getAmount() == BigDecimal.ZERO) { + if (BigDecimal.ZERO.compareTo(ar.getAmount()) == 0) { results.put("captureAmount", getXAmount(request)); } else { results.put("captureAmount", ar.getAmount()); @@ -694,7 +694,7 @@ public class AIMPaymentServices { results.put("refundRefNum", ar.getTransactionId()); if (captureResult.booleanValue()) { //passed results.put("refundCode", ar.getAuthorizationCode()); - if (ar.getAmount() == BigDecimal.ZERO) { + if (BigDecimal.ZERO.compareTo(ar.getAmount()) == 0) { results.put("refundAmount", getXAmount(request)); } else { results.put("refundAmount", ar.getAmount()); @@ -716,7 +716,7 @@ public class AIMPaymentServices { results.put("releaseRefNum", ar.getTransactionId()); if (captureResult.booleanValue()) { //passed results.put("releaseCode", ar.getAuthorizationCode()); - if (ar.getAmount() == BigDecimal.ZERO) { + if (BigDecimal.ZERO.compareTo(ar.getAmount()) == 0) { results.put("releaseAmount", getXAmount(request)); } else { results.put("releaseAmount", ar.getAmount()); @@ -743,7 +743,7 @@ public class AIMPaymentServices { results.put("authRefNum", ar.getTransactionId()); results.put("cvCode", ar.getCvResult()); results.put("avsCode", ar.getAvsResult()); - if (ar.getAmount() == BigDecimal.ZERO) { + if (BigDecimal.ZERO.compareTo(ar.getAmount()) == 0) { results.put("processAmount", getXAmount(request)); } else { results.put("processAmount", ar.getAmount()); @@ -793,8 +793,9 @@ public class AIMPaymentServices { private static BigDecimal getXAmount(Map<String, Object> request) { BigDecimal amt = BigDecimal.ZERO; if (request.get("x_Amount") != null) { + BigDecimal amount = (BigDecimal) request.get("x_Amount"); try { - amt = new BigDecimal((String) request.get("x_Amount")); + amt = amount; } catch (NumberFormatException e) { Debug.logWarning(e, e.getMessage(), module); } Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java Mon Mar 26 20:56:02 2012 @@ -795,7 +795,7 @@ public class CCPaymentServices { GenericValue countryGeo = address.getRelatedOneCache("CountryGeo"); UtilXml.addChildElementValue(addressElement, "Country", countryGeo.getString("geoSecCode"), document); } catch (GenericEntityException gee) { - Debug.log(gee, "Error finding related Geo for countryGeoId: " + countryGeoId, module); + Debug.logInfo(gee, "Error finding related Geo for countryGeoId: " + countryGeoId, module); } } } @@ -909,7 +909,7 @@ public class CCPaymentServices { try { response = http.post(); } catch (HttpClientException hce) { - Debug.log(hce, module); + Debug.logInfo(hce, module); throw new ClearCommerceException("ClearCommerce connection problem", hce); } Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java Mon Mar 26 20:56:02 2012 @@ -289,7 +289,7 @@ public class IcsPaymentServices { if (UtilValidate.isNotEmpty(keysFile)) { props.put("alternateKeyFilename", keysFile); } - Debug.log("Created CyberSource Properties : " + props, module); + Debug.logInfo("Created CyberSource Properties : " + props, module); return props; } Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java Mon Mar 26 20:56:02 2012 @@ -438,7 +438,7 @@ public class PcChargeServices { props.put("host", host); props.put("port", port); props.put("autoBill", autoBill); - Debug.log("Returning properties - " + props, module); + Debug.logInfo("Returning properties - " + props, module); return props; } Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java Mon Mar 26 20:56:02 2012 @@ -175,7 +175,7 @@ public class RitaApi { if (mode == MODE_IN) { String stream = this.toString() + "..\r\n"; - Debug.log("Sending - \n" + stream, module); + Debug.logInfo("Sending - \n" + stream, module); String urlString = "http://" + host + ":" + port; HttpClient http = new HttpClient(urlString); http.setDebug(true); @@ -203,7 +203,7 @@ public class RitaApi { // read the response while ((line = br.readLine()) != null) { - Debug.log(line, module); + Debug.logInfo(line, module); if (!line.trim().equals(".")) { String[] lineSplit = line.trim().split(" "); if (lineSplit != null && lineSplit.length == 2) { @@ -215,7 +215,7 @@ public class RitaApi { break; } } - Debug.log("Reading finished.", module); + Debug.logInfo("Reading finished.", module); // send session finished signal ps.print("..\r\n"); @@ -237,7 +237,7 @@ public class RitaApi { String[] lines = resp.split("\n"); for (int i = 0; i < lines.length; i++) { - Debug.log(lines[i], module); + Debug.logInfo(lines[i], module); if (!lines[i].trim().equals(".")) { String[] lineSplit = lines[i].trim().split(" ", 2); if (lineSplit != null && lineSplit.length == 2) { Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java Mon Mar 26 20:56:02 2012 @@ -84,7 +84,7 @@ public class RitaServices { // send the transaction RitaApi out = null; try { - Debug.log("Sending request to RiTA", module); + Debug.logInfo("Sending request to RiTA", module); out = api.send(); } catch (IOException e) { Debug.logError(e, module); @@ -544,7 +544,7 @@ public class RitaServices { props.put("ssl", ssl); props.put("autoBill", autoBill); props.put("forceTx", forceTx); - Debug.log("Returning properties - " + props, module); + Debug.logInfo("Returning properties - " + props, module); return props; } Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java Mon Mar 26 20:56:02 2012 @@ -193,10 +193,7 @@ public class IdealEvents { GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin"); Map <String, Object> parametersMap = UtilHttp.getParameterMap(request); String transactionId = request.getParameter("trxid"); - Set<String> keySet = parametersMap.keySet(); - Iterator<String> i = keySet.iterator(); - while (i.hasNext()) { - String name = (String) i.next(); + for(String name : parametersMap.keySet()) { String value = request.getParameter(name); Debug.logError("### Param: " + name + " => " + value, module); } @@ -321,9 +318,7 @@ public class IdealEvents { return false; } if (paymentPrefs.size() > 0) { - Iterator <GenericValue> i = paymentPrefs.iterator(); - while (i.hasNext()) { - GenericValue pref = i.next(); + for(GenericValue pref : paymentPrefs) { boolean okay = setPaymentPreference(dispatcher, userLogin, pref, request); if (!okay) return false; Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java Mon Mar 26 20:56:02 2012 @@ -372,9 +372,9 @@ public class OrbitalPaymentServices { //Display the request if ("AUTH_ONLY".equals(transType)) { - Debug.log("\nAuth Request:\n ======== " + request.getXML()); + Debug.logInfo("\nAuth Request:\n ======== " + request.getXML()); } else if ("AUTH_CAPTURE".equals(transType)) { - Debug.log("\nAuth Capture Request:\n ======== " + request.getXML()); + Debug.logInfo("\nAuth Capture Request:\n ======== " + request.getXML()); } results.put("processAmount", amount); } catch (InitializationException ie) { @@ -414,7 +414,7 @@ public class OrbitalPaymentServices { } } //Display the request - Debug.log("\nCapture Request:\n ======== " + request.getXML()); + Debug.logInfo("\nCapture Request:\n ======== " + request.getXML()); results.put("captureAmount", amount); } catch (InitializationException ie) { Debug.logInfo("Unable to initialize request object", module); @@ -446,7 +446,7 @@ public class OrbitalPaymentServices { request.setFieldValue("Exp", UtilFormatOut.checkNull(expDate)); request.setFieldValue("Comments", "This is a credit card refund"); - Debug.log("\nRefund Request:\n ======== " + request.getXML()); + Debug.logInfo("\nRefund Request:\n ======== " + request.getXML()); results.put("refundAmount", amount); } catch (InitializationException ie) { Debug.logInfo("Unable to initialize request object", module); @@ -470,7 +470,7 @@ public class OrbitalPaymentServices { request.setFieldValue("OrderID", UtilFormatOut.checkNull(orderId)); //Display the request - Debug.log("\nRelease Request:\n ======== " + request.getXML()); + Debug.logInfo("\nRelease Request:\n ======== " + request.getXML()); results.put("releaseAmount", amount); } catch (InitializationException ie) { Debug.logInfo("Unable to initialize request object", module); Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java Mon Mar 26 20:56:02 2012 @@ -247,10 +247,7 @@ public class PayPalEvents { Debug.logInfo("Got verification from PayPal, processing..", module); boolean verified = false; - Set <String> keySet = parametersMap.keySet(); - Iterator <String> i = keySet.iterator(); - while (i.hasNext()) { - String name = i.next(); + for(String name : parametersMap.keySet()) { String value = request.getParameter(name); Debug.logError("### Param: " + name + " => " + value, module); if (UtilValidate.isNotEmpty(name) && "payer_status".equalsIgnoreCase(name) && @@ -417,9 +414,7 @@ public class PayPalEvents { return false; } if (paymentPrefs.size() > 0) { - Iterator <GenericValue> i = paymentPrefs.iterator(); - while (i.hasNext()) { - GenericValue pref = i.next(); + for(GenericValue pref : paymentPrefs) { boolean okay = setPaymentPreference(dispatcher, userLogin, pref, request); if (!okay) return false; Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java Mon Mar 26 20:56:02 2012 @@ -586,7 +586,7 @@ public class PayPalServices { } } catch (GenericServiceException e) { // Not the end of the world, we'll carry on - Debug.log(e.getMessage()); + Debug.logInfo(e.getMessage(), module); } } Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java Mon Mar 26 20:56:02 2012 @@ -152,7 +152,7 @@ public class SagePayUtil } } } - Debug.log("SagePay Response Data : " + responseData); + Debug.logInfo("SagePay Response Data : " + responseData, module); return responseData; } @@ -173,7 +173,7 @@ public class SagePayUtil postParameters.add(new BasicNameValuePair(key, value)); } - Debug.log("SagePay PostParameters - " + postParameters); + Debug.logInfo("SagePay PostParameters - " + postParameters, module); HttpEntity postEntity = new UrlEncodedFormEntity(postParameters); httpPost.setEntity(postEntity); Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java Mon Mar 26 20:56:02 2012 @@ -100,9 +100,9 @@ public class ValueLinkApi { } if (debug) { - Debug.log("New ValueLinkApi instance created", module); - Debug.log("Merchant ID : " + merchantId, module); - Debug.log("Terminal ID : " + terminalId, module); + Debug.logInfo("New ValueLinkApi instance created", module); + Debug.logInfo("Merchant ID : " + merchantId, module); + Debug.logInfo("Terminal ID : " + terminalId, module); } } @@ -190,7 +190,7 @@ public class ValueLinkApi { } if (debug) { - Debug.log("encryptPin : " + pin + " / " + encryptedEanHex, module); + Debug.logInfo("encryptPin : " + pin + " / " + encryptedEanHex, module); } return encryptedEanHex; @@ -220,7 +220,7 @@ public class ValueLinkApi { } if (debug) { - Debug.log("decryptPin : " + pin + " / " + decryptedPinString, module); + Debug.logInfo("decryptPin : " + pin + " / " + decryptedPinString, module); } return decryptedPinString; @@ -245,7 +245,7 @@ public class ValueLinkApi { */ public Map<String, Object> send(String url, Map<String, Object> request) throws HttpClientException { if (debug) { - Debug.log("Request : " + url + " / " + request, module); + Debug.logInfo("Request : " + url + " / " + request, module); } // read the timeout value @@ -310,7 +310,7 @@ public class ValueLinkApi { return this.outputKeyCreation(loop, kekOnly, kekTest); } } else { - Debug.log("Returned a null KeyPair", module); + Debug.logInfo("Returned a null KeyPair", module); return this.outputKeyCreation(loop, kekOnly, kekTest); } } else { @@ -407,7 +407,7 @@ public class ValueLinkApi { // initialize the parameter spec DHPublicKey publicKey = (DHPublicKey) this.getValueLinkPublicKey(); DHParameterSpec dhParamSpec = publicKey.getParams(); - //Debug.log(dhParamSpec.getP().toString() + " / " + dhParamSpec.getG().toString(), module); + //Debug.logInfo(dhParamSpec.getP().toString() + " / " + dhParamSpec.getG().toString(), module); // create the public/private key pair using parameters defined by valuelink KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DH"); @@ -436,7 +436,7 @@ public class ValueLinkApi { byte[] secretKey = ka.generateSecret(); if (debug) { - Debug.log("Secret Key : " + StringUtil.toHexString(secretKey) + " / " + secretKey.length, module); + Debug.logInfo("Secret Key : " + StringUtil.toHexString(secretKey) + " / " + secretKey.length, module); } // generate 3DES from secret key using VL algorithm (KEK) @@ -447,7 +447,7 @@ public class ValueLinkApi { byte[] kek = copyBytes(des2, first8, 0); if (debug) { - Debug.log("Generated KEK : " + StringUtil.toHexString(kek) + " / " + kek.length, module); + Debug.logInfo("Generated KEK : " + StringUtil.toHexString(kek) + " / " + kek.length, module); } return kek; @@ -528,7 +528,7 @@ public class ValueLinkApi { byte[] des3 = copyBytes(desByte1, copyBytes(desByte2, desByte3, 0), 0); return generateMwk(des3); } else { - Debug.log("Null DES keys returned", module); + Debug.logInfo("Null DES keys returned", module); } return null; @@ -541,7 +541,7 @@ public class ValueLinkApi { */ public byte[] generateMwk(byte[] desBytes) { if (debug) { - Debug.log("DES Key : " + StringUtil.toHexString(desBytes) + " / " + desBytes.length, module); + Debug.logInfo("DES Key : " + StringUtil.toHexString(desBytes) + " / " + desBytes.length, module); } SecretKeyFactory skf1 = null; SecretKey mwk = null; @@ -605,10 +605,10 @@ public class ValueLinkApi { newMwk = copyBytes(random, newMwk, 0); if (debug) { - Debug.log("Random 8 byte : " + StringUtil.toHexString(random), module); - Debug.log("Encrypted 0's : " + StringUtil.toHexString(encryptedZeros), module); - Debug.log("Decrypted MWK : " + StringUtil.toHexString(mwkdes3.getEncoded()) + " / " + mwkdes3.getEncoded().length, module); - Debug.log("Encrypted MWK : " + StringUtil.toHexString(newMwk) + " / " + newMwk.length, module); + Debug.logInfo("Random 8 byte : " + StringUtil.toHexString(random), module); + Debug.logInfo("Encrypted 0's : " + StringUtil.toHexString(encryptedZeros), module); + Debug.logInfo("Decrypted MWK : " + StringUtil.toHexString(mwkdes3.getEncoded()) + " / " + mwkdes3.getEncoded().length, module); + Debug.logInfo("Encrypted MWK : " + StringUtil.toHexString(newMwk) + " / " + newMwk.length, module); } return newMwk; @@ -656,7 +656,7 @@ public class ValueLinkApi { } if (debug) { - Debug.log("Current Working Key Index : " + this.mwkIndex, module); + Debug.logInfo("Current Working Key Index : " + this.mwkIndex, module); } return this.mwkIndex; @@ -727,7 +727,7 @@ public class ValueLinkApi { request.put("EncryptID", this.getWorkingKeyIndex()); if (debug) { - Debug.log("Created Initial Request Map : " + request, module); + Debug.logInfo("Created Initial Request Map : " + request, module); } return request; @@ -839,8 +839,8 @@ public class ValueLinkApi { } if (debug) { - Debug.log("Raw MWK : " + StringUtil.toHexString(getMwk()), module); - Debug.log("MWK : " + StringUtil.toHexString(mwk.getEncoded()), module); + Debug.logInfo("Raw MWK : " + StringUtil.toHexString(getMwk()), module); + Debug.logInfo("MWK : " + StringUtil.toHexString(mwk.getEncoded()), module); } return mwk; @@ -852,8 +852,8 @@ public class ValueLinkApi { } if (debug) { - Debug.log("Raw KEK : " + StringUtil.toHexString(getKek()), module); - Debug.log("KEK : " + StringUtil.toHexString(kek.getEncoded()), module); + Debug.logInfo("Raw KEK : " + StringUtil.toHexString(getKek()), module); + Debug.logInfo("KEK : " + StringUtil.toHexString(kek.getEncoded()), module); } return kek; @@ -906,7 +906,7 @@ public class ValueLinkApi { protected Map<String, Object> parseResponse(String response) { if (debug) { - Debug.log("Raw Response : " + response, module); + Debug.logInfo("Raw Response : " + response, module); } // covert to all lowercase and trim off the html header @@ -955,7 +955,7 @@ public class ValueLinkApi { } if (debug) { - Debug.log("Response Map : " + responseMap, module); + Debug.logInfo("Response Map : " + responseMap, module); } return responseMap; @@ -963,7 +963,7 @@ public class ValueLinkApi { private List<Map<String, String>> parseHistoryResponse(String response) { if (debug) { - Debug.log("Raw History : " + response, module); + Debug.logInfo("Raw History : " + response, module); } // covert to all lowercase and trim off the html header @@ -983,7 +983,7 @@ public class ValueLinkApi { testResponse = testResponse.trim(); if (testResponse.length() == 0) { if (debug) { - Debug.log("History did not contain any fields, returning null", module); + Debug.logInfo("History did not contain any fields, returning null", module); } return null; } @@ -1004,7 +1004,7 @@ public class ValueLinkApi { } if (debug) { - Debug.log("History Map : " + valueMap, module); + Debug.logInfo("History Map : " + valueMap, module); } return valueMap; Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java Mon Mar 26 20:56:02 2012 @@ -41,6 +41,7 @@ import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.util.EntityUtil; +import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.order.order.OrderReadHelper; import org.ofbiz.product.store.ProductStoreWorker; import org.ofbiz.service.DispatchContext; @@ -69,11 +70,11 @@ public class ValueLinkServices { Boolean kekOnly = context.get("kekOnly") != null ? (Boolean) context.get("kekOnly") : Boolean.FALSE; String kekTest = (String) context.get("kekTest"); - Debug.log("KEK Only : " + kekOnly.booleanValue(), module); + Debug.logInfo("KEK Only : " + kekOnly.booleanValue(), module); StringBuffer buf = vl.outputKeyCreation(kekOnly.booleanValue(), kekTest); String output = buf.toString(); - Debug.log(":: Key Generation Output ::\n\n" + output, module); + Debug.logInfo(":: Key Generation Output ::\n\n" + output, module); Map<String, Object> result = ServiceUtil.returnSuccess(); result.put("output", output); @@ -123,7 +124,7 @@ public class ValueLinkServices { buf.append("======== End Test Bytes ").append(desc).append(" ========\n\n"); String output = buf.toString(); - Debug.log(":: KEK Test Output ::\n\n" + output, module); + Debug.logInfo(":: KEK Test Output ::\n\n" + output, module); Map<String, Object> result = ServiceUtil.returnSuccess(); result.put("output", output); @@ -170,7 +171,7 @@ public class ValueLinkServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingValueLinkCannotUpdateWorkingKey", locale)); } - Debug.log("Response : " + response, module); + Debug.logInfo("Response : " + response, module); // on success update the database / reload the cached api if (response != null) { @@ -274,7 +275,7 @@ public class ValueLinkServices { result.put("expireDate", response.get("expiredate")); result.put("cardClass", response.get("cardclass")); result.put("referenceNum", response.get("traceno")); - Debug.log("Activate Result : " + result, module); + Debug.logInfo("Activate Result : " + result, module); return result; } else { return ServiceUtil.returnError(UtilProperties.getMessage(resource, @@ -333,7 +334,7 @@ public class ValueLinkServices { result.put("expireDate", response.get("expiredate")); result.put("cardClass", response.get("cardclass")); result.put("referenceNum", response.get("traceno")); - Debug.log("Link Result : " + result, module); + Debug.logInfo("Link Result : " + result, module); return result; } else { return ServiceUtil.returnError(UtilProperties.getMessage(resource, @@ -393,7 +394,7 @@ public class ValueLinkServices { result.put("expireDate", response.get("expiredate")); result.put("cardClass", response.get("cardclass")); result.put("referenceNum", response.get("traceno")); - Debug.log("Disable Result : " + result, module); + Debug.logInfo("Disable Result : " + result, module); return result; } else { return ServiceUtil.returnError(UtilProperties.getMessage(resource, @@ -463,7 +464,7 @@ public class ValueLinkServices { result.put("cardClass", response.get("cardclass")); result.put("cashBack", vl.getAmount((String) response.get("cashback"))); result.put("referenceNum", response.get("traceno")); - Debug.log("Redeem Result : " + result, module); + Debug.logInfo("Redeem Result : " + result, module); return result; } else { return ServiceUtil.returnError(UtilProperties.getMessage(resource, @@ -532,7 +533,7 @@ public class ValueLinkServices { result.put("expireDate", response.get("expiredate")); result.put("cardClass", response.get("cardclass")); result.put("referenceNum", response.get("traceno")); - Debug.log("Reload Result : " + result, module); + Debug.logInfo("Reload Result : " + result, module); return result; } else { return ServiceUtil.returnError(UtilProperties.getMessage(resource, @@ -591,7 +592,7 @@ public class ValueLinkServices { result.put("expireDate", response.get("expiredate")); result.put("cardClass", response.get("cardclass")); result.put("referenceNum", response.get("traceno")); - Debug.log("Balance Result : " + result, module); + Debug.logInfo("Balance Result : " + result, module); return result; } else { return ServiceUtil.returnError(UtilProperties.getMessage(resource, @@ -649,7 +650,7 @@ public class ValueLinkServices { result.put("expireDate", response.get("expiredate")); result.put("cardClass", response.get("cardclass")); result.put("referenceNum", response.get("traceno")); - Debug.log("History Result : " + result, module); + Debug.logInfo("History Result : " + result, module); return result; } else { return ServiceUtil.returnError(UtilProperties.getMessage(resource, @@ -718,7 +719,7 @@ public class ValueLinkServices { result.put("expireDate", response.get("expiredate")); result.put("cardClass", response.get("cardclass")); result.put("referenceNum", response.get("traceno")); - Debug.log("Refund Result : " + result, module); + Debug.logInfo("Refund Result : " + result, module); return result; } else { return ServiceUtil.returnError(UtilProperties.getMessage(resource, @@ -749,7 +750,7 @@ public class ValueLinkServices { public static Map<String, Object> timeOutReversal(DispatchContext dctx, Map<String, Object> context) { String vlInterface = (String) context.get("Interface"); Locale locale = (Locale) context.get("locale"); - Debug.log("704 Interface : " + vlInterface, module); + Debug.logInfo("704 Interface : " + vlInterface, module); if (vlInterface != null) { if (vlInterface.startsWith("Activate")) { if (vlInterface.equals("Activate/Rollback")) { @@ -795,7 +796,7 @@ public class ValueLinkServices { ServiceXaWrapper xaw = new ServiceXaWrapper(dctx); xaw.setRollbackService("vlTimeOutReversal", context); //xaw.setCommitService("vlTimeOutReversal", context); - Debug.log("Set 704 context : " + context, module); + Debug.logInfo("Set 704 context : " + context, module); try { xaw.enlist(); } catch (XAException e) { @@ -816,6 +817,7 @@ public class ValueLinkServices { // payment processing wrappers (process/release/refund) public static Map<String, Object> giftCardProcessor(DispatchContext dctx, Map<String, Object> context) { + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); @@ -828,7 +830,7 @@ public class ValueLinkServices { // make sure we have a currency if (currency == null) { - currency = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD"); + currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator); } Map<String, Object> redeemCtx = FastMap.newInstance(); @@ -892,6 +894,7 @@ public class ValueLinkServices { } public static Map<String, Object> giftCardRelease(DispatchContext dctx, Map<String, Object> context) { + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); @@ -920,7 +923,7 @@ public class ValueLinkServices { // make sure we have a currency if (currency == null) { - currency = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD"); + currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator); } Map<String, Object> redeemCtx = FastMap.newInstance(); @@ -956,6 +959,7 @@ public class ValueLinkServices { } public static Map<String, Object> giftCardRefund(DispatchContext dctx, Map<String, Object> context) { + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); @@ -984,7 +988,7 @@ public class ValueLinkServices { // make sure we have a currency if (currency == null) { - currency = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD"); + currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator); } Map<String, Object> refundCtx = FastMap.newInstance(); @@ -1050,7 +1054,7 @@ public class ValueLinkServices { // make sure we have a currency if (currency == null) { - currency = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD"); + currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator); } // get the product store @@ -1155,9 +1159,7 @@ public class ValueLinkServices { // make a map of answer info Map<String, Object> answerMap = FastMap.newInstance(); if (responseAnswers != null) { - Iterator<GenericValue> rai = responseAnswers.iterator(); - while (rai.hasNext()) { - GenericValue answer = rai.next(); + for(GenericValue answer : responseAnswers) { GenericValue question = null; try { question = answer.getRelatedOne("SurveyQuestion"); @@ -1346,7 +1348,7 @@ public class ValueLinkServices { // make sure we have a currency if (currency == null) { - currency = UtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD"); + currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator); } // get the product store @@ -1412,9 +1414,7 @@ public class ValueLinkServices { // make a map of answer info Map<String, Object> answerMap = FastMap.newInstance(); if (responseAnswers != null) { - Iterator<GenericValue> rai = responseAnswers.iterator(); - while (rai.hasNext()) { - GenericValue answer = rai.next(); + for(GenericValue answer : responseAnswers) { GenericValue question = null; try { question = answer.getRelatedOne("SurveyQuestion"); Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java Mon Mar 26 20:56:02 2012 @@ -163,7 +163,7 @@ public class PayflowPro { params.append("&").append(parseContext(data)); // transmit the request - if (Debug.verboseOn()) Debug.logVerbose("Sending to Verisign: " + params.toString(), module); + //if (Debug.verboseOn()) Debug.logVerbose("Sending to Verisign: " + params.toString(), module); String resp; if (!comparePaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "enableTransmit", configString, "payment.verisign.enable_transmit", "false")) { resp = pfp.submitTransaction(params.toString(), pfp.generateRequestId()); @@ -671,11 +671,7 @@ public class PayflowPro { Debug.logInfo("Verisign response string: " + resp, module); Map<String, String> parameters = FastMap.newInstance(); List<String> params = StringUtil.split(resp, "&"); - Iterator<String> i = params.iterator(); - - while (i.hasNext()) { - String str = (String) i.next(); - + for(String str : params) { if (str.length() > 0) { List<String> kv = StringUtil.split(str, "="); String k = kv.get(0); Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java Mon Mar 26 20:56:02 2012 @@ -316,10 +316,7 @@ public class WorldPayEvents { GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin"); Map <String, Object> parametersMap = UtilHttp.getParameterMap(request); String orderId = request.getParameter("cartId"); - Set<String> keySet = parametersMap.keySet(); - Iterator<String> i = keySet.iterator(); - while (i.hasNext()) { - String name = i.next(); + for(String name : parametersMap.keySet()) { String value = request.getParameter(name); Debug.logError("### Param: " + name + " => " + value, module); } @@ -399,7 +396,7 @@ public class WorldPayEvents { // attempt to release the offline hold on the order (workflow) OrderChangeHelper.releaseInitialOrderHold(dispatcher, orderId); // call the email confirm service - Map<String, String> emailContext = UtilMisc.toMap("orderId", orderId, "userLogin", userLogin); + Map<String, Object> emailContext = UtilMisc.toMap("orderId", orderId, "userLogin", userLogin); try { dispatcher.runSync("sendOrderConfirmation", emailContext); } catch (GenericServiceException e) { @@ -420,9 +417,7 @@ public class WorldPayEvents { return false; } if (paymentPrefs.size() > 0) { - Iterator<GenericValue> i = paymentPrefs.iterator(); - while (i.hasNext()) { - GenericValue pref = i.next(); + for(GenericValue pref : paymentPrefs) { boolean okay = setPaymentPreference(dispatcher, userLogin, pref, request); if (!okay) { return false; Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java Mon Mar 26 20:56:02 2012 @@ -125,9 +125,7 @@ public class UtilAccounting { private static void getGlAccountClassChildren(GenericValue glAccountClass, List<String> glAccountClassIds) throws GenericEntityException { glAccountClassIds.add(glAccountClass.getString("glAccountClassId")); List<GenericValue> glAccountClassChildren = glAccountClass.getRelatedCache("ChildGlAccountClass"); - Iterator<GenericValue> glAccountClassChildrenIt = glAccountClassChildren.iterator(); - while (glAccountClassChildrenIt.hasNext()) { - GenericValue glAccountClassChild = glAccountClassChildrenIt.next(); + for(GenericValue glAccountClassChild : glAccountClassChildren) { getGlAccountClassChildren(glAccountClassChild, glAccountClassIds); } } Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/testdef/accountingtests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/testdef/accountingtests.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/testdef/accountingtests.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/testdef/accountingtests.xml Mon Mar 26 20:56:02 2012 @@ -27,9 +27,14 @@ </test-case> - <test-case case-name="accounting-tests"><junit-test-suite class-name="org.ofbiz.accounting.test.FinAccountTests"/></test-case> + <test-case case-name="accounting-tests"> + <junit-test-suite class-name="org.ofbiz.accounting.test.FinAccountTests"/> + </test-case> - <test-case case-name="auto-accounting-transaction-tests"> - <simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTests.xml"/> + <test-case case-name="auto-accounting-transaction-tests-sales"> + <simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTestsSales.xml"/> + </test-case> + <test-case case-name="auto-accounting-transaction-tests-purchase"> + <simple-method-test location="component://accounting/script/org/ofbiz/accounting/test/AutoAcctgTransTestsPurchase.xml"/> </test-case> </test-suite> Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/accounting/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/accounting/WEB-INF/controller.xml Mon Mar 26 20:56:02 2012 @@ -2574,12 +2574,12 @@ under the License. </request-map> <request-map uri="paymentReportHtml"> <security https="true" auth="true"/> - <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/payment/" invoke="PaymentReport.groovy"/> + <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy"/> <response name="success" type="view" value="ViewPaymentReportHtml"/> </request-map> <request-map uri="paymentReportPdf"> <security https="true" auth="true"/> - <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/payment/" invoke="PaymentReport.groovy"/> + <event type="groovy" path="component://accounting/webapp/accounting/WEB-INF/actions/payment/PaymentReport.groovy"/> <response name="success" type="view" value="ViewPaymentReportPdf"/> </request-map> Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl Mon Mar 26 20:56:02 2012 @@ -74,7 +74,7 @@ function getFinAccountTransRunningTotalA jQuery('#endingBalance').html(jQuery('#endingBalanceInput').val()); } - jQuery('#submitButton').attr('disabled', 'disabled'); + jQuery('#submitButton').attr('disabled', true); } } </script> Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl Mon Mar 26 20:56:02 2012 @@ -63,7 +63,7 @@ function getPaymentRunningTotal() { }); } else { jQuery('#showPaymentRunningTotal').html(""); - jQuery('#submitButton').attr('disabled', 'disabled'); + jQuery('#submitButton').attr('disabled', true); } } Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/accounting/payment/report/PaymentReport.rptdesign Mon Mar 26 20:56:02 2012 @@ -1,4 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + <report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1"> <property name="createdBy">Eclipse BIRT Designer Version 2.6.0.v20100531 Build <2.6.0.v20100609-1613></property> <list-property name="userProperties"> Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/ap/invoices/CommissionRun.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/ap/invoices/CommissionRun.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/ap/invoices/CommissionRun.ftl (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/ap/invoices/CommissionRun.ftl Mon Mar 26 20:56:02 2012 @@ -68,7 +68,7 @@ function enableSubmitButton() { if (!isSingle && jQuery('#serviceName').val() != "") { jQuery('#submitButton').removeAttr("disabled"); } else { - jQuery('#submitButton').attr('disabled', 'disabled'); + jQuery('#submitButton').attr('disabled', true); } } Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl Mon Mar 26 20:56:02 2012 @@ -61,7 +61,7 @@ function getInvoiceRunningTotal() { type: 'POST', data: jQuery('#listPurchaseInvoices').serialize(), async: false, - succes: function(data) { + success: function(data) { jQuery('#showInvoiceRunningTotal').html(data.invoiceRunningTotal); } }); @@ -71,7 +71,7 @@ function getInvoiceRunningTotal() { } } else { - jQuery('#submitButton').attr('disabled', 'disabled'); + jQuery('#submitButton').attr('disabled', true); jQuery('#showInvoiceRunningTotal').html(""); } } Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/ar/invoice/ListInvoices.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/ar/invoice/ListInvoices.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/ar/invoice/ListInvoices.ftl (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/ar/invoice/ListInvoices.ftl Mon Mar 26 20:56:02 2012 @@ -64,11 +64,11 @@ under the License. }); if(jQuery('#serviceName').val() != "") { - jQuery('#submitButton').attr('disabled', ''); + jQuery('#submitButton').removeAttr('disabled'); } } else { - jQuery('#submitButton').attr('disabled', 'disabled'); + jQuery('#submitButton').attr('disabled', true); jQuery('#showInvoiceRunningTotal').html(""); } } @@ -104,7 +104,9 @@ under the License. }); if(anyChecked && (jQuery('#serviceName').val() != "")) { - jQuery('#submitButton').attr('disabled' , ''); + jQuery('#submitButton').removeAttr('disabled'); + } else { + jQuery('#submitButton').attr('disabled', true); } } //]]> Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/ar/payment/batchPayments.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/ar/payment/batchPayments.ftl?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/ar/payment/batchPayments.ftl (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/webapp/ar/payment/batchPayments.ftl Mon Mar 26 20:56:02 2012 @@ -65,11 +65,13 @@ function getPaymentRunningTotal() { }); if(jQuery('#serviceName').val() != "") { - jQuery('#submitButton').attr('disabled', ''); + jQuery('#submitButton').removeAttr('disabled'); + } else { + jQuery('#submitButton').attr('disabled', true); } } else { - jQuery('#submitButton').attr('disabled', 'disabled'); + jQuery('#submitButton').attr('disabled', true); jQuery('#showPaymentRunningTotal').html(""); } } @@ -108,9 +110,9 @@ function setServiceName(selection) { }); if(anyChecked && (jQuery('#serviceName').val() != "")) { - jQuery('#submitButton').attr('disabled' , ''); + jQuery('#submitButton').removeAttr('disabled'); } else { - jQuery('#submitButton').attr('disabled' , 'disabled'); + jQuery('#submitButton').attr('disabled' , true); } } Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/widget/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/widget/FixedAssetForms.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/widget/FixedAssetForms.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/widget/FixedAssetForms.xml Mon Mar 26 20:56:02 2012 @@ -731,7 +731,7 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="GlobalFixedAssetTypeGlAccounts" type="list" + <form name="GlobalFixedAssetTypeGlAccounts" type="list" list-name="globalFixedAssetTypeGlAccounts" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetTypeGlAccount" list="globalFixedAssetTypeGlAccounts"> @@ -751,7 +751,7 @@ under the License. <field name="profitGlAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"/></field> <field name="lossGlAccountId"><display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountCode} - ${accountName} [${glAccountId}]"/></field> </form> - <form name="FixedAssetTypeGlAccounts" type="list" + <form name="FixedAssetTypeGlAccounts" type="list" list-name="fixedAssetTypeGlAccounts" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetTypeGlAccount" list="fixedAssetTypeGlAccounts"> Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/widget/FixedAssetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/widget/FixedAssetScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/widget/FixedAssetScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/widget/FixedAssetScreens.xml Mon Mar 26 20:56:02 2012 @@ -529,12 +529,12 @@ under the License. <section> <widgets> <screenlet title="${uiLabelMap.PageTitleFixedAssetDepreciationHistory}"> - <label style="h3">${uiLabelMap.FixedAssetPurchaseCost}: ${fixedAsset.purchaseCost}</label> - <label style="h3">${uiLabelMap.FixedAssetDepreciation}: ${depreciation}</label> - <label style="h3">${uiLabelMap.FixedAssetSalvageValue}: ${fixedAsset.salvageValue}</label> - <label style="h3">${uiLabelMap.FixedAssetDateAcquired}: ${fixedAsset.dateAcquired}</label> - <label style="h3">${uiLabelMap.FixedAssetExpectedEndOfLife}: ${fixedAsset.expectedEndOfLife}</label> - <label style="h3">${uiLabelMap.FixedAssetNextDepreciationAmount}: ${assetDepreciationResultMap.nextDepreciationAmount}</label> + <label style="h3">${uiLabelMap.FormFieldTitle_purchaseCost}: ${fixedAsset.purchaseCost}</label> + <label style="h3">${uiLabelMap.FormFieldTitle_depreciation}: ${depreciation}</label> + <label style="h3">${uiLabelMap.FormFieldTitle_salvageValue}: ${fixedAsset.salvageValue}</label> + <label style="h3">${uiLabelMap.FormFieldTitle_dateAcquired}: ${fixedAsset.dateAcquired}</label> + <label style="h3">${uiLabelMap.FormFieldTitle_expectedEndOfLife}: ${fixedAsset.expectedEndOfLife}</label> + <label style="h3">${uiLabelMap.FormFieldTitle_NextDepreciationAmount}: ${assetDepreciationResultMap.nextDepreciationAmount}</label> <section> <condition> <and> @@ -577,7 +577,7 @@ under the License. <include-form name="AddFixedAssetDepMethod" location="component://accounting/widget/FixedAssetForms.xml"/> <include-form name="ListFixedAssetDepMethods" location="component://accounting/widget/FixedAssetForms.xml"/> </screenlet> - <screenlet title="GL Mappings"> + <screenlet title="${uiLabelMap.AccountingGlMappings}"> <include-form name="AddFixedAssetTypeGlAccount" location="component://accounting/widget/FixedAssetForms.xml"/> <label style="h3">${uiLabelMap.PageTitleFixedAssetMappings}</label> <include-form name="FixedAssetTypeGlAccounts" location="component://accounting/widget/FixedAssetForms.xml"/> Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/widget/GlForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/widget/GlForms.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/widget/GlForms.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/widget/GlForms.xml Mon Mar 26 20:56:02 2012 @@ -275,7 +275,7 @@ under the License. </entity-condition> </actions> <row-actions> - <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("glAccountId");return new Boolean(!(prev!=null&&prev.equals(glAccountId)));}" type="Boolean"/> + <set field="showPosition1" value="${groovy:String prev=(String)previousItem.get("glAccountId");return new Boolean(!(prev!=null&&prev.equals(glAccountId)));}" type="Boolean"/> </row-actions> <field name="glAccountId" position="1" use-when="showPosition1"><display/></field> <field name="glAccountDescription" title="${uiLabelMap.CommonDescription}" position="1" use-when="showPosition1"> Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/widget/GlSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/widget/GlSetupForms.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/widget/GlSetupForms.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/widget/GlSetupForms.xml Mon Mar 26 20:56:02 2012 @@ -1192,7 +1192,7 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="FixedAssetTypeGlAccounts" type="list" + <form name="FixedAssetTypeGlAccounts" type="list" list-name="fixedAssetTypeGlAccounts" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetTypeGlAccount" list="fixedAssetTypeGlAccounts"> Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/widget/PaymentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/widget/PaymentForms.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/widget/PaymentForms.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/widget/PaymentForms.xml Mon Mar 26 20:56:02 2012 @@ -90,6 +90,20 @@ under the License. <field name="amountToApply"><display also-hidden="false" type="currency" currency="${currencyUomId}"/></field> </form> + <form name="EditPaymentAttributes" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml"> + <field name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyIdTo"><lookup target-form-name="LookupPartyName"/></field> + <field name="statusId" entry-name="attributeMap.statusId"> + <drop-down allow-empty="true"> + <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId"> + <entity-constraint name="statusTypeId" operator="equals" value="PMNT_STATUS"/> + <entity-order-by field-name="description"/> + </entity-options> + </drop-down> + </field> + <field name="saveButton"><submit/></field> + </form> + <form name="NewPaymentOut" type="single" target="createPayment" default-map-name="payment" header-row-style="header-row" default-table-style="basic-table"> <actions> Modified: ofbiz/branches/20111205EmailHandling/applications/accounting/widget/PaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/accounting/widget/PaymentScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/accounting/widget/PaymentScreens.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/accounting/widget/PaymentScreens.xml Mon Mar 26 20:56:02 2012 @@ -94,6 +94,21 @@ under the License. </widgets> </section> </screen> + + <screen name="ListPayments"> + <section> + <actions> + <set field="noConditionFind" value="Y"/> + <set field="parameters.statusId" from-field="statusId"/> + </actions> + <widgets> + <screenlet title="${uiLabelMap.AccountingInvoicePayments}"> + <include-form name="ListPayments" location="component://accounting/widget/PaymentForms.xml"/> + </screenlet> + </widgets> + </section> + </screen> + <screen name="NewPayment"> <section> <actions> Modified: ofbiz/branches/20111205EmailHandling/applications/commonext/config/CommonExtUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/commonext/config/CommonExtUiLabels.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/commonext/config/CommonExtUiLabels.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/commonext/config/CommonExtUiLabels.xml Mon Mar 26 20:56:02 2012 @@ -20,6 +20,7 @@ --> <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <property key="CommonExtCreatePublicMessage"> + <value xml:lang="de">Erzeuge öffentliche Nachricht</value> <value xml:lang="en">Create Public Message</value> <value xml:lang="fr">Créer un message public</value> <value xml:lang="it">Crea messaggio pubblico</value> @@ -27,6 +28,7 @@ <value xml:lang="zh">æ°å»ºå ¬å ±æ¶æ¯</value> </property> <property key="CommonExtDateInfoCreated"> + <value xml:lang="de">Datum Info erzeugt</value> <value xml:lang="en">Date info created</value> <value xml:lang="fr">Date de création</value> <value xml:lang="it">Data di creazione</value> @@ -34,6 +36,7 @@ <value xml:lang="zh">å·²å建æ¥æä¿¡æ¯</value> </property> <property key="CommonExtDateLastChanged"> + <value xml:lang="de">Datum Letzte Ãnderung</value> <value xml:lang="en">Date Last Changed</value> <value xml:lang="fr">Dernière date de changement</value> <value xml:lang="it">Data ultimo cambiamento</value> @@ -41,6 +44,7 @@ <value xml:lang="zh">æåä¿®æ¹æ¥æ</value> </property> <property key="CommonExtSystemInfoNote"> + <value xml:lang="de">Systemnachricht</value> <value xml:lang="en">System Info Note</value> <value xml:lang="fr">Message d'information système</value> <value xml:lang="it">Messaggio di sistema</value> @@ -48,6 +52,7 @@ <value xml:lang="zh">ç³»ç»ä¿¡æ¯ä¾¿ç¬º</value> </property> <property key="CommonExtSystemInfoNoteForUser"> + <value xml:lang="de">Systemnachricht für Benutzer:</value> <value xml:lang="en">System Info note for user:</value> <value xml:lang="fr">Message d'information système pour l'utilisateur :</value> <value xml:lang="it">Messaggio di sistema per l'utente:</value> @@ -55,6 +60,7 @@ <value xml:lang="zh">ç³»ç»ä¿¡æ¯ä¾¿ç¬ºè´ç¨æ·ï¼</value> </property> <property key="CommonExtSystemInfoStatus"> + <value xml:lang="de">System Information Status</value> <value xml:lang="en">System Info Status</value> <value xml:lang="fr">Message d'information d'état</value> <value xml:lang="it">Stato messaggi di sistema</value> @@ -62,6 +68,7 @@ <value xml:lang="zh">ç³»ç»ä¿¡æ¯ç¶æ</value> </property> <property key="CommonExtSystemInfoStatusForUser"> + <value xml:lang="de">System Information Status für Benutzer:</value> <value xml:lang="en">System Info status for user:</value> <value xml:lang="fr">Message d'information d'état pour l'utilisateur :</value> <value xml:lang="it">Stato messaggi di sistema per l'utente:</value> Modified: ofbiz/branches/20111205EmailHandling/applications/commonext/data/ProductStoreData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/commonext/data/ProductStoreData.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/commonext/data/ProductStoreData.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/commonext/data/ProductStoreData.xml Mon Mar 26 20:56:02 2012 @@ -19,6 +19,15 @@ --> <entity-engine-xml> + <!-- Payment Gateway Config --> + <PaymentGatewayConfigType paymentGatewayConfigTypeId="PAYPAL" hasTable="N" description="PayPal Payment Gateway"/> + <PaymentGatewayConfig paymentGatewayConfigId="PAYPAL_CONFIG" paymentGatewayConfigTypeId="PAYPAL" description="PayPal Config"/> + <PaymentGatewayPayPal paymentGatewayConfigId="PAYPAL_CONFIG" businessEmail="" apiUserName="" apiPassword="" apiSignature="" apiEnvironment="" notifyUrl="" returnUrl="" cancelReturnUrl="" imageUrl="" confirmTemplate="/order/emailconfirmation.ftl" redirectUrl="https://www.sandbox.paypal.com/webscr" confirmUrl="https://www.sandbox.paypal.com/us/cgi-bin/webscr" shippingCallbackUrl="" requireConfirmedShipping="N"/> + + <PaymentGatewayConfigType paymentGatewayConfigTypeId="WORLDPAY" hasTable="N" description="RBS WorldPay Payment Gateway"/> + <PaymentGatewayConfig paymentGatewayConfigId="WORLDPAY_CONFIG" paymentGatewayConfigTypeId="WORLDPAY" description="RBS WorldPay Config"/> + <PaymentGatewayWorldPay paymentGatewayConfigId="WORLDPAY_CONFIG" redirectUrl="https://select-test.worldpay.com/wcc/purchase" instId="" authMode="A" fixContact="N" hideContact="N" hideCurrency="N" langId="" noLanguageMenu="N" withDelivery="N" testMode="100"/> + <ProductStorePaymentSetting productStoreId="PRODUCTSTOREID" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveCCProcessor" paymentCustomMethodId="CC_AUTH_ALWAYSAPPROV"/> <ProductStorePaymentSetting productStoreId="PRODUCTSTOREID" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_RELEASE" paymentService="testCCRelease" paymentCustomMethodId="CC_RELEASE_TEST"/> <ProductStorePaymentSetting productStoreId="PRODUCTSTOREID" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_CAPTURE" paymentService="testCCCapture" paymentCustomMethodId="CC_CAPTURE_TEST"/> Modified: ofbiz/branches/20111205EmailHandling/applications/commonext/data/helpdata/HELP_SETUP.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/commonext/data/helpdata/HELP_SETUP.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/commonext/data/helpdata/HELP_SETUP.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/commonext/data/helpdata/HELP_SETUP.xml Mon Mar 26 20:56:02 2012 @@ -44,7 +44,7 @@ <para>1. Open a new terminal.</para> <para>2. Go to your ofbiz directory.</para> <para>3. Clean out all built classes with : ./ant clean-all </para> - <para>4. Load the seed data with : ant run-install-extseed</para> + <para>4. Load the seed data with : ./ant run-install-extseed </para> <para>5. Create the admin user with : ./ant create-admin-user-login , then enter a user login id that will be created for you (the initial temporary password is "ofbiz")</para> <para>6. Start ofbiz with : ./startofbiz.sh </para> <para>7. Connect to the OFBiz Setup application with your browser at https://localhost:8443/ofbizsetup.</para> Modified: ofbiz/branches/20111205EmailHandling/applications/commonext/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/commonext/entitydef/entitymodel.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/commonext/entitydef/entitymodel.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/commonext/entitydef/entitymodel.xml Mon Mar 26 20:56:02 2012 @@ -26,8 +26,9 @@ under the License. <!-- not sure if we should use the NoteData entity for this however at the moment it is doing fine... --> <extend-entity entity-name="NoteData"> - <field name="moreInfoPortletId" type="value"><description>url to go to the related portlet screen in the system</description></field> + <field name="moreInfoUrl" type="value"><description>url to go to the related screen in the system</description></field> <field name="moreInfoItemId" type="value"><description>The id of the item to be displayed i.e. custRequestId, commEventId etc</description></field> + <field name="moreInfoItemName" type="value"><description>The name of the item to be displayed i.e. custRequestId, commEventId etc</description></field> <index name="systemInfo" unique="false"><!-- to be able to select the SYSTEMNOTE records quickly --> <index-field name="noteName"/> </index> Modified: ofbiz/branches/20111205EmailHandling/applications/commonext/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/commonext/ofbiz-component.xml?rev=1305581&r1=1305580&r2=1305581&view=diff ============================================================================== --- ofbiz/branches/20111205EmailHandling/applications/commonext/ofbiz-component.xml (original) +++ ofbiz/branches/20111205EmailHandling/applications/commonext/ofbiz-component.xml Mon Mar 26 20:56:02 2012 @@ -30,11 +30,9 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/SystemInfoPortletData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/SetupData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/ShippingData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/OfbizSetupSecurityData.xml"/> <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> - <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> <service-resource type="model" loader="main" location="servicedef/services.xml"/> <service-resource type="eca" loader="main" location="servicedef/secas.xml"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |