You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2007/12/31 02:00:39 UTC
svn commit: r607635 - in /ofbiz/trunk/applications/product/webapp:
catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.bsh
facility/WEB-INF/actions/shipment/ShipmentManifest.bsh
facility/facility/Picklist.fo.ftl
Author: mrisaliti
Date: Sun Dec 30 17:00:33 2007
New Revision: 607635
URL: http://svn.apache.org/viewvc?rev=607635&view=rev
Log:
Changed tabs to 4 spaces
Modified:
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.bsh
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.bsh
ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.bsh?rev=607635&r1=607634&r2=607635&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.bsh Sun Dec 30 17:00:33 2007
@@ -32,9 +32,9 @@
productFeatures = new LinkedList();
productFeatureGroupAppls = productFeatureGroup.getRelated("ProductFeatureGroupAppl", UtilMisc.toList("sequenceNum"));
for (pFGAi = productFeatureGroupAppls.iterator(); pFGAi.hasNext(); ) {
- productFeatureGroupAppl = (GenericEntity)pFGAi.next();
- productFeature = (GenericEntity)productFeatureGroupAppl.getRelatedOne("ProductFeature");
- productFeature.set("defaultSequenceNum", productFeatureGroupAppl.getLong("sequenceNum"));
+ productFeatureGroupAppl = (GenericEntity)pFGAi.next();
+ productFeature = (GenericEntity)productFeatureGroupAppl.getRelatedOne("ProductFeature");
+ productFeature.set("defaultSequenceNum", productFeatureGroupAppl.getLong("sequenceNum"));
productFeatures.add(productFeature);
}
context.put("productFeatureGroup", productFeatureGroup);
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.bsh?rev=607635&r1=607634&r2=607635&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.bsh (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/ShipmentManifest.bsh Sun Dec 30 17:00:33 2007
@@ -39,7 +39,7 @@
while (shipmentPackagesIter.hasNext()) {
shipmentPackage = shipmentPackagesIter.next();
shipmentItemsDatas = new LinkedList();
- shipmentPackageContents = shipmentPackage.getRelated("ShipmentPackageContent", null, UtilMisc.toList("shipmentItemSeqId"));
+ shipmentPackageContents = shipmentPackage.getRelated("ShipmentPackageContent", null, UtilMisc.toList("shipmentItemSeqId"));
if (shipmentPackageContents != null && shipmentPackageContents.size() > 0) {
shipmentPackageContentsIter = shipmentPackageContents.iterator();
while (shipmentPackageContentsIter.hasNext()) {
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl?rev=607635&r1=607634&r2=607635&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl Sun Dec 30 17:00:33 2007
@@ -282,23 +282,23 @@
</fo:table>
</fo:block>
<#if picklistBinInfo.primaryOrderItemShipGroup.giftMessage?has_content>
- <fo:block space-after.optimum="10pt" font-size="10pt">
- <fo:table>
- <fo:table-column column-width="450pt"/>
- <fo:table-body>
- <fo:table-row font-weight="bold">
- <fo:table-cell>
- <fo:block>${uiLabelMap.OrderGiftMessage}</fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row >
- <fo:table-cell>
- <fo:block>${picklistBinInfo.primaryOrderItemShipGroup.giftMessage}</fo:block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
- </fo:block>
+ <fo:block space-after.optimum="10pt" font-size="10pt">
+ <fo:table>
+ <fo:table-column column-width="450pt"/>
+ <fo:table-body>
+ <fo:table-row font-weight="bold">
+ <fo:table-cell>
+ <fo:block>${uiLabelMap.OrderGiftMessage}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row >
+ <fo:table-cell>
+ <fo:block>${picklistBinInfo.primaryOrderItemShipGroup.giftMessage}</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:block>
</#if>
</fo:flow>
</fo:page-sequence>