Applied patch from Stefan Huehner (OFBIZ-776), fixes a couple of misc. assignment bugs
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@519584 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -2955,7 +2955,7 @@ public class InvoiceServices {
|
||||
}
|
||||
}
|
||||
}
|
||||
successMessage.concat(UtilProperties.getMessage(resource, "AccountingSuccessFull",locale));
|
||||
successMessage = successMessage.concat(UtilProperties.getMessage(resource, "AccountingSuccessFull",locale));
|
||||
return results;
|
||||
}
|
||||
|
||||
|
||||
@@ -193,7 +193,7 @@ public class ControlApplet extends Applet implements Runnable {
|
||||
String responseStr = in.readLine();
|
||||
in.close();
|
||||
if (responseStr != null)
|
||||
responseStr.trim();
|
||||
responseStr = responseStr.trim();
|
||||
if (debug != null && debug.equalsIgnoreCase("true"))
|
||||
System.out.println("Receive response: " + responseStr);
|
||||
return responseStr;
|
||||
|
||||
@@ -695,7 +695,7 @@ public class ContentWorker implements org.ofbiz.widget.ContentWorkerInterface {
|
||||
List contentList = new ArrayList();
|
||||
String contentIdName = "contentId";
|
||||
if (linkDir != null && linkDir.equalsIgnoreCase("TO")) {
|
||||
contentIdName.concat("To");
|
||||
contentIdName = contentIdName.concat("To");
|
||||
}
|
||||
GenericValue assoc = null;
|
||||
GenericValue content = null;
|
||||
@@ -729,8 +729,8 @@ public class ContentWorker implements org.ofbiz.widget.ContentWorkerInterface {
|
||||
String contentIdName = "contentId";
|
||||
String contentAssocViewName = "contentAssocView";
|
||||
if (linkDir != null && linkDir.equalsIgnoreCase("TO")) {
|
||||
contentIdName.concat("To");
|
||||
contentAssocViewName.concat("To");
|
||||
contentIdName = contentIdName.concat("To");
|
||||
contentAssocViewName = contentAssocViewName.concat("To");
|
||||
}
|
||||
EntityExpr expr = new EntityExpr(contentIdName, EntityOperator.EQUALS, origContentId);
|
||||
exprListAnd.add(expr);
|
||||
|
||||
@@ -652,7 +652,7 @@ public class ShoppingCartItem implements java.io.Serializable {
|
||||
}
|
||||
|
||||
/** Creates new ShoppingCartItem object. */
|
||||
protected ShoppingCartItem(GenericValue product, Map additionalProductFeatureAndAppls, Map attributes, String prodCatalogId, ProductConfigWrapper configWrapper, Locale locale, String itemType, ShoppingCart.ShoppingCartItemGroup itemGroupi, GenericValue parentProduct) {
|
||||
protected ShoppingCartItem(GenericValue product, Map additionalProductFeatureAndAppls, Map attributes, String prodCatalogId, ProductConfigWrapper configWrapper, Locale locale, String itemType, ShoppingCart.ShoppingCartItemGroup itemGroup, GenericValue parentProduct) {
|
||||
this._product = product;
|
||||
this.productId = _product.getString("productId");
|
||||
this._parentProduct = parentProduct;
|
||||
|
||||
@@ -313,7 +313,7 @@ public class PosTransaction implements Serializable {
|
||||
Debug.logError(e, module);
|
||||
}
|
||||
String nameOnCard = cc.getString("firstNameOnCard") + " " + cc.getString("lastNameOnCard");
|
||||
nameOnCard.trim();
|
||||
nameOnCard = nameOnCard.trim();
|
||||
payInfo.put("nameOnCard", nameOnCard);
|
||||
|
||||
String cardNum = cc.getString("cardNumber");
|
||||
|
||||
Reference in New Issue
Block a user