You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2010/03/24 10:23:21 UTC
svn commit: r926987 [24/26] - in /ofbiz/branches/multitenant20100310: ./
applications/accounting/config/ applications/accounting/data/
applications/accounting/entitydef/
applications/accounting/script/org/ofbiz/accounting/fixedasset/
applications/accou...
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/data/DemoOrderTestData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/data/DemoOrderTestData.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/data/DemoOrderTestData.xml (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/data/DemoOrderTestData.xml Wed Mar 24 09:23:07 2010
@@ -121,7 +121,7 @@ under the License.
<InventoryItem inventoryItemId="9025" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-2644" ownerPartyId="Company" datetimeReceived="2009-08-13 17:47:31.095" facilityId="WebStoreWarehouse" locationSeqId="TLTLTLLL01" quantityOnHandTotal="2.000000" availableToPromiseTotal="2.000000" unitCost="24.000000" currencyUomId="USD"/>
<ShipmentReceipt receiptId="9000" inventoryItemId="9025" productId="GZ-2644" shipmentId="9997" orderId="Demo1001" orderItemSeqId="00001" datetimeReceived="2009-08-13 17:47:31.095" quantityAccepted="2.000000" quantityRejected="0.000000"/>
- <InventoryItemDetail inventoryItemId="9025" inventoryItemDetailSeqId="00001" effectiveDate="2009-08-13 17:47:46.78" quantityOnHandDiff="2.000000" availableToPromiseDiff="2.000000" unitCost="24.000000" orderId="Demo1001" orderItemSeqId="00001" shipmentId="9997" receiptId="9000"/>
+ <InventoryItemDetail inventoryItemId="9025" inventoryItemDetailSeqId="00001" effectiveDate="2009-08-13 17:47:46.78" quantityOnHandDiff="2.000000" availableToPromiseDiff="2.000000" accountingQuantityDiff="2.000000" unitCost="24.000000" orderId="Demo1001" orderItemSeqId="00001" shipmentId="9997" receiptId="9000"/>
<ItemIssuance itemIssuanceId="9000" orderId="Demo1001" orderItemSeqId="00001" shipGroupSeqId="00001" shipmentId="9997" shipmentItemSeqId="00001" issuedDateTime="2009-08-13 17:46:29.603" quantity="2.000000"/>
<Invoice invoiceId="8008" invoiceTypeId="PURCHASE_INVOICE" description="Purchase Order Invoice" partyIdFrom="DemoSupplier" partyId="Company" statusId="INVOICE_READY" invoiceDate="2009-08-13 17:47:47.929" currencyUomId="USD"/>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/data/DemoProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/data/DemoProduct.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/data/DemoProduct.xml (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/data/DemoProduct.xml Wed Mar 24 09:23:07 2010
@@ -655,52 +655,52 @@ under the License.
<ProductFacilityLocation productId="GZ-1004" facilityId="WebStoreWarehouse" locationSeqId="TLTLTLLL04" minimumStock="5" moveQuantity="20"/>
<!-- some default inventory quantities, things are a bit underutilized without these... -->
- <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL01"
+ <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL01" datetimeReceived="2008-08-01 08:00:00.000"
inventoryItemId="9000" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-2644" ownerPartyId="Company" currencyUomId="USD" unitCost="2.5"/>
- <InventoryItemDetail inventoryItemId="9000" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="500" quantityOnHandDiff="500"/>
- <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLLL01"
+ <InventoryItemDetail inventoryItemId="9000" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="500" quantityOnHandDiff="500" accountingQuantityDiff="500"/>
+ <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLLL01" datetimeReceived="2008-08-01 08:00:00.000"
inventoryItemId="9001" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-2644" ownerPartyId="Company" currencyUomId="USD" unitCost="2.5"/>
- <InventoryItemDetail inventoryItemId="9001" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="5" quantityOnHandDiff="5"/>
- <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL02"
+ <InventoryItemDetail inventoryItemId="9001" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="5" quantityOnHandDiff="5" accountingQuantityDiff="5"/>
+ <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL02" datetimeReceived="2008-08-01 08:00:00.000"
inventoryItemId="9002" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-8544" ownerPartyId="Company" currencyUomId="USD" unitCost="3.0"/>
- <InventoryItemDetail inventoryItemId="9002" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="15" quantityOnHandDiff="15"/>
- <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLLL02"
+ <InventoryItemDetail inventoryItemId="9002" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="15" quantityOnHandDiff="15" accountingQuantityDiff="15"/>
+ <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLLL02" datetimeReceived="2008-08-01 08:00:00.000"
inventoryItemId="9003" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-8544" ownerPartyId="Company" currencyUomId="USD" unitCost="3.0"/>
- <InventoryItemDetail inventoryItemId="9003" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="3" quantityOnHandDiff="3"/>
- <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL03"
+ <InventoryItemDetail inventoryItemId="9003" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="3" quantityOnHandDiff="3" accountingQuantityDiff="3"/>
+ <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL03" datetimeReceived="2008-08-01 08:00:00.000"
inventoryItemId="9004" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="WG-1111" ownerPartyId="Company" currencyUomId="USD" unitCost="4.5"/>
- <InventoryItemDetail inventoryItemId="9004" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="50" quantityOnHandDiff="50"/>
- <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLLL03"
+ <InventoryItemDetail inventoryItemId="9004" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="50" quantityOnHandDiff="50" accountingQuantityDiff="50"/>
+ <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLLL03" datetimeReceived="2008-08-01 08:00:00.000"
inventoryItemId="9005" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="WG-1111" ownerPartyId="Company" currencyUomId="USD" unitCost="4.5"/>
- <InventoryItemDetail inventoryItemId="9005" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="5" quantityOnHandDiff="5"/>
- <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL04"
+ <InventoryItemDetail inventoryItemId="9005" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="5" quantityOnHandDiff="5" accountingQuantityDiff="5"/>
+ <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL04" datetimeReceived="2008-08-01 08:00:00.000"
inventoryItemId="9006" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="WG-5569" ownerPartyId="Company" currencyUomId="USD" unitCost="5.0"/>
- <InventoryItemDetail inventoryItemId="9006" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="10" quantityOnHandDiff="10"/>
+ <InventoryItemDetail inventoryItemId="9006" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="10" quantityOnHandDiff="10" accountingQuantityDiff="10"/>
- <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9010" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="WG-9943-B3" ownerPartyId="Company" currencyUomId="USD" unitCost="3.5"/>
- <InventoryItemDetail inventoryItemId="9010" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="10" quantityOnHandDiff="10"/>
- <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9011" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="WG-9943-B4" ownerPartyId="Company" currencyUomId="USD" unitCost="3.5"/>
- <InventoryItemDetail inventoryItemId="9011" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="10" quantityOnHandDiff="10"/>
- <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9012" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="WG-9943-S3" ownerPartyId="Company" currencyUomId="USD" unitCost="3.5"/>
- <InventoryItemDetail inventoryItemId="9012" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="10" quantityOnHandDiff="10"/>
- <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9013" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="WG-9943-S4" ownerPartyId="Company" currencyUomId="USD" unitCost="3.5"/>
- <InventoryItemDetail inventoryItemId="9013" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="10" quantityOnHandDiff="10"/>
-
- <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9021" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-1006-1" ownerPartyId="Company" currencyUomId="USD" unitCost="2.4"/>
- <InventoryItemDetail inventoryItemId="9021" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="8" quantityOnHandDiff="8"/>
- <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9022" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-1006-2" ownerPartyId="Company" currencyUomId="USD" unitCost="2.4"/>
- <InventoryItemDetail inventoryItemId="9022" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="8" quantityOnHandDiff="8"/>
- <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9023" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-1006-3" ownerPartyId="Company" currencyUomId="USD" unitCost="2.4"/>
- <InventoryItemDetail inventoryItemId="9023" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="8" quantityOnHandDiff="8"/>
- <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9024" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-1006-4" ownerPartyId="Company" currencyUomId="USD" unitCost="2.4"/>
- <InventoryItemDetail inventoryItemId="9024" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="8" quantityOnHandDiff="8"/>
+ <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9010" inventoryItemTypeId="NON_SERIAL_INV_ITEM" datetimeReceived="2008-08-01 08:00:00.000" productId="WG-9943-B3" ownerPartyId="Company" currencyUomId="USD" unitCost="3.5"/>
+ <InventoryItemDetail inventoryItemId="9010" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="10" quantityOnHandDiff="10" accountingQuantityDiff="10"/>
+ <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9011" inventoryItemTypeId="NON_SERIAL_INV_ITEM" datetimeReceived="2008-08-01 08:00:00.000" productId="WG-9943-B4" ownerPartyId="Company" currencyUomId="USD" unitCost="3.5"/>
+ <InventoryItemDetail inventoryItemId="9011" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="10" quantityOnHandDiff="10" accountingQuantityDiff="10"/>
+ <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9012" inventoryItemTypeId="NON_SERIAL_INV_ITEM" datetimeReceived="2008-08-01 08:00:00.000" productId="WG-9943-S3" ownerPartyId="Company" currencyUomId="USD" unitCost="3.5"/>
+ <InventoryItemDetail inventoryItemId="9012" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="10" quantityOnHandDiff="10" accountingQuantityDiff="10"/>
+ <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9013" inventoryItemTypeId="NON_SERIAL_INV_ITEM" datetimeReceived="2008-08-01 08:00:00.000" productId="WG-9943-S4" ownerPartyId="Company" currencyUomId="USD" unitCost="3.5"/>
+ <InventoryItemDetail inventoryItemId="9013" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="10" quantityOnHandDiff="10" accountingQuantityDiff="10"/>
+
+ <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9021" inventoryItemTypeId="NON_SERIAL_INV_ITEM" datetimeReceived="2008-08-01 08:00:00.000" productId="GZ-1006-1" ownerPartyId="Company" currencyUomId="USD" unitCost="2.4"/>
+ <InventoryItemDetail inventoryItemId="9021" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="8" quantityOnHandDiff="8" accountingQuantityDiff="8"/>
+ <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9022" inventoryItemTypeId="NON_SERIAL_INV_ITEM" datetimeReceived="2008-08-01 08:00:00.000" productId="GZ-1006-2" ownerPartyId="Company" currencyUomId="USD" unitCost="2.4"/>
+ <InventoryItemDetail inventoryItemId="9022" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="8" quantityOnHandDiff="8" accountingQuantityDiff="8"/>
+ <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9023" inventoryItemTypeId="NON_SERIAL_INV_ITEM" datetimeReceived="2008-08-01 08:00:00.000" productId="GZ-1006-3" ownerPartyId="Company" currencyUomId="USD" unitCost="2.4"/>
+ <InventoryItemDetail inventoryItemId="9023" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="8" quantityOnHandDiff="8" accountingQuantityDiff="8"/>
+ <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9024" inventoryItemTypeId="NON_SERIAL_INV_ITEM" datetimeReceived="2008-08-01 08:00:00.000" productId="GZ-1006-4" ownerPartyId="Company" currencyUomId="USD" unitCost="2.4"/>
+ <InventoryItemDetail inventoryItemId="9024" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="8" quantityOnHandDiff="8" accountingQuantityDiff="8"/>
- <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9026" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-1000" ownerPartyId="Company" currencyUomId="USD" unitCost="2.4"/>
- <InventoryItemDetail inventoryItemId="9026" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="8" quantityOnHandDiff="8"/>
- <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9027" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-1001" ownerPartyId="Company" currencyUomId="USD" unitCost="2.4"/>
- <InventoryItemDetail inventoryItemId="9027" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="8" quantityOnHandDiff="8"/>
- <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9028" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="GZ-1004" ownerPartyId="Company" currencyUomId="USD" unitCost="2.4"/>
- <InventoryItemDetail inventoryItemId="9028" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="8" quantityOnHandDiff="8"/>
+ <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9026" inventoryItemTypeId="NON_SERIAL_INV_ITEM" datetimeReceived="2008-08-01 08:00:00.000" productId="GZ-1000" ownerPartyId="Company" currencyUomId="USD" unitCost="2.4"/>
+ <InventoryItemDetail inventoryItemId="9026" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="8" quantityOnHandDiff="8" accountingQuantityDiff="8"/>
+ <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9027" inventoryItemTypeId="NON_SERIAL_INV_ITEM" datetimeReceived="2008-08-01 08:00:00.000" productId="GZ-1001" ownerPartyId="Company" currencyUomId="USD" unitCost="2.4"/>
+ <InventoryItemDetail inventoryItemId="9027" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="8" quantityOnHandDiff="8" accountingQuantityDiff="8"/>
+ <InventoryItem facilityId="WebStoreWarehouse" inventoryItemId="9028" inventoryItemTypeId="NON_SERIAL_INV_ITEM" datetimeReceived="2008-08-01 08:00:00.000" productId="GZ-1004" ownerPartyId="Company" currencyUomId="USD" unitCost="2.4"/>
+ <InventoryItemDetail inventoryItemId="9028" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="8" quantityOnHandDiff="8" accountingQuantityDiff="8"/>
<!-- Some additional test promotions -->
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/data/DemoStandardCosting.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/data/DemoStandardCosting.xml?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/data/DemoStandardCosting.xml (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/data/DemoStandardCosting.xml Wed Mar 24 09:23:07 2010
@@ -73,11 +73,11 @@ under the License.
<CostComponentCalc costComponentCalcId="GEN_COST_CALC" description="Overhead cost (5 percent of total cost) for general costs" currencyUomId="USD" fixedCost="0.05" costCustomMethodId="PROD_PERC_FORMULA"/>
<ProductCostComponentCalc productId="PROD_MANUF" costComponentTypeId="GEN_COST" costComponentCalcId="GEN_COST_CALC" fromDate="2005-12-31 00:01:00.0"/>
- <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL01"
+ <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL01" datetimeReceived="2008-08-01 08:00:00.000"
inventoryItemId="9029" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="MAT_A_COST" ownerPartyId="Company" currencyUomId="USD" unitCost="9.0"/>
- <InventoryItemDetail inventoryItemId="9029" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="20" quantityOnHandDiff="20"/>
- <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL01"
+ <InventoryItemDetail inventoryItemId="9029" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="20" quantityOnHandDiff="20" accountingQuantityDiff="20"/>
+ <InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL01" datetimeReceived="2008-08-01 08:00:00.000"
inventoryItemId="9030" inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="MAT_B_COST" ownerPartyId="Company" currencyUomId="USD" unitCost="7.0"/>
- <InventoryItemDetail inventoryItemId="9030" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="20" quantityOnHandDiff="20"/>
+ <InventoryItemDetail inventoryItemId="9030" inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0" availableToPromiseDiff="20" quantityOnHandDiff="20" accountingQuantityDiff="20"/>
</entity-engine-xml>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/templates/email/ShipmentNotificationEmail.ftl Wed Mar 24 09:23:07 2010
@@ -48,7 +48,7 @@ under the License.
<td width="35%"><span class="tableheadtext"><b>${uiLabelMap.OrderProduct}</b></span></td>
<td width="10%" align="right"><span class="tableheadtext"><b>${uiLabelMap.OrderQuantity}</b></span></td>
</tr>
- <tr><td colspan="10"><hr/></td></tr>
+ <tr><td colspan="10"><hr /></td></tr>
<#list shipmentItems as shipmentItem>
<#assign productId = shipmentItem.productId>
<#assign product = shipmentItem.getRelatedOne("Product")>
@@ -57,7 +57,7 @@ under the License.
<td align="right" valign="top"> ${shipmentItem.quantity?if_exists}</td>
</tr>
</#list>
- <tr><td colspan="10"><hr/></td></tr>
+ <tr><td colspan="10"><hr /></td></tr>
</table>
</div>
</#if>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/templates/survey/genericresult.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/templates/survey/genericresult.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/templates/survey/genericresult.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/templates/survey/genericresult.ftl Wed Mar 24 09:23:07 2010
@@ -20,7 +20,7 @@ under the License.
<#assign uiLabelMap = Static["org.ofbiz.base.util.UtilProperties"].getResourceBundleMap("CommonUiLabels", locale)>
<h1>${survey.description?if_exists}</h1>
-<br/>
+<br />
<table width="100%" border="0" cellpadding="2" cellspacing="0">
<#list surveyQuestionAndAppls as surveyQuestionAndAppl>
@@ -47,7 +47,7 @@ under the License.
<#if surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_TEXT">
<td colspan="5"><div class="tabletext">${surveyQuestionAndAppl.question?if_exists}</div></td>
<#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_LINE">
- <td colspan="5"><hr/></td>
+ <td colspan="5"><hr /></td>
<#else>
<#-- standard question options -->
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/templates/survey/miniresult.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/templates/survey/miniresult.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/templates/survey/miniresult.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/templates/survey/miniresult.ftl Wed Mar 24 09:23:07 2010
@@ -42,7 +42,7 @@ under the License.
</tr>
<tr>
- <td><hr/></td>
+ <td><hr /></td>
</tr>
<tr>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/RequestReturn.groovy Wed Mar 24 09:23:07 2010
@@ -36,7 +36,7 @@ context.returnReasons = returnReasons;
if (orderId) {
returnRes = dispatcher.runSync("getReturnableItems", [orderId : orderId]);
context.returnableItems = returnRes.returnableItems;
- orderHeader = delegator.findByPrimaryKeyCache("OrderHeader", [orderId : orderId]);
+ orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId : orderId]);
context.orderHeader = orderHeader;
}
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl Wed Mar 24 09:23:07 2010
@@ -107,12 +107,12 @@
<td> </td>
<td width="60%">
<div class="inputBox">Existing file name: <#if imageContent?has_content && imageContent.drObjectInfo?has_content>${imageContent.drObjectInfo}</#if></div>
- <br/>
+ <br />
<input type="file" class="inputBox" name="uploadedFile" size="25"/>
<#--
Force: <input type="checkbox" value="true" name="forceElectronicText"/>
-->
- <br/>
+ <br />
Top-left:<input type="radio" ${topleft_check} class="inputBox" name="templateId" value="BLOG_TPL_TOPLEFT"/>
Top-center:<input type="radio" ${topcenter_check} class="inputBox" name="templateId" value="BLOG_TPL_TOPCENTER"/>
</td>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl Wed Mar 24 09:23:07 2010
@@ -407,7 +407,7 @@ function setAlternateGwp(field) {
</tr>
<tr>
<td>
- <input type="checkbox" onclick="javascript:document.cartform.submit()" name="alwaysShowcart" <#if shoppingCart.viewCartOnAdd()>checked</#if> /> ${uiLabelMap.EcommerceAlwaysViewCartAfterAddingAnItem}.</div>
+ <input type="checkbox" onclick="javascript:document.cartform.submit()" name="alwaysShowcart" <#if shoppingCart.viewCartOnAdd()>checked="checked"</#if>/>${uiLabelMap.EcommerceAlwaysViewCartAfterAddingAnItem}.
</td>
</tr>
</table>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl Wed Mar 24 09:23:07 2010
@@ -102,6 +102,6 @@ under the License.
</div>
<@paginationControls/>
<#else>
- <hr/>
+ <hr />
<div>${uiLabelMap.ProductNoProductsInThisCategory}</div>
</#if>
\ No newline at end of file
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl Wed Mar 24 09:23:07 2010
@@ -384,7 +384,7 @@ function getConfigDetails(event) {
<input type="text" size="5" name="quantity" value="1">
<a href="javascript:document.addToShoppingList.submit();" class="buttontext">[${uiLabelMap.OrderAddToShoppingList}]</a>
</form>
- <#else> <br/>
+ <#else> <br />
${uiLabelMap.OrderYouMust} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonBeLogged}</a>
${uiLabelMap.OrderToAddSelectedItemsToShoppingList}.
</#if>
@@ -415,7 +415,7 @@ function getConfigDetails(event) {
</#if>
<td align="center" valign="bottom">
<a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@o...@ofbizContentUrl>" border="0" width="60" height="60"></a>
- <br/>
+ <br />
<a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="buttontext">${key}</a>
</td>
</#if>
@@ -739,7 +739,7 @@ ${setRequestAttribute("productValue", pr
${screens.render(productsummaryScreen)}
</div>
<#if commonFeatureResultId_has_next>
- <hr/>
+ <hr />
</#if>
</#list>
</#if>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Wed Mar 24 09:23:07 2010
@@ -546,7 +546,7 @@ ${virtualJavaScript?if_exists}
<label>End Date(yyyy-mm-dd)</label><input type="text" size="10" name="reservEnd"/><a href="javascript:call_cal_notime(document.addform.reservEnd, '${nowTimestamp.toString().substring(0,10)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" alt="Calendar" alt="" /></a>
</div>
<div>
- <#--td nowrap align="right">Number<br/>of days</td><td><input type="textt" size="4" name="reservLength"/></td></tr><tr><td> </td><td align="right" nowrap> </td-->
+ <#--td nowrap align="right">Number<br />of days</td><td><input type="textt" size="4" name="reservLength"/></td></tr><tr><td> </td><td align="right" nowrap> </td-->
Number of persons<input type="text" size="4" name="reservPersons" value="2"/>
Number of rooms<input type="text" size="5" name="quantity" value="1"/>
</div>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/content/showcontenttree.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/content/showcontenttree.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/content/showcontenttree.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/content/showcontenttree.ftl Wed Mar 24 09:23:07 2010
@@ -89,7 +89,7 @@ under the License.
<@loopSubContent contentId=contentIdx viewIndex=viewIdx viewSize=viewSz contentAssocTypeId="PUBLISH_LINK" returnAfterPickWhen="1==1">
<#assign dummy=Static["org.ofbiz.base.util.Debug"].logInfo("in showcontenttree, nodeTrailCsv(1):" + nodeTrailCsv, "")/>
<#local thisCsv=thisNodeTrailCsv + "," + subContentId />
- <a class="tabButton" href="<@o...@ofbizUrl>">${uiLabelMap.CommonView}</a> ${content.description?if_exists}<br/>
+ <a class="tabButton" href="<@o...@ofbizUrl>">${uiLabelMap.CommonView}</a> ${content.description?if_exists}<br />
</...@loopSubContent>
@@ -102,7 +102,7 @@ under the License.
<#local thisCsv=thisNodeTrailCsv />
<#local thisCsv=thisNodeTrailCsv + "," + subContentId />
<a class="tabButton" href="<@o...@ofbizUrl>" >${plusMinus}</a> ${content.description?if_exists}
- <a class="tabButton" href="<@o...@ofbizUrl>" >${uiLabelMap.CommonSearch}</a> <br/>
+ <a class="tabButton" href="<@o...@ofbizUrl>" >${uiLabelMap.CommonSearch}</a> <br />
<#if thisContentId == subContentId>
<#assign catTrail = nodeTrail + [subContentId]/>
<div><@renderCategoryBrowse contentId=subContentId indentIndex=(indentIndex + 1) nodeTrail=catTrail viewSz=viewSz viewIdx=viewIdx /></div>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl Wed Mar 24 09:23:07 2010
@@ -57,8 +57,8 @@ under the License.
<#assign subContent = delegator.findByPrimaryKeyCache("Content", Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId", subContentId))/>
</#if>
<#assign dummy=Static["org.ofbiz.base.util.Debug"].logInfo("in viewcontent, subContent:" + subContent, "")/>
-<br/>
-<h1>${uiLabelMap.EcommerceContentFor} [${subContentId}] ${subContent.contentName?if_exists} - ${subContent.description?if_exists}:</h1><br/>
+<br />
+<h1>${uiLabelMap.EcommerceContentFor} [${subContentId}] ${subContent.contentName?if_exists} - ${subContent.description?if_exists}:</h1><br />
<table border="0" class="blogtext">
<tr>
<td width="40"> </td>
@@ -73,7 +73,7 @@ under the License.
<a class="tabButton" href="<@o...@ofbizUrl>" >Respond</a>
</...@checkPermission>
-->
-<br/>
+<br />
</td>
</tr>
@@ -87,7 +87,7 @@ under the License.
</tr>
</...@loopSubContent>
</table>
-<hr/>
+<hr />
<#--
<@checkPermission mode="not-equals" subContentId=subContentId targetOperation="CONTENT_CREATE|CONTENT_RESPOND" contentPurposeList="RESPONSE" >
${permissionErrorMsg?if_exists}
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/SubscriptionSummary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/SubscriptionSummary.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/SubscriptionSummary.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/SubscriptionSummary.ftl Wed Mar 24 09:23:07 2010
@@ -32,7 +32,7 @@ under the License.
<td><div class="tableheadtext">${uiLabelMap.CommonFromDate}</div></td>
<td><div class="tableheadtext">${uiLabelMap.CommonThruDate}</div></td>
</tr>
- <tr><td colspan="6"><hr/></td></tr>
+ <tr><td colspan="6"><hr /></td></tr>
</thead>
<tbody>
<#list subscriptionList as subscription>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl Wed Mar 24 09:23:07 2010
@@ -82,7 +82,7 @@ under the License.
</div>
</#list>
- <div><hr/></div>
+ <div><hr /></div>
<div class="tableheadtext">${uiLabelMap.EcommerceDigitalAddFromMyFiles}</div>
<div>
<form method="post" action="<@o...@ofbizUrl>" name="adddigitaluploadfile" style="margin: 0;">
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl Wed Mar 24 09:23:07 2010
@@ -37,7 +37,7 @@ under the License.
</tr>
<#list supplierProductList as supplierProduct>
<#assign product = supplierProduct.getRelatedOneCache("Product")/>
- <tr><td colspan="5"><hr/></td></tr>
+ <tr><td colspan="5"><hr /></td></tr>
<tr>
<td>
<div class="tabletext">${(product.productName)?if_exists}</div>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl Wed Mar 24 09:23:07 2010
@@ -63,12 +63,12 @@ under the License.
</div>
</#list>
<div class="tabletext">
- <#if curPostalAddress.toName?exists>${uiLabelMap.CommonTo}: ${curPostalAddress.toName}<br/></#if>
- <#if curPostalAddress.attnName?exists>${uiLabelMap.PartyAddrAttnName}: ${curPostalAddress.attnName}<br/></#if>
- ${curPostalAddress.address1?if_exists}<br/>
- <#if curPostalAddress.address2?exists>${curPostalAddress.address2}<br/></#if>
+ <#if curPostalAddress.toName?exists>${uiLabelMap.CommonTo}: ${curPostalAddress.toName}<br /></#if>
+ <#if curPostalAddress.attnName?exists>${uiLabelMap.PartyAddrAttnName}: ${curPostalAddress.attnName}<br /></#if>
+ ${curPostalAddress.address1?if_exists}<br />
+ <#if curPostalAddress.address2?exists>${curPostalAddress.address2}<br /></#if>
${curPostalAddress.city}<#if curPostalAddress.stateProvinceGeoId?has_content>, ${curPostalAddress.stateProvinceGeoId}</#if> ${curPostalAddress.postalCode}
- <#if curPostalAddress.countryGeoId?exists><br/>${curPostalAddress.countryGeoId}</#if>
+ <#if curPostalAddress.countryGeoId?exists><br />${curPostalAddress.countryGeoId}</#if>
<div class="tabletext">(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</div>
<#if curPartyContactMech.thruDate?exists><div class="tabletext">${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</#if>
</div>
@@ -106,12 +106,12 @@ under the License.
</div>
</#list>
<div class="tabletext">
- <#if postalAddress.toName?exists>${uiLabelMap.CommonTo}: ${postalAddress.toName}<br/></#if>
- <#if postalAddress.attnName?exists>${uiLabelMap.PartyAddrAttnName}: ${postalAddress.attnName}<br/></#if>
- ${postalAddress.address1?if_exists}<br/>
- <#if postalAddress.address2?exists>${postalAddress.address2}<br/></#if>
+ <#if postalAddress.toName?exists>${uiLabelMap.CommonTo}: ${postalAddress.toName}<br /></#if>
+ <#if postalAddress.attnName?exists>${uiLabelMap.PartyAddrAttnName}: ${postalAddress.attnName}<br /></#if>
+ ${postalAddress.address1?if_exists}<br />
+ <#if postalAddress.address2?exists>${postalAddress.address2}<br /></#if>
${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode}
- <#if postalAddress.countryGeoId?exists><br/>${postalAddress.countryGeoId}</#if>
+ <#if postalAddress.countryGeoId?exists><br />${postalAddress.countryGeoId}</#if>
</div>
<div class="tabletext">(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())?if_exists})</div>
<#if partyContactMech.thruDate?exists><div class="tabletext">${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</div></#if>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl Wed Mar 24 09:23:07 2010
@@ -114,12 +114,12 @@ under the License.
</div>
</#list>
<div class="tabletext">
- <#if curPostalAddress.toName?exists><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}<br/></#if>
- <#if curPostalAddress.attnName?exists><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}<br/></#if>
- ${curPostalAddress.address1?if_exists}<br/>
- <#if curPostalAddress.address2?exists>${curPostalAddress.address2}<br/></#if>
+ <#if curPostalAddress.toName?exists><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}<br /></#if>
+ <#if curPostalAddress.attnName?exists><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}<br /></#if>
+ ${curPostalAddress.address1?if_exists}<br />
+ <#if curPostalAddress.address2?exists>${curPostalAddress.address2}<br /></#if>
${curPostalAddress.city}<#if curPostalAddress.stateProvinceGeoId?has_content>, ${curPostalAddress.stateProvinceGeoId}</#if> ${curPostalAddress.postalCode}
- <#if curPostalAddress.countryGeoId?exists><br/>${curPostalAddress.countryGeoId}</#if>
+ <#if curPostalAddress.countryGeoId?exists><br />${curPostalAddress.countryGeoId}</#if>
</div>
<div class="tabletext">(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</div>
<#if curPartyContactMech.thruDate?exists><div class="tabletext"><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></div></#if>
@@ -157,12 +157,12 @@ under the License.
</div>
</#list>
<div class="tabletext">
- <#if postalAddress.toName?exists><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br/></#if>
- <#if postalAddress.attnName?exists><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br/></#if>
- ${postalAddress.address1?if_exists}<br/>
- <#if postalAddress.address2?exists>${postalAddress.address2}<br/></#if>
+ <#if postalAddress.toName?exists><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br /></#if>
+ <#if postalAddress.attnName?exists><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br /></#if>
+ ${postalAddress.address1?if_exists}<br />
+ <#if postalAddress.address2?exists>${postalAddress.address2}<br /></#if>
${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode}
- <#if postalAddress.countryGeoId?exists><br/>${postalAddress.countryGeoId}</#if>
+ <#if postalAddress.countryGeoId?exists><br />${postalAddress.countryGeoId}</#if>
</div>
<div class="tabletext">(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())?if_exists})</div>
<#if partyContactMech.thruDate?exists><div class="tabletext"><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></div></#if>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl Wed Mar 24 09:23:07 2010
@@ -18,11 +18,11 @@ under the License.
-->
<h1>${uiLabelMap.AccountingGiftCardBalance}</h1>
-<br/>
+<br />
<div class="tabletext">${uiLabelMap.AccountingEnterGiftCardNumber}</div>
-<br/>
+<br />
-<br/>
+<br />
<table align="center">
<#if requestAttributes.processResult?exists>
<tr>
@@ -62,4 +62,4 @@ under the License.
</tr>
</form>
</table>
-<br/>
+<br />
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl Wed Mar 24 09:23:07 2010
@@ -18,9 +18,9 @@ under the License.
-->
<h1>${uiLabelMap.AccountingGiftCardLink}</h1>
-<br/>
+<br />
<div class="tabletext">${uiLabelMap.AccountingEnterGiftCardLink}.</div>
-<br/>
+<br />
<form name="gclink" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="paymentConfig" value="${paymentProperties?default("payment.properties")}">
@@ -65,4 +65,4 @@ under the License.
</tr>
</table>
</form>
-<br/>
+<br />
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl Wed Mar 24 09:23:07 2010
@@ -68,7 +68,7 @@ under the License.
<td><div class="tableheadtext">${uiLabelMap.EcommerceSentDate}</div></td>
<td> </td>
</tr>
- <tr><td colspan="5"><hr/></td></tr>
+ <tr><td colspan="5"><hr /></td></tr>
<#list receivedCommunicationEvents?if_exists as receivedCommunicationEvent>
<@showMessage communicationEvent=receivedCommunicationEvent isSentMessage=false/>
</#list>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Wed Mar 24 09:23:07 2010
@@ -150,12 +150,12 @@ under the License.
<#assign postalAddress = partyContactMechValueMap.postalAddress?if_exists />
<div class="tabletext">
<#if postalAddress?exists>
- <#if postalAddress.toName?has_content>${uiLabelMap.CommonTo}: ${postalAddress.toName}<br/></#if>
- <#if postalAddress.attnName?has_content>${uiLabelMap.PartyAddrAttnName}: ${postalAddress.attnName}<br/></#if>
- ${postalAddress.address1}<br/>
- <#if postalAddress.address2?has_content>${postalAddress.address2}<br/></#if>
+ <#if postalAddress.toName?has_content>${uiLabelMap.CommonTo}: ${postalAddress.toName}<br /></#if>
+ <#if postalAddress.attnName?has_content>${uiLabelMap.PartyAddrAttnName}: ${postalAddress.attnName}<br /></#if>
+ ${postalAddress.address1}<br />
+ <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if>
${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode?if_exists}
- <#if postalAddress.countryGeoId?has_content><br/>${postalAddress.countryGeoId}</#if>
+ <#if postalAddress.countryGeoId?has_content><br />${postalAddress.countryGeoId}</#if>
<#if (!postalAddress.countryGeoId?has_content || postalAddress.countryGeoId?if_exists = "USA")>
<#assign addr1 = postalAddress.address1?if_exists />
<#if (addr1.indexOf(" ") > 0)>
@@ -216,7 +216,7 @@ under the License.
</#list>
</table>
<#else>
- <label>${uiLabelMap.PartyNoContactInformation}.</label><br/>
+ <label>${uiLabelMap.PartyNoContactInformation}.</label><br />
</#if>
</div>
</div>
@@ -484,8 +484,16 @@ under the License.
<td>${emailAddress.infoString?if_exists}</td>
<td> </td>
<td>
- <#if (contactListParty.statusId?if_exists == "CLPT_ACCEPTED")>
- <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.EcommerceUnsubscribe}</a>
+ <#if (contactListParty.statusId?if_exists == "CLPT_ACCEPTED")>
+ <form method="post" action="<@o...@ofbizUrl>" name="clistRejectForm${contactListParty_index}">
+ <div>
+ <input type="hidden" name="partyId" value="${party.partyId}"/>
+ <input type="hidden" name="contactListId" value="${contactListParty.contactListId}"/>
+ <input type="hidden" name="fromDate" value="${contactListParty.fromDate}"/>
+ <input type="hidden" name="statusId" value="CLPT_REJECTED"/>
+ <input type="submit" value="${uiLabelMap.EcommerceUnsubscribe}" class="smallSubmit"/>
+ </div>
+ </form>
<#elseif (contactListParty.statusId?if_exists == "CLPT_PENDING")>
<form method="post" action="<@o...@ofbizUrl>" name="clistAcceptForm${contactListParty_index}">
<div>
@@ -498,7 +506,15 @@ under the License.
</div>
</form>
<#elseif (contactListParty.statusId?if_exists == "CLPT_REJECTED")>
- <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.EcommerceSubscribe}</a>
+ <form method="post" action="<@o...@ofbizUrl>" name="clistPendForm${contactListParty_index}">
+ <div>
+ <input type="hidden" name="partyId" value="${party.partyId}"/>
+ <input type="hidden" name="contactListId" value="${contactListParty.contactListId}"/>
+ <input type="hidden" name="fromDate" value="${contactListParty.fromDate}"/>
+ <input type="hidden" name="statusId" value="CLPT_PENDING"/>
+ <input type="submit" value="${uiLabelMap.EcommerceSubscribe}" class="smallSubmit"/>
+ </div>
+ </form>
</#if>
</td>
</tr>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/ViewComboResponse.ftl Wed Mar 24 09:23:07 2010
@@ -18,7 +18,7 @@ under the License.
-->
<#if requestAttributes._ERROR_MESSAGE_?exists>
-<br/><div class='errorMessage'>${requestAttributes._ERROR_MESSAGE_}</div><br/>
+<br /><div class='errorMessage'>${requestAttributes._ERROR_MESSAGE_}</div><br />
<#else>
<#if trailList?exists>
<#assign indent = "">
@@ -33,21 +33,21 @@ under the License.
<#if counter < len>
${indent}
${pair[0]?if_exists} - ${pair[1]?if_exists}
- <a class="tabButton" href="<@o...@ofbizUrl>${uiLabelMap.CommonView}</a> <br/>
+ <a class="tabButton" href="<@o...@ofbizUrl>${uiLabelMap.CommonView}</a> <br />
<#assign indent = indent + " ">
<#else>
- <u>${uiLabelMap.EcommerceAddResponseFor}${pair[0]?if_exists} - ${pair[1]?if_exists}:</u><br/>
+ <u>${uiLabelMap.EcommerceAddResponseFor}${pair[0]?if_exists} - ${pair[1]?if_exists}:</u><br />
</#if>
<#assign counter = counter + 1>
</#list>
<#if dataResourceId?exists>
- <br/>
+ <br />
<img src="<@o...@ofbizUrl>" />
</#if>
- <br/>
+ <br />
</#if>
${singleWrapper.renderFormString()}
-<br/>
+<br />
</#if>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/editforumarticle.ftl Wed Mar 24 09:23:07 2010
@@ -30,7 +30,7 @@ under the License.
</td>
</tr>
</table>
-<br/>
+<br />
-->
<div class="screenlet">
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl Wed Mar 24 09:23:07 2010
@@ -20,7 +20,7 @@ under the License.
<#assign viewIndex = viewIndex?default(0)>
<#assign lowIndex = viewIndex?int * viewSize?int + 1>
<#assign highIndex = viewIndex?int * viewSize?int + viewSize>
-<#--<br/>== viewIndex: ${viewIndex} ==viewSize: ${viewSize} ==lowIndex: ${lowIndex}== highIndex: ${highIndex} == ListSize: ${listSize}-->
+<#--<br />== viewIndex: ${viewIndex} ==viewSize: ${viewSize} ==lowIndex: ${lowIndex}== highIndex: ${highIndex} == ListSize: ${listSize}-->
<#if forumMessages?has_content && forumMessages?size gt 0>
<#assign listSize = forumMessages?size/>
<#if highIndex gt listSize><#assign highIndex = listSize></#if>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl Wed Mar 24 09:23:07 2010
@@ -46,7 +46,7 @@ under the License.
${result.resultData.electronicText.textData}
</#if>
</div>
- <hr/>
+ <hr />
<#else>
<div class="tabletext"> ${result.errorMessage?if_exists}</div>
</#if>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl Wed Mar 24 09:23:07 2010
@@ -53,7 +53,7 @@ under the License.
<input type="hidden" name="contentId_o_${row}" value="${content.contentId}"/>
<tr>
<td colspan="5" class="tabletext">
- ${uiLabelMap.CommonContent}:<br/>
+ ${uiLabelMap.CommonContent}:<br />
<@renderSubContentCache subContentId=content.contentId/>
</td>
</tr>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl Wed Mar 24 09:23:07 2010
@@ -20,11 +20,11 @@ under the License.
<#import "/includes/bloglib.ftl" as blog/>
<div class="screenlet" >
-<h1>${uiLabelMap.EcommerceFromSite}:</h1><br/>
+<h1>${uiLabelMap.EcommerceFromSite}:</h1><br />
<div>
<@renderSiteAncestryPath trail=siteAncestorList?default([])/>
<#if trailList?exists && 1 < trailList?size >
-<h1>${uiLabelMap.EcommerceFromParentArticle}:</h1><br/>
+<h1>${uiLabelMap.EcommerceFromParentArticle}:</h1><br />
</#if>
<#if trailList?has_content>
<@blog.renderAncestryPath trail=trailList startIndex=1 endIndexOffset=1 />
@@ -32,8 +32,8 @@ under the License.
<#assign pair=trailList[trailList?size - 1]/>
<#assign pair0 = pair[0]?if_exists>
<#assign pair1 = pair[1]?if_exists>
- <hr/>
- <h1>${uiLabelMap.EcommerceContentFor} ${pair1?if_exists}[${pair0?if_exists}]:</h1><br/>
+ <hr />
+ <h1>${uiLabelMap.EcommerceContentFor} ${pair1?if_exists}[${pair0?if_exists}]:</h1><br />
</#if>
<#else>
</#if>
@@ -52,7 +52,7 @@ under the License.
<@checkPermission subContentId=subContentId targetOperation="CONTENT_CREATE|CONTENT_RESPOND" contentPurposeList="RESPONSE" >
<a class="tabButton" href="<@o...@ofbizUrl>" >${uiLabelMap.EcommerceRespond}</a>
</...@checkPermission>
-<br/>
+<br />
</td>
</tr>
@@ -71,7 +71,7 @@ under the License.
It is not convenient to have the traverseSubContent check or recheck the first node
because the associated ContentAssoc entity is not known.
-->
- <h1>${uiLabelMap.EcommerceResponses}</h1><br/>
+ <h1>${uiLabelMap.EcommerceResponses}</h1><br />
<@loopSubContent contentAssocTypeId="RESPONSE" contentId=subContentId mapKey=""
pickWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\") && mapKey == null"
followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\")">
@@ -100,7 +100,7 @@ under the License.
<td class="tabletext">
${indentFill}
<a class="tabButton" href="<@o...@ofbizUrl>" >${uiLabelMap.CommonView}</a>
- ${content.contentId?if_exists}-${content.description?if_exists}<br/>
+ ${content.contentId?if_exists}-${content.description?if_exists}<br />
</td>
</tr>
</#if>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl Wed Mar 24 09:23:07 2010
@@ -19,7 +19,7 @@ under the License.
<#import "bloglib.ftl" as blog/>
<div class="screenlet" >
-<h1>{${uiLabelMap.EcommerceFromSite}</h1><br/>
+<h1>{${uiLabelMap.EcommerceFromSite}</h1><br />
<div>
<@blog.renderAncestryPath trail=ancestorList?default([]) endIndexOffset=1 />
<#-- Do this so that we don't have to find the content twice (again in renderSubContent) -->
@@ -30,8 +30,8 @@ under the License.
<#assign subContent = delegator.findByPrimaryKeyCache("Content", Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId", subContentId))/>
<#assign dummy = globalNodeTrail.add(lastNode)/>
</#if>
-<br/>
-<h1>${uiLabelMap.EcommerceContentFor} [${subContentId}] ${subContent.contentName?if_exists} - ${subContent.description?if_exists}:</h1><br/>
+<br />
+<h1>${uiLabelMap.EcommerceContentFor} [${subContentId}] ${subContent.contentName?if_exists} - ${subContent.description?if_exists}:</h1><br />
<#assign thisContentId=subContentId?if_exists>
<#if !thisContentId?has_content>
@@ -47,12 +47,12 @@ under the License.
<@checkPermission subContentId=subContentId targetOperation="HAS_USER_ROLE" contentPurposeList="RESPONSE" >
<a class="tabButton" href="<@o...@ofbizUrl>" >${uiLabelMap.EcommerceRespond}</a>
</...@checkPermission>
-<br/>
+<br />
</td>
</tr>
</table>
-<hr/>
+<hr />
<#--
<@checkPermission mode="not-equals" subContentId=subContentId targetOperation="CONTENT_CREATE|CONTENT_RESPOND" contentPurposeList="RESPONSE" >
${permissionErrorMsg?if_exists}
@@ -66,7 +66,7 @@ under the License.
It is not convenient to have the traverseSubContent check or recheck the first node
because the associated ContentAssoc entity is not known.
-->
- <h1>${uiLabelMap.EcommerceResponses}</h1><br/>
+ <h1>${uiLabelMap.EcommerceResponses}</h1><br />
<@loopSubContent contentAssocTypeId="RESPONSE" contentId=subContentId mapKey=""
pickWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\") && mapKey == null"
followWhen="contentAssocTypeId != null && contentAssocTypeId.equals(\"RESPONSE\")">
@@ -94,7 +94,7 @@ under the License.
<td class="tabletext">
${indentFill}
<a class="tabButton" href="<@o...@ofbizUrl>" >${uiLabelMap.CommonView}</a>
- ${content.contentId?if_exists}-${content.description?if_exists}<br/>
+ ${content.contentId?if_exists}-${content.description?if_exists}<br />
</td>
</tr>
</#if>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js Wed Mar 24 09:23:07 2010
@@ -275,7 +275,7 @@ function getShipOptions() {
var shipOptions = null;
var optionList = [];
if ($F('shipMethod') == "" || $F('shipMethod') == null) {
- new Ajax.Request('getShipOptions', {
+ new Ajax.Request('getShipOptions', {
asynchronous: false,
onSuccess: function(transport) {
var data = transport.responseText.evalJSON(true);
@@ -586,7 +586,7 @@ function updateShippingSummary() {
}
function updateBillingSummary() {
- var fullName = $F('firstNameOnCard') + " " +$F('lastNameOnCard');
+ var fullName = $F('firstNameOnCard') + " " +$F('lastNameOnCard');
$('completedBillToAttn').update("Attn: " + fullName);
var extension = "";
if ($F('billToExtension')) {
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js Wed Mar 24 09:23:07 2010
@@ -128,8 +128,8 @@ function validatePhoneNumber(errorDivId,
}
function submitValidNewUser() {
- validatePhoneNumber('shipToPhoneRequired', 'shipToContactNumber', 'shipToCountryCode', 'shipToAreaCode');
- validatePhoneNumber('billToPhoneRequired', 'billToContactNumber', 'billToCountryCode', 'billToAreaCode');
+ validatePhoneNumber('shipToPhoneRequired', 'shipToContactNumber', 'shipToCountryCode', 'shipToAreaCode');
+ validatePhoneNumber('billToPhoneRequired', 'billToContactNumber', 'billToCountryCode', 'billToAreaCode');
if (validateNewUser.validate()) {
$('newUserForm').submit();
}
@@ -172,7 +172,7 @@ function useShippingAddressAsBillingTogg
copyShipToBillAddress();
hideErrorMessage();
} else {
- validBillingAddress();
+ validBillingAddress();
stopObservingShipToBillAddress();
$('billToAddress1').disabled = false ;
$('billToAddress2').disabled = false ;
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl Wed Mar 24 09:23:07 2010
@@ -19,20 +19,20 @@ under the License.
<#assign nowTimestamp = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp()>
- <br/>
+ <br />
<div class="footer">
<div>
<a href="http://jigsaw.w3.org/css-validator/"><img style="border:0;width:88px;height:31px" src="<@o...@ofbizContentUrl>" alt="Valid CSS!"/></a>
<a href="http://validator.w3.org/check?uri=referer"><img style="border:0;width:88px;height:31px" src="<@o...@ofbizContentUrl>" alt="Valid XHTML 1.0!"/></a>
</div>
- <br/>
+ <br />
<div class="tabletext">
<a href="http://ofbiz.apache.org">${uiLabelMap.EcommerceAboutUs}</a>
<div class="tabletext">Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" class="tabletext">www.apache.org</a></div>
<div class="tabletext">Powered by <a href="http://ofbiz.apache.org" class="tabletext">Apache OFBiz</a></div>
</div>
- <br/>
+ <br />
<div class="tabletext"><a href="<@o...@ofbizUrl>">${uiLabelMap.EcommerceSeeStorePoliciesHere}</a></div>
</div>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/login.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/login.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/login.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/login.ftl Wed Mar 24 09:23:07 2010
@@ -18,59 +18,57 @@ under the License.
-->
<h1>${uiLabelMap.CommonLogin}</h1>
- <div class="screenlet">
- <h3>${uiLabelMap.CommonRegistered}</h3>
- <form method="post" action="<@o...@ofbizUrl>" name="loginform">
- <fieldset>
- <div>
- <label for="userName">${uiLabelMap.CommonUsername}</label>
- <input type="text" id="userName" name="USERNAME" value="<#if requestParameters.USERNAME?has_content>${requestParameters.USERNAME}<#elseif autoUserLogin?has_content>${autoUserLogin.userLoginId}</#if>"/>
- </div>
- <#if autoUserLogin?has_content>
- <p>(${uiLabelMap.CommonNot} ${autoUserLogin.userLoginId}? <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonClickHere}</a>)</p>
- </#if>
- <div>
- <label for="password">${uiLabelMap.CommonPassword}:</label>
- <input type="password" id="password" name="PASSWORD" value=""/>
- </div>
- <div>
- <input type="submit" class="button" value="${uiLabelMap.CommonLogin}"/>
- </div>
- <div>
- <label for="newcustomer_submit">${uiLabelMap.CommonMayCreateNewAccountHere}:
- <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonMayCreate}</a>
- </div>
- </fieldset>
- </form>
- </div>
+<div class="screenlet">
+ <h3>${uiLabelMap.CommonRegistered}</h3>
+ <form method="post" action="<@o...@ofbizUrl>" name="loginform">
+ <fieldset>
+ <div>
+ <label for="userName">${uiLabelMap.CommonUsername}</label>
+ <input type="text" id="userName" name="USERNAME" value="<#if requestParameters.USERNAME?has_content>${requestParameters.USERNAME}<#elseif autoUserLogin?has_content>${autoUserLogin.userLoginId}</#if>"/>
+ </div>
+<#if autoUserLogin?has_content>
+ <p>(${uiLabelMap.CommonNot} ${autoUserLogin.userLoginId}? <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonClickHere}</a>)</p>
+</#if>
+ <div>
+ <label for="password">${uiLabelMap.CommonPassword}:</label>
+ <input type="password" id="password" name="PASSWORD" value=""/>
+ </div>
+ <div>
+ <input type="submit" class="button" value="${uiLabelMap.CommonLogin}"/>
+ </div>
+ <div>
+ <label for="newcustomer_submit">${uiLabelMap.CommonMayCreateNewAccountHere}:</label>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonMayCreate}</a>
+ </div>
+ </fieldset>
+ </form>
+</div>
- <div class="screenlet">
- <h3>${uiLabelMap.CommonForgotYourPassword}?</h3>
- <form method="post" action="<@o...@ofbizUrl>">
- <div>
- <label for="forgotpassword_userName">${uiLabelMap.CommonUsername}</label>
- <input type="text" id="forgotpassword_userName" name="USERNAME" value="<#if requestParameters.USERNAME?has_content>${requestParameters.USERNAME}<#elseif autoUserLogin?has_content>${autoUserLogin.userLoginId}</#if>"/>
- </div>
- <div class="buttons">
- <input type="submit" class="button" name="GET_PASSWORD_HINT" value="${uiLabelMap.CommonGetPasswordHint}"/>
- <input type="submit" class="button" name="EMAIL_PASSWORD" value="${uiLabelMap.CommonEmailPassword}"/>
- </div>
- </form>
+<div class="screenlet">
+ <h3>${uiLabelMap.CommonForgotYourPassword}?</h3>
+ <form method="post" action="<@o...@ofbizUrl>">
+ <div>
+ <label for="forgotpassword_userName">${uiLabelMap.CommonUsername}</label>
+ <input type="text" id="forgotpassword_userName" name="USERNAME" value="<#if requestParameters.USERNAME?has_content>${requestParameters.USERNAME}<#elseif autoUserLogin?has_content>${autoUserLogin.userLoginId}</#if>"/>
</div>
-<#--
- <div class="screenlet">
- <h3>${uiLabelMap.CommonNewUser}</h3>
- <form method="post" action="<@o...@ofbizUrl>">
- <div>
- <label for="newcustomer_submit">${uiLabelMap.CommonMayCreateNewAccountHere}:</p>
- <input type="submit" class="button" id="newcustomer_submit" value="${uiLabelMap.CommonMayCreate}"/>
- <div>
- </form>
+ <div class="buttons">
+ <input type="submit" class="button" name="GET_PASSWORD_HINT" value="${uiLabelMap.CommonGetPasswordHint}"/>
+ <input type="submit" class="button" name="EMAIL_PASSWORD" value="${uiLabelMap.CommonEmailPassword}"/>
</div>
--->
- </div>
- <div class="endcolumns"> </div>
+ </form>
</div>
+<#--
+<div class="screenlet">
+ <h3>${uiLabelMap.CommonNewUser}</h3>
+ <form method="post" action="<@o...@ofbizUrl>">
+ <div>
+ <label for="newcustomer_submit">${uiLabelMap.CommonMayCreateNewAccountHere}:</p>
+ <input type="submit" class="button" id="newcustomer_submit" value="${uiLabelMap.CommonMayCreate}"/>
+ <div>
+ </form>
+</div>
+-->
+<div class="endcolumns"> </div>
<script language="JavaScript" type="text/javascript">
<#if autoUserLogin?has_content>document.loginform.PASSWORD.focus();</#if>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Wed Mar 24 09:23:07 2010
@@ -574,7 +574,7 @@ under the License.
</fieldset>
<fieldset class="col">
<div>
- <input class="checkbox" id="useShippingAddressForBilling" name="useShippingAddressForBilling" type="checkbox" value="Y" <#if useShippingAddressForBilling?has_content && useShippingAddressForBilling?default("")=="Y">checked</#if> /><label for="useShippingAddressForBilling">${uiLabelMap.FacilityBillingAddressSameShipping}</label>
+ <input class="checkbox" id="useShippingAddressForBilling" name="useShippingAddressForBilling" type="checkbox" value="Y" <#if useShippingAddressForBilling?has_content && useShippingAddressForBilling?default("")=="Y">checked="checked"</#if> /><label for="useShippingAddressForBilling">${uiLabelMap.FacilityBillingAddressSameShipping}</label>
</div>
<div id="billingAddress" <#if useShippingAddressForBilling?has_content && useShippingAddressForBilling?default("")=="Y">style="display:none"</#if>>
<div>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl Wed Mar 24 09:23:07 2010
@@ -97,7 +97,7 @@ function shipBillAddr() {
</td>
</tr>
<tr>
- <td colspan="3"><hr/></td>
+ <td colspan="3"><hr /></td>
</tr>
</#if>
@@ -116,7 +116,7 @@ function shipBillAddr() {
<#assign creditCard = requestParameters>
</#if>
<tr>
- <td colspan="3"><hr/></td>
+ <td colspan="3"><hr /></td>
</tr>
<tr>
<td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingCreditCardInformation}</div></td>
@@ -133,7 +133,7 @@ function shipBillAddr() {
<#assign eftAccount = requestParameters>
</#if>
<tr>
- <td colspan="3"><hr/></td>
+ <td colspan="3"><hr /></td>
</tr>
<tr>
<td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingEFTAccountInformation}</div></td>
@@ -202,7 +202,7 @@ function shipBillAddr() {
<input type="hidden" name="addGiftCard" value="Y">
<#if paymentMethodType != "GC">
<tr>
- <td colspan="3"><hr/></td>
+ <td colspan="3"><hr /></td>
</tr>
</#if>
<tr>
@@ -259,21 +259,21 @@ function shipBillAddr() {
<td width='5%' nowrap><input type="checkbox" name="useGc" value="GC" <#if paymentMethodType?exists && paymentMethodType == "GC">checked</#if></td>
<td width='95%' nowrap><div class="tabletext">${uiLabelMap.AccountingCheckGiftCard}</div></td>
</tr>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
</#if>
<#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists>
<tr>
<td width='5%' nowrap><input type="radio" name="paymentMethodType" value="offline" <#if paymentMethodType?exists && paymentMethodType == "offline">checked</#if></td>
<td width='95%'nowrap><div class="tabletext">${uiLabelMap.OrderPaymentOfflineCheckMoney}</div></td>
</tr>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
</#if>
<#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists>
<tr>
<td width='5%' nowrap><input type="radio" name="paymentMethodType" value="CC" <#if paymentMethodType?exists && paymentMethodType == "CC">checked</#if></td>
<td width='95%' nowrap><div class="tabletext">${uiLabelMap.AccountingVisaMastercardAmexDiscover}</div></td>
</tr>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
</#if>
<#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists>
<tr>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/ccinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/ccinfo.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/ccinfo.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/ccinfo.ftl Wed Mar 24 09:23:07 2010
@@ -20,7 +20,7 @@ under the License.
<#if !creditCard?has_content>
<#assign creditCard = requestParameters>
</#if>
-<tr><td colspan="3"><hr/></td></tr>
+<tr><td colspan="3"><hr /></td></tr>
${screens.render("component://accounting/widget/CommonScreens.xml#creditCardFields")}
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutreview.ftl Wed Mar 24 09:23:07 2010
@@ -39,7 +39,7 @@ under the License.
<#if cart?exists && 0 < cart.size()>
${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")}
- <br/>
+ <br />
${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")}
<table border="0" cellpadding="1" width="100%">
<tr>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl Wed Mar 24 09:23:07 2010
@@ -94,7 +94,7 @@ function submitForm(form, mode, value) {
</td>
</tr>
</#if>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<tr>
<td colspan="2">
<h2>${uiLabelMap.OrderShipAllAtOnce}?</h2>
@@ -116,7 +116,7 @@ function submitForm(form, mode, value) {
<div class="tabletext">${uiLabelMap.OrderPleaseShipItemsBecomeAvailable}.</div>
</td>
</tr>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<tr>
<td colspan="2">
<h2>${uiLabelMap.OrderSpecialInstructions}</h2>
@@ -127,7 +127,7 @@ function submitForm(form, mode, value) {
<textarea class="textAreaBox" cols="30" rows="3" wrap="hard" name="shipping_instructions">${shoppingCart.getShippingInstructions()?if_exists}</textarea>
</td>
</tr>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<tr>
<td colspan="2">
<h2>${uiLabelMap.OrderPoNumber}</h2>
@@ -138,7 +138,7 @@ function submitForm(form, mode, value) {
</td>
</tr>
<#if productStore.showCheckoutGiftOptions?if_exists != "N">
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<tr>
<td colspan="2">
<div>
@@ -148,7 +148,7 @@ function submitForm(form, mode, value) {
</div>
</td>
</tr>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<tr>
<td colspan="2">
<h2>${uiLabelMap.OrderGiftMessage}</h2>
@@ -162,7 +162,7 @@ function submitForm(form, mode, value) {
<#else/>
<input type="hidden" name="is_gift" value="false"/>
</#if>
- <tr><td colspan="2"><hr/></td></tr>
+ <tr><td colspan="2"><hr /></td></tr>
<tr>
<td colspan="2">
<h2>${uiLabelMap.PartyEmailAddresses}</h2>
@@ -179,7 +179,7 @@ function submitForm(form, mode, value) {
</b>
</div>
<div class="tabletext">${uiLabelMap.OrderUpdateEmailAddress} <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PartyProfile}</a>.</div>
- <br/>
+ <br />
<div class="tabletext">${uiLabelMap.OrderCommaSeperatedEmailAddresses}:</div>
<input type="text" class="inputBox" size="30" name="order_additional_emails" value="${shoppingCart.getOrderAdditionalEmails()?if_exists}"/>
</td>
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl?rev=926987&r1=926986&r2=926987&view=diff
==============================================================================
--- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl (original)
+++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl Wed Mar 24 09:23:07 2010
@@ -19,7 +19,7 @@ under the License.
<#-- eft fields -->
<#if !eftAccount?has_content><#assign eftAccount = requestParameters></#if>
-<tr><td colspan="3"><hr/>
+<tr><td colspan="3"><hr />
<input type="hidden" name="paymentMethodId" value="${parameters.paymentMethodId?if_exists}"/></td></tr>
<tr><td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingEFTAccountInformation}</div></td><td width="5"> </td><td width="74%"> </td></tr>
<tr>