svn commit: r607636 - in /ofbiz/trunk/applications/product: config/ entitydef/ script/org/ofbiz/product/rental/ src/org/ofbiz/product/inventory/ src/org/ofbiz/product/product/ src/org/ofbiz/product/store/ src/org/ofbiz/shipment/thirdparty/dhl/

[mrisaliti]

Author: mrisaliti
Date: Sun Dec 30 17:04:33 2007
New Revision: 607636

URL: http://svn.apache.org/viewvc?rev=607636&view=rev
Log:
Changed tabs to 4 spaces

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels_ro.properties
    ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml
    ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
    ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java
    ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
    ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_ro.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_ro.properties?rev=607636&r1=607635&r2=607636&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels_ro.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels_ro.properties Sun Dec 30 17:04:33 2007
@@ -1577,7 +1577,7 @@
 FormFieldTitle_availableToPromiseVar=Varianta Disponibilitate De Promis
 FormFieldTitle_quantityOnHandVar=Varianta Cantitate Disponibila
 FormFieldTitle_itemComments=Commentarii Linie
-FormFieldTitle_varianceReasonId=Motivare Varianta  
+FormFieldTitle_varianceReasonId=Motivare Varianta  
 FormFieldTitle_partyId=Cod Subiect
 FormFieldTitle_selectedAmount=Valoare Selectionata
 FormFieldTitle_isPromo=Este o Promotie

Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=607636&r1=607635&r2=607636&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Sun Dec 30 17:04:33 2007
@@ -93,7 +93,7 @@
     </entity>
     <entity entity-name="ProdCatalogCategoryType"
             package-name="org.ofbiz.product.catalog"
- default-resource-name="ProductEntityLabels"
+            default-resource-name="ProductEntityLabels"
             title="Catalog Category Association Type Entity">
       <field name="prodCatalogCategoryTypeId" type="id-ne"></field>
       <field name="description" type="description"></field>
@@ -304,7 +304,7 @@
     </view-entity>
     <entity entity-name="ProductCategoryContentType"
             package-name="org.ofbiz.product.category"
- default-resource-name="ProductEntityLabels"
+            default-resource-name="ProductEntityLabels"
             title="Product Category Content Type Entity">
       <field name="prodCatContentTypeId" type="id-ne"></field>
       <field name="parentTypeId" type="id"></field>
@@ -509,7 +509,7 @@
     </view-entity>
     <entity entity-name="ProductCategoryType"
             package-name="org.ofbiz.product.category"
- default-resource-name="ProductEntityLabels"
+            default-resource-name="ProductEntityLabels"
             title="Product Category Type Entity">
       <field name="productCategoryTypeId" type="id-ne"></field>
       <field name="parentTypeId" type="id"></field>
@@ -778,7 +778,7 @@
     </entity>
     <entity entity-name="CostComponentType"
             package-name="org.ofbiz.product.cost"
- default-resource-name="ProductEntityLabels"
+            default-resource-name="ProductEntityLabels"
             title="Cost Component Type Entity">
       <field name="costComponentTypeId" type="id-ne"></field>
       <field name="parentTypeId" type="id-ne"></field>
@@ -896,7 +896,7 @@
     </entity>
     <entity entity-name="ProductFeatureApplType"
             package-name="org.ofbiz.product.feature"
- default-resource-name="ProductEntityLabels"
+            default-resource-name="ProductEntityLabels"
             title="Product Feature Applicability Type Entity">
       <field name="productFeatureApplTypeId" type="id-ne"></field>
       <field name="parentTypeId" type="id"></field>
@@ -1080,7 +1080,7 @@
     </entity>
     <entity entity-name="ProductFeatureType"
             package-name="org.ofbiz.product.feature"
- default-resource-name="ProductEntityLabels"
+            default-resource-name="ProductEntityLabels"
             title="Product Feature Type Entity">
       <field name="productFeatureTypeId" type="id-ne"></field>
       <field name="parentTypeId" type="id"></field>
@@ -1384,7 +1384,7 @@
     </entity>
     <entity entity-name="InventoryItemType"
             package-name="org.ofbiz.product.inventory"
- default-resource-name="ProductEntityLabels"
+            default-resource-name="ProductEntityLabels"
             title="Inventory Item Type Entity">
       <field name="inventoryItemTypeId" type="id-ne"></field>
       <field name="parentTypeId" type="id-ne"></field>
@@ -1791,7 +1791,7 @@
     </entity>
     <entity entity-name="ProductPriceActionType"
             package-name="org.ofbiz.product.price"
- default-resource-name="ProductEntityLabels"
+            default-resource-name="ProductEntityLabels"    
             title="Product Price Type Entity">
       <field name="productPriceActionTypeId" type="id-ne"></field>
       <field name="description" type="description"></field>
@@ -1857,7 +1857,7 @@
     </entity>
     <entity entity-name="ProductPricePurpose"
             package-name="org.ofbiz.product.price"
- default-resource-name="ProductEntityLabels"
+            default-resource-name="ProductEntityLabels"
             title="Product Price Purpose Entity">
         <field name="productPricePurposeId" type="id-ne"></field>
         <field name="description" type="description"></field>
@@ -1876,7 +1876,7 @@
     </entity>
     <entity entity-name="ProductPriceType"
             package-name="org.ofbiz.product.price"
- default-resource-name="ProductEntityLabels"
+            default-resource-name="ProductEntityLabels"
             title="Product Price Type Entity">
       <field name="productPriceTypeId" type="id-ne"></field>
       <field name="description" type="description"></field>
@@ -2010,7 +2010,7 @@
     </view-entity>
     <entity entity-name="GoodIdentificationType"
             package-name="org.ofbiz.product.product"
- default-resource-name="ProductEntityLabels"
+            default-resource-name="ProductEntityLabels"
             title="Good Identification Type Entity">
       <field name="goodIdentificationTypeId" type="id-ne"></field>
       <field name="parentTypeId" type="id"></field>
@@ -2186,7 +2186,7 @@
     </entity>
     <entity entity-name="ProductAssocType"
             package-name="org.ofbiz.product.product"
- default-resource-name="ProductEntityLabels"
+            default-resource-name="ProductEntityLabels"
             title="Product Association Type Entity">
       <field name="productAssocTypeId" type="id-ne"></field>
       <field name="parentTypeId" type="id"></field>
@@ -2319,7 +2319,7 @@
     </view-entity>
     <entity entity-name="ProductContentType"
             package-name="org.ofbiz.product.product"
- default-resource-name="ProductEntityLabels"
+            default-resource-name="ProductEntityLabels"
             title="Product Content Type Entity">
       <field name="productContentTypeId" type="id-ne"></field>
       <field name="parentTypeId" type="id"></field>
@@ -2332,7 +2332,7 @@
     </entity>
     <entity entity-name="ProductGeo"
             package-name="org.ofbiz.product.product"
- default-resource-name="ProductEntityLabels"
+            default-resource-name="ProductEntityLabels"
             title="Product Geo Entity">
       <field name="productId" type="id-ne"></field>
       <field name="geoId" type="id"></field>
@@ -2465,9 +2465,9 @@
         </relation>
     </entity>
     <entity entity-name="ProductMeterType"
- package-name="org.ofbiz.product.product"
- default-resource-name="ProductEntityLabels"
- title="Product Meter Type Entity">
+            package-name="org.ofbiz.product.product"
+            default-resource-name="ProductEntityLabels"            
+            title="Product Meter Type Entity">
         <field name="productMeterTypeId" type="id-ne"></field>
         <field name="description" type="description"></field>
         <field name="defaultUomId" type="id"><description>This is optional and if applicable can describe the meter better</description></field>
@@ -2511,9 +2511,9 @@
         </relation>
     </entity>
     <entity entity-name="ProductMaintType"
- package-name="org.ofbiz.product.product"
- default-resource-name="ProductEntityLabels"
- title="Product Maintenance Type Entity">
+            package-name="org.ofbiz.product.product"
+            default-resource-name="ProductEntityLabels"
+            title="Product Maintenance Type Entity">
         <description>This is for both scheduled and unscheduled maintenance; use ProductMaint to track details for scheduled maintenance</description>
         <field name="productMaintTypeId" type="id-ne"></field>
         <field name="description" type="description"></field>
@@ -3619,7 +3619,7 @@
     </view-entity>
     <entity entity-name="ProductStoreGroup"
             package-name="org.ofbiz.product.store"
- default-resource-name="ProductEntityLabels"
+            default-resource-name="ProductEntityLabels"
             title="ProductStore Group Entity">
       <field name="productStoreGroupId" type="id-ne"></field>
       <field name="productStoreGroupTypeId" type="id"></field>

Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml?rev=607636&r1=607635&r2=607636&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/rental/RentalServices.xml Sun Dec 30 17:04:33 2007
@@ -45,18 +45,18 @@
     </simple-method>
 
     <simple-method method-name="getProductFirstRelatedFixedAsset"
-     short-description="Most rental products are associated with one fixed asset only,
-     this service will return the first genericValue fixedAsset">
+            short-description="Most rental products are associated with one fixed asset only,
+                                 this service will return the first genericValue fixedAsset">
         <check-permission permission="CATALOG" action="_VIEW"><fail-message message="Security Error: to run getProductFirstRelatedFixedAsset you must have the CATALOG_VIEW or CATALOG_ADMIN permission"/></check-permission>
         <check-errors/>
 
- <entity-one entity-name="Product" value-name="product"/>
- <get-related relation-name="FixedAssetProduct" value-name="product" list-name="productFixedAssets"/>
- <if-not-empty field-name="productFixedAssets">
-    <first-from-list list-name="productFixedAssets" entry-name="productFixedAsset"/>
-      <field-to-result field-name="productFixedAsset.fixedAssetId" result-name="fixedAssetId"/>
- </if-not-empty>
- <field-to-result field-name="parameters.productId" result-name="productId"/>
+        <entity-one entity-name="Product" value-name="product"/>
+        <get-related relation-name="FixedAssetProduct" value-name="product" list-name="productFixedAssets"/>
+        <if-not-empty field-name="productFixedAssets">
+            <first-from-list list-name="productFixedAssets" entry-name="productFixedAsset"/>
+              <field-to-result field-name="productFixedAsset.fixedAssetId" result-name="fixedAssetId"/>
+        </if-not-empty>
+        <field-to-result field-name="parameters.productId" result-name="productId"/>
     </simple-method>
 
 </simple-methods>

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java?rev=607636&r1=607635&r2=607636&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java Sun Dec 30 17:04:33 2007
@@ -723,8 +723,8 @@
 
         // get a list of all available facilities for looping
         List facilities = null;
- try {
-    if (facilityId != null) {
+    try {
+        if (facilityId != null) {
                 facilities = delegator.findByAnd("Facility", UtilMisc.toMap("facilityId", facilityId));
             } else {
                 facilities = delegator.findAll("Facility");

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java?rev=607636&r1=607635&r2=607636&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java Sun Dec 30 17:04:33 2007
@@ -78,10 +78,10 @@
     }
     
     public String get(String productContentTypeId) {
-     if (this.product == null) {
-     Debug.logWarning("Tried to get ProductContent for type [" + productContentTypeId + "] but the product field in the ProductContentWrapper is null", module);
-     return null;
-     }
+        if (this.product == null) {
+            Debug.logWarning("Tried to get ProductContent for type [" + productContentTypeId + "] but the product field in the ProductContentWrapper is null", module);
+            return null;
+        }
         return getProductContentAsText(this.product, productContentTypeId, locale, mimeTypeId, this.product.getDelegator(), dispatcher);
     }
     

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java?rev=607636&r1=607635&r2=607636&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java Sun Dec 30 17:04:33 2007
@@ -100,9 +100,9 @@
         if (UtilValidate.isEmpty(productStore)) {
             Debug.logError("No product store found in request, cannot set locale!", module);
             return null;
- } else {
-    return UtilHttp.getLocale(request, request.getSession(), productStore.getString("defaultLocaleString"));
- }
+    } else {
+        return UtilHttp.getLocale(request, request.getSession(), productStore.getString("defaultLocaleString"));
+    }
     }
 
     public static String determineSingleFacilityForStore(GenericDelegator delegator, String productStoreId) {

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java?rev=607636&r1=607635&r2=607636&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java Sun Dec 30 17:04:33 2007
@@ -721,12 +721,12 @@
             inContext.put("streetLine2", destPostalAddress.getString("address2"));
             inContext.put("city", destPostalAddress.getString("city"));
             inContext.put("state", destPostalAddress.getString("stateProvinceGeoId"));
-    // DHL ShipIT API does not accept ZIP+4
-    if ((destPostalAddress.getString("postalCode") != null) && (destPostalAddress.getString("postalCode").length() > 5)) {
-    inContext.put("postalCode", destPostalAddress.getString("postalCode").substring(0,5));
-    } else {
-    inContext.put("postalCode", destPostalAddress.getString("postalCode"));
-    }
+        // DHL ShipIT API does not accept ZIP+4
+        if ((destPostalAddress.getString("postalCode") != null) && (destPostalAddress.getString("postalCode").length() > 5)) {
+            inContext.put("postalCode", destPostalAddress.getString("postalCode").substring(0,5));
+        } else {
+            inContext.put("postalCode", destPostalAddress.getString("postalCode"));
+        }
             inContext.put("phoneNbr", destPhoneNumber);
             inContext.put("labelImageType", labelImagePreference);
             inContext.put("shipperReference", shipment.getString("primaryOrderId") + "-" + shipment.getString("primaryShipGroupSeqId"));
@@ -755,7 +755,7 @@
                 Debug.logError(e, uceErrMsg, module);
                 return ServiceUtil.returnError(uceErrMsg);
             }
-    // pass to handler method
+        // pass to handler method
             return handleDhlShipmentConfirmResponse(responseString, shipmentRouteSegment, shipmentPackageRouteSegs);
         } catch (GenericEntityException e) {
             Debug.logError(e, module);