svn commit: r1760567 - in /ofbiz/trunk: ./ applications/accounting/lib/ applications/content/widget/content/ applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/ framework/entity/src/main/java/org/apache/ofbiz/entity/util/

Author: jleroux
Date: Tue Sep 13 16:07:50 2016
New Revision: 1760567

URL: http://svn.apache.org/viewvc?rev=1760567&view=rev
Log:
Fixes: reverts r1760566, unfortunately in this commit I did not see that not only the ToirtoiseSvn was removed but also other pending changes where ticked (I did not, thanks ToirtoiseSvn to make me show silly :/)

Modified:
    ofbiz/trunk/   (props changed)
    ofbiz/trunk/applications/accounting/lib/README
    ofbiz/trunk/applications/content/widget/content/ContentForms.xml
    ofbiz/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java
    ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java

Propchange: ofbiz/trunk/
------------------------------------------------------------------------------
--- tsvn:logtemplatecommit (added)
+++ tsvn:logtemplatecommit Tue Sep 13 16:07:50 2016
@@ -0,0 +1,8 @@
+Implements:
+Improves:
+Documents:
+Completes:
+Fixes:
+(OFBIZ-)
+Explanation
+Thanks:

Modified: ofbiz/trunk/applications/accounting/lib/README
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/lib/README?rev=1760567&r1=1760566&r2=1760567&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/lib/README (original)
+++ ofbiz/trunk/applications/accounting/lib/README Tue Sep 13 16:07:50 2016
@@ -1,22 +1,3 @@
-#####################################################################
-# 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.
-#####################################################################
-
 To use the cybersource or worldpay or securepay libraries you can copy them to this directory.
 
 See the ofbiz/OPTIONAL_LIBRARIES file for more information.

Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=1760567&r1=1760566&r2=1760567&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Tue Sep 13 16:07:50 2016
@@ -232,7 +232,7 @@ under the License.
     <form name="EditContentAssoc" target="updateContentAssoc" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
         <actions>
-            <entity-one entity-name="ContentAssoc" use-cache="true" value-field="">
+            <entity-one entity-name="ContentAssoc" use-cache="true">
                 <field-map from-field="contentId" field-name="contentId"/>
                 <field-map from-field="contentIdTo" field-name="contentIdTo"/>
                 <field-map from-field="contentAssocTypeId" field-name="contentAssocTypeId"/>

Modified: ofbiz/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java?rev=1760567&r1=1760566&r2=1760567&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java (original)
+++ ofbiz/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMNode.java Tue Sep 13 16:07:50 2016
@@ -292,7 +292,7 @@ public class BOMNode {
                                         variantProduct = variantProducts.get(0);
                                     }
                                 } catch (GenericServiceException e) {
-                                    Debug.logError("Error calling getProductVariant service " + e.getMessage(), module);
+                                    if (Debug.infoOn()) Debug.logInfo("Error calling getProductVariant service " + e.getMessage(), module);
                                 }
                                 if (variantProduct != null) {
                                     newNode = new BOMNode(variantProduct, dispatcher, userLogin);
@@ -433,7 +433,7 @@ public class BOMNode {
                     this.quantity = calcQuantity;
                 }
             } catch (GenericServiceException e) {
-                Debug.logError(e, "Problem calling the " + serviceName + " service (called by the createManufacturingOrder service)", module);
+                
             }
         } else {
             this.quantity = quantity.multiply(quantityMultiplier).multiply(scrapFactor);
@@ -573,7 +573,7 @@ public class BOMNode {
                     }
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Problem calling the getManufacturingComponents service", module);
+                
             }
         }
         return UtilMisc.toMap("productionRunId", productionRunId, "endDate", endDate);

Modified: ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java?rev=1760567&r1=1760566&r2=1760567&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java (original)
+++ ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/util/EntityListIterator.java Tue Sep 13 16:07:50 2016
@@ -44,7 +44,7 @@ import org.apache.ofbiz.entity.model.Mod
 /**
  * Generic Entity Cursor List Iterator for Handling Cursored DB Results
  */
-public class EntityListIterator implements AutoCloseable, ListIterator<GenericValue> {
+public class EntityListIterator implements ListIterator<GenericValue> {
 
     /** Module Name Used for debugging */
     public static final String module = EntityListIterator.class.getName();