svn commit: r762648 [10/11] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/entity
Locked
svn commit: r762648 [10/11] - in /ofbiz/trunk: applications/accounting/data/ applications/accounting/entity
 
|
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml Tue Apr 7 08:27:15 2009 @@ -267,7 +267,7 @@ <Product productId="GZ-BASKET" productTypeId="MARKETING_PKG_AUTO" productName="Gizmo Basket" internalName="Auto-Assembled Gizmo Basket" description="Auto-Assembled Gizmo Basket. Automatically assembled each time it's ordered." longDescription="Auto-Assembled Gizmo Basket. This item will be automatically assembled with production runs every time it's ordered, and the inventory counts for it are based on the quantity available and on hand for the component items." - taxable="Y" chargeShipping="Y" autoCreateKeywords="Y" isVirtual="N" isVariant="N" /> + taxable="Y" chargeShipping="Y" autoCreateKeywords="Y" isVirtual="N" isVariant="N"/> <ProductPrice productId="GZ-BASKET" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" price="150" fromDate="2001-05-13 12:00:00.0"/> <ProductPrice productId="GZ-BASKET" productPricePurposeId="PURCHASE" productPriceTypeId="LIST_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" price="165" fromDate="2001-05-13 12:00:00.0"/> <ProductAssoc productId="GZ-BASKET" productIdTo="GZ-1000" productAssocTypeId="MANUF_COMPONENT" quantity="1" fromDate="2001-05-13 12:00:00.0"/> @@ -278,7 +278,7 @@ <Product productId="GZ-BASKET-PICK" productTypeId="MARKETING_PKG_PICK" productName="Gizmo Basket Assembly Pick" internalName="Assembled Pick Gizmo Basket" description="Assembled Pick Gizmo Basket. Assembled during picking." longDescription="Assembled Pick Gizmo Basket. This item will be assembled during picking." - taxable="Y" chargeShipping="Y" autoCreateKeywords="Y" isVirtual="N" isVariant="N" /> + taxable="Y" chargeShipping="Y" autoCreateKeywords="Y" isVirtual="N" isVariant="N"/> <ProductPrice productId="GZ-BASKET-PICK" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" price="150" fromDate="2007-01-01 12:00:00.0"/> <ProductPrice productId="GZ-BASKET-PICK" productPricePurposeId="PURCHASE" productPriceTypeId="LIST_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" price="165" fromDate="2007-01-01 12:00:00.0"/> <ProductAssoc productId="GZ-BASKET-PICK" productIdTo="GZ-1000" productAssocTypeId="PRODUCT_COMPONENT" quantity="1" fromDate="2007-01-01 12:00:00.0"/> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductCategoriesI18nData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductCategoriesI18nData.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductCategoriesI18nData.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductCategoriesI18nData.xml Tue Apr 7 08:27:15 2009 @@ -29,8 +29,8 @@ <ElectronicText dataResourceId="DR100DESCIT" textData="Gizmos (italiano)"/> <ElectronicText dataResourceId="DR100DESCEN" textData="Gizmos (english)"/> - <Content contentId="C100DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR100DESCFR" description="DESCRIPTION FR Gizmos" localeString="fr" /> - <Content contentId="C100DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR100DESCIT" description="DESCRIPTION IT Gizmos" localeString="it" /> + <Content contentId="C100DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR100DESCFR" description="DESCRIPTION FR Gizmos" localeString="fr"/> + <Content contentId="C100DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR100DESCIT" description="DESCRIPTION IT Gizmos" localeString="it"/> <Content contentId="C100DESCEN" contentTypeId="DOCUMENT" dataResourceId="DR100DESCEN" description="DESCRIPTION EN Gizmos" localeString="en"/> <ProductCategoryContent productCategoryId="100" contentId="C100DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/> @@ -47,8 +47,8 @@ <ElectronicText dataResourceId="DR101DESCIT" textData="Piccoli Gizmos"/> <ElectronicText dataResourceId="DR101DESCEN" textData="Small Gizmos"/> - <Content contentId="C101DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR101DESCFR" description="DESCRIPTION FR Petits Gizmos" localeString="fr" /> - <Content contentId="C101DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR101DESCIT" description="DESCRIPTION IT Piccoli Gizmos" localeString="it" /> + <Content contentId="C101DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR101DESCFR" description="DESCRIPTION FR Petits Gizmos" localeString="fr"/> + <Content contentId="C101DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR101DESCIT" description="DESCRIPTION IT Piccoli Gizmos" localeString="it"/> <Content contentId="C101DESCEN" contentTypeId="DOCUMENT" dataResourceId="DR101DESCEN" description="DESCRIPTION EN Small Gizmos" localeString="en"/> <ProductCategoryContent productCategoryId="101" contentId="C101DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/> @@ -65,8 +65,8 @@ <ElectronicText dataResourceId="DR102DESCIT" textData="Grandi Gizmos"/> <ElectronicText dataResourceId="DR102DESCEN" textData="Large Gizmos"/> - <Content contentId="C102DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR102DESCFR" description="DESCRIPTION FR Grands Gizmos" localeString="fr" /> - <Content contentId="C102DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR102DESCIT" description="DESCRIPTION IT Grandi Gizmos" localeString="it" /> + <Content contentId="C102DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR102DESCFR" description="DESCRIPTION FR Grands Gizmos" localeString="fr"/> + <Content contentId="C102DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR102DESCIT" description="DESCRIPTION IT Grandi Gizmos" localeString="it"/> <Content contentId="C102DESCEN" contentTypeId="DOCUMENT" dataResourceId="DR102DESCEN" description="DESCRIPTION IT Large Gizmos" localeString="en"/> <ProductCategoryContent productCategoryId="102" contentId="C102DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/> @@ -83,8 +83,8 @@ <ElectronicText dataResourceId="DR200DESCIT" textData="Widgets (italiano)"/> <ElectronicText dataResourceId="DR200DESCEN" textData="Widgets (english)"/> - <Content contentId="C200DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR200DESCFR" description="DESCRIPTION FR Gizmos" localeString="fr" /> - <Content contentId="C200DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR200DESCIT" description="DESCRIPTION IT Gizmos" localeString="it" /> + <Content contentId="C200DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR200DESCFR" description="DESCRIPTION FR Gizmos" localeString="fr"/> + <Content contentId="C200DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR200DESCIT" description="DESCRIPTION IT Gizmos" localeString="it"/> <Content contentId="C200DESCEN" contentTypeId="DOCUMENT" dataResourceId="DR200DESCEN" description="DESCRIPTION EN Gizmos" localeString="en"/> <ProductCategoryContent productCategoryId="200" contentId="C200DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/> @@ -101,8 +101,8 @@ <ElectronicText dataResourceId="DR201DESCIT" textData="Piccoli Widgets"/> <ElectronicText dataResourceId="DR201DESCEN" textData="Small Widgets"/> - <Content contentId="C201DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR201DESCFR" description="DESCRIPTION FR Petits Widgets" localeString="fr" /> - <Content contentId="C201DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR201DESCIT" description="DESCRIPTION IT Piccoli Widgets" localeString="it" /> + <Content contentId="C201DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR201DESCFR" description="DESCRIPTION FR Petits Widgets" localeString="fr"/> + <Content contentId="C201DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR201DESCIT" description="DESCRIPTION IT Piccoli Widgets" localeString="it"/> <Content contentId="C201DESCEN" contentTypeId="DOCUMENT" dataResourceId="DR201DESCEN" description="DESCRIPTION EN Small Widgets" localeString="en"/> <ProductCategoryContent productCategoryId="201" contentId="C201DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/> @@ -119,8 +119,8 @@ <ElectronicText dataResourceId="DR2012DESCIT" textData="Altri Mini Widgets"/> <ElectronicText dataResourceId="DR2012DESCEN" textData="Other Mini Widgets"/> - <Content contentId="C2012DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR2012DESCFR" description="DESCRIPTION FR Autre Mini Widgets" localeString="fr" /> - <Content contentId="C2012DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR2012DESCIT" description="DESCRIPTION IT Altri Piccoli Widgets" localeString="it" /> + <Content contentId="C2012DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR2012DESCFR" description="DESCRIPTION FR Autre Mini Widgets" localeString="fr"/> + <Content contentId="C2012DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR2012DESCIT" description="DESCRIPTION IT Altri Piccoli Widgets" localeString="it"/> <Content contentId="C2012DESCEN" contentTypeId="DOCUMENT" dataResourceId="DR2012DESCEN" description="DESCRIPTION EN Other Mini Widgets" localeString="en"/> <ProductCategoryContent productCategoryId="2012" contentId="C2012DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/> @@ -137,8 +137,8 @@ <ElectronicText dataResourceId="DR2011DESCIT" textData="Mini Widgets it"/> <ElectronicText dataResourceId="DR2011DESCEN" textData="Mini Widgets en"/> - <Content contentId="C2011DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR2011DESCFR" description="DESCRIPTION FR Mini Widgets" localeString="fr" /> - <Content contentId="C2011DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR2011DESCIT" description="DESCRIPTION IT Mini Widgets" localeString="it" /> + <Content contentId="C2011DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR2011DESCFR" description="DESCRIPTION FR Mini Widgets" localeString="fr"/> + <Content contentId="C2011DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR2011DESCIT" description="DESCRIPTION IT Mini Widgets" localeString="it"/> <Content contentId="C2011DESCEN" contentTypeId="DOCUMENT" dataResourceId="DR2011DESCEN" description="DESCRIPTION EN Mini Widgets" localeString="en"/> <ProductCategoryContent productCategoryId="2011" contentId="C2011DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/> @@ -155,8 +155,8 @@ <ElectronicText dataResourceId="DR20111DESCIT" textData="Micro Widgets (italiano)"/> <ElectronicText dataResourceId="DR20111DESCEN" textData="Micro Widgets (english)"/> - <Content contentId="C20111DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR20111DESCFR" description="DESCRIPTION FR Micro Widgets" localeString="fr" /> - <Content contentId="C20111DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR20111DESCIT" description="DESCRIPTION IT Micro Widgets" localeString="it" /> + <Content contentId="C20111DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR20111DESCFR" description="DESCRIPTION FR Micro Widgets" localeString="fr"/> + <Content contentId="C20111DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR20111DESCIT" description="DESCRIPTION IT Micro Widgets" localeString="it"/> <Content contentId="C20111DESCEN" contentTypeId="DOCUMENT" dataResourceId="DR20111DESCEN" description="DESCRIPTION EN Micro Widgets" localeString="en"/> <ProductCategoryContent productCategoryId="20111" contentId="C20111DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/> @@ -173,8 +173,8 @@ <ElectronicText dataResourceId="DR202DESCIT" textData="Grande Widgets"/> <ElectronicText dataResourceId="DR202DESCEN" textData="Large Widgets"/> - <Content contentId="C202DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR202DESCFR" description="DESCRIPTION FR Grands Widgets" localeString="fr" /> - <Content contentId="C202DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR202DESCIT" description="DESCRIPTION IT Grandi Widgets" localeString="it" /> + <Content contentId="C202DESCFR" contentTypeId="DOCUMENT" dataResourceId="DR202DESCFR" description="DESCRIPTION FR Grands Widgets" localeString="fr"/> + <Content contentId="C202DESCIT" contentTypeId="DOCUMENT" dataResourceId="DR202DESCIT" description="DESCRIPTION IT Grandi Widgets" localeString="it"/> <Content contentId="C202DESCEN" contentTypeId="DOCUMENT" dataResourceId="DR202DESCEN" description="DESCRIPTION IT Large Widgets" localeString="en"/> <ProductCategoryContent productCategoryId="202" contentId="C202DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/> @@ -191,8 +191,8 @@ <ElectronicText dataResourceId="DRGC-100DESCIT" textData="Carte regalo"/> <ElectronicText dataResourceId="DRGC-100DESCEN" textData="Gift Cards"/> - <Content contentId="CGC-100DESCFR" contentTypeId="DOCUMENT" dataResourceId="DRGC-100DESCFR" description="DESCRIPTION FR Cartes cadeau" localeString="fr" /> - <Content contentId="CGC-100DESCIT" contentTypeId="DOCUMENT" dataResourceId="DRGC-100DESCIT" description="DESCRIPTION IT Carte regalo" localeString="it" /> + <Content contentId="CGC-100DESCFR" contentTypeId="DOCUMENT" dataResourceId="DRGC-100DESCFR" description="DESCRIPTION FR Cartes cadeau" localeString="fr"/> + <Content contentId="CGC-100DESCIT" contentTypeId="DOCUMENT" dataResourceId="DRGC-100DESCIT" description="DESCRIPTION IT Carte regalo" localeString="it"/> <Content contentId="CGC-100DESCEN" contentTypeId="DOCUMENT" dataResourceId="DRGC-100DESCEN" description="DESCRIPTION EN Gift Cards" localeString="en"/> <ProductCategoryContent productCategoryId="GC-100" contentId="CGC-100DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/> @@ -209,8 +209,8 @@ <ElectronicText dataResourceId="DRGC-101DESCIT" textData="Acquisto di carta regalo"/> <ElectronicText dataResourceId="DRGC-101DESCEN" textData="Gift Cards Purchase"/> - <Content contentId="CGC-101DESCFR" contentTypeId="DOCUMENT" dataResourceId="DRGC-101DESCFR" description="DESCRIPTION FR Achat de carte cadeau" localeString="fr" /> - <Content contentId="CGC-101DESCIT" contentTypeId="DOCUMENT" dataResourceId="DRGC-101DESCIT" description="DESCRIPTION IT Acquisto di carta regalo" localeString="it" /> + <Content contentId="CGC-101DESCFR" contentTypeId="DOCUMENT" dataResourceId="DRGC-101DESCFR" description="DESCRIPTION FR Achat de carte cadeau" localeString="fr"/> + <Content contentId="CGC-101DESCIT" contentTypeId="DOCUMENT" dataResourceId="DRGC-101DESCIT" description="DESCRIPTION IT Acquisto di carta regalo" localeString="it"/> <Content contentId="CGC-101DESCEN" contentTypeId="DOCUMENT" dataResourceId="DRGC-101DESCEN" description="DESCRIPTION IT Gift Cards Purchase" localeString="en"/> <ProductCategoryContent productCategoryId="GC-101" contentId="CGC-101DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/> @@ -227,8 +227,8 @@ <ElectronicText dataResourceId="DRGC-102DESCIT" textData="Ricarica di carte regalo"/> <ElectronicText dataResourceId="DRGC-102DESCEN" textData="Gift Cards Reload"/> - <Content contentId="CGC-102DESCFR" contentTypeId="DOCUMENT" dataResourceId="DRGC-102DESCFR" description="DESCRIPTION FR Rechargement de cartes cadeau" localeString="fr" /> - <Content contentId="CGC-102DESCIT" contentTypeId="DOCUMENT" dataResourceId="DRGC-102DESCIT" description="DESCRIPTION IT Ricarica di carte regalo" localeString="it" /> + <Content contentId="CGC-102DESCFR" contentTypeId="DOCUMENT" dataResourceId="DRGC-102DESCFR" description="DESCRIPTION FR Rechargement de cartes cadeau" localeString="fr"/> + <Content contentId="CGC-102DESCIT" contentTypeId="DOCUMENT" dataResourceId="DRGC-102DESCIT" description="DESCRIPTION IT Ricarica di carte regalo" localeString="it"/> <Content contentId="CGC-102DESCEN" contentTypeId="DOCUMENT" dataResourceId="DRGC-102DESCEN" description="DESCRIPTION EN Gift Cards Reload" localeString="en"/> <ProductCategoryContent productCategoryId="GC-102" contentId="CGC-102DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/> @@ -245,8 +245,8 @@ <ElectronicText dataResourceId="DRPC-100DESCIT" textData="Computer configurabili"/> <ElectronicText dataResourceId="DRPC-100DESCEN" textData="Configurables PCs"/> - <Content contentId="CPC-100DESCFR" contentTypeId="DOCUMENT" dataResourceId="DRPC-100DESCFR" description="DESCRIPTION FR PC configurables" localeString="fr" /> - <Content contentId="CPC-100DESCIT" contentTypeId="DOCUMENT" dataResourceId="DRPC-100DESCIT" description="DESCRIPTION IT Computer configurabili" localeString="it" /> + <Content contentId="CPC-100DESCFR" contentTypeId="DOCUMENT" dataResourceId="DRPC-100DESCFR" description="DESCRIPTION FR PC configurables" localeString="fr"/> + <Content contentId="CPC-100DESCIT" contentTypeId="DOCUMENT" dataResourceId="DRPC-100DESCIT" description="DESCRIPTION IT Computer configurabili" localeString="it"/> <Content contentId="CPC-100DESCEN" contentTypeId="DOCUMENT" dataResourceId="DRPC-100DESCEN" description="DESCRIPTION EN Configurables PCs" localeString="en"/> <ProductCategoryContent productCategoryId="PC-100" contentId="CPC-100DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2006-09-22 00:00:00.0"/> @@ -263,8 +263,8 @@ <ElectronicText dataResourceId="DRFOOD-001DESCIT" textData="Nutrimento configurabili"/> <ElectronicText dataResourceId="DRFOOD-001DESCEN" textData="Configurables Foods"/> - <Content contentId="CFOOD-001DESCFR" contentTypeId="DOCUMENT" dataResourceId="DRFOOD-001DESCFR" description="DESCRIPTION FR Nourriture à la carte" localeString="fr" /> - <Content contentId="CFOOD-001DESCIT" contentTypeId="DOCUMENT" dataResourceId="DRFOOD-001DESCIT" description="DESCRIPTION IT Nutrimento configurabili" localeString="it" /> + <Content contentId="CFOOD-001DESCFR" contentTypeId="DOCUMENT" dataResourceId="DRFOOD-001DESCFR" description="DESCRIPTION FR Nourriture à la carte" localeString="fr"/> + <Content contentId="CFOOD-001DESCIT" contentTypeId="DOCUMENT" dataResourceId="DRFOOD-001DESCIT" description="DESCRIPTION IT Nutrimento configurabili" localeString="it"/> <Content contentId="CFOOD-001DESCEN" contentTypeId="DOCUMENT" dataResourceId="DRFOOD-001DESCEN" description="DESCRIPTION EN Configurables Foods" localeString="en"/> <ProductCategoryContent productCategoryId="FOOD-001" contentId="CFOOD-001DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2007-12-28 00:00:00.0"/> @@ -279,7 +279,7 @@ <ElectronicText dataResourceId="DRPROMO-001DESCFR" textData="Articles de démonstration"/> <ElectronicText dataResourceId="DRPROMO-001DESCEN" textData="Featured products"/> - <Content contentId="CPROMO-001DESCFR" contentTypeId="DOCUMENT" dataResourceId="DRPROMO-001DESCFR" description="DESCRIPTION FR Articles de démonstration" localeString="fr" /> + <Content contentId="CPROMO-001DESCFR" contentTypeId="DOCUMENT" dataResourceId="DRPROMO-001DESCFR" description="DESCRIPTION FR Articles de démonstration" localeString="fr"/> <Content contentId="CPROMO-001DESCEN" contentTypeId="DOCUMENT" dataResourceId="DRPROMO-001DESCEN" description="DESCRIPTION EN Featured products" localeString="en"/> <ProductCategoryContent productCategoryId="PROMOTIONS" contentId="CPROMO-001DESCEN" prodCatContentTypeId="CATEGORY_NAME" fromDate="2007-12-28 00:00:00.0"/> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductI18nData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductI18nData.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductI18nData.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoProductI18nData.xml Tue Apr 7 08:27:15 2009 @@ -29,8 +29,8 @@ <ElectronicText dataResourceId="GZ2644DESCIT" textData="Gizmo rotondo con luci"/> <ElectronicText dataResourceId="GZ2644DESCEN" textData="Round Gizmo with lights"/> - <Content contentId="GZ2644DESCFR" contentTypeId="DOCUMENT" dataResourceId="GZ2644DESCFR" description="DESCRIPTION FR Round Gizmo" localeString="fr" /> - <Content contentId="GZ2644DESCIT" contentTypeId="DOCUMENT" dataResourceId="GZ2644DESCIT" description="DESCRIPTION IT Round Gizmo" localeString="it" /> + <Content contentId="GZ2644DESCFR" contentTypeId="DOCUMENT" dataResourceId="GZ2644DESCFR" description="DESCRIPTION FR Round Gizmo" localeString="fr"/> + <Content contentId="GZ2644DESCIT" contentTypeId="DOCUMENT" dataResourceId="GZ2644DESCIT" description="DESCRIPTION IT Round Gizmo" localeString="it"/> <Content contentId="GZ2644DESCEN" contentTypeId="DOCUMENT" dataResourceId="GZ2644DESCEN" description="DESCRIPTION EN Round Gizmo" localeString="en"/> <ProductContent productId="GZ-2644" contentId="GZ2644DESCEN" productContentTypeId="DESCRIPTION" fromDate="2006-09-22 00:00:00.0"/> @@ -47,8 +47,8 @@ <ElectronicText dataResourceId="GZ2644NAMEIT" textData="Gizmo Rotondo"/> <ElectronicText dataResourceId="GZ2644NAMEEN" textData="Round Gizmo"/> - <Content contentId="GZ2644NAMEFR" contentTypeId="DOCUMENT" dataResourceId="GZ2644NAMEFR" description="DESCRIPTION FR Round Gizmo" localeString="fr" /> - <Content contentId="GZ2644NAMEIT" contentTypeId="DOCUMENT" dataResourceId="GZ2644NAMEIT" description="DESCRIPTION IT Round Gizmo" localeString="it" /> + <Content contentId="GZ2644NAMEFR" contentTypeId="DOCUMENT" dataResourceId="GZ2644NAMEFR" description="DESCRIPTION FR Round Gizmo" localeString="fr"/> + <Content contentId="GZ2644NAMEIT" contentTypeId="DOCUMENT" dataResourceId="GZ2644NAMEIT" description="DESCRIPTION IT Round Gizmo" localeString="it"/> <Content contentId="GZ2644NAMEEN" contentTypeId="DOCUMENT" dataResourceId="GZ2644NAMEEN" description="DESCRIPTION EN Round Gizmo" localeString="en"/> <ProductContent productId="GZ-2644" contentId="GZ2644NAMEEN" productContentTypeId="PRODUCT_NAME" fromDate="2006-09-22 00:00:00.0"/> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoPurchasing.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoPurchasing.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoPurchasing.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoPurchasing.xml Tue Apr 7 08:27:15 2009 @@ -29,7 +29,7 @@ <PartyContactMechPurpose partyId="DemoSupplier" contactMechId="9001" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2001-05-13 00:00:00.000"/> <PartyContactMechPurpose partyId="DemoSupplier" contactMechId="9001" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2001-05-13 00:00:00.000"/> <PartyContactMechPurpose partyId="DemoSupplier" contactMechId="9001" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2001-05-13 00:00:00.000"/> - <UserLogin userLoginId="DemoSupplier" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" partyId="DemoSupplier" /> + <UserLogin userLoginId="DemoSupplier" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" partyId="DemoSupplier"/> <Party partyId="BigSupplier" partyTypeId="PARTY_GROUP" supplierProductName="" supplierProductId=""/> @@ -41,7 +41,7 @@ <PartyContactMechPurpose partyId="BigSupplier" contactMechId="9002" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/> <PartyContactMechPurpose partyId="BigSupplier" contactMechId="9002" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2000-01-01 00:00:00.000"/> <PartyContactMechPurpose partyId="BigSupplier" contactMechId="9002" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2000-01-01 00:00:00.000"/> - <UserLogin userLoginId="BigSupplier" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" partyId="BigSupplier" /> + <UserLogin userLoginId="BigSupplier" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" partyId="BigSupplier"/> <Party partyId="EuroSupplier" partyTypeId="PARTY_GROUP" supplierProductName="" supplierProductId=""/> <PartyGroup partyId="EuroSupplier" groupName="European Supplier" supplierProductName="" supplierProductId=""/> @@ -52,7 +52,7 @@ <PartyContactMechPurpose partyId="EuroSupplier" contactMechId="9003" contactMechPurposeTypeId="BILLING_LOCATION" fromDate="2000-01-01 00:00:00.000"/> <PartyContactMechPurpose partyId="EuroSupplier" contactMechId="9003" contactMechPurposeTypeId="GENERAL_LOCATION" fromDate="2000-01-01 00:00:00.000"/> <PartyContactMechPurpose partyId="EuroSupplier" contactMechId="9003" contactMechPurposeTypeId="PAYMENT_LOCATION" fromDate="2000-01-01 00:00:00.000"/> - <UserLogin userLoginId="EuroSupplier" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" partyId="EuroSupplier" /> + <UserLogin userLoginId="EuroSupplier" currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" partyId="EuroSupplier"/> <!-- supplier pricing --> <SupplierProduct partyId="DemoSupplier" supplierPrefOrderId="10_MAIN_SUPPL" minimumOrderQuantity="0" currencyUomId="USD" productId="GZ-1000" lastPrice="7.5" supplierProductId="GZ-1000-0" availableFromDate="2005-01-01 00:00:00.000"/> Modified: ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Tue Apr 7 08:27:15 2009 @@ -470,13 +470,13 @@ } ]]></call-bsh> </if-not-empty> - <set from-field="tempMap.partyId" field="partyId" /> + <set from-field="tempMap.partyId" field="partyId"/> <if-not-empty field="partyId"> <set field="lookupKeyValue.userLoginId" value="anonymous"/> <find-by-primary-key map="lookupKeyValue" entity-name="UserLogin" value-field="userLogin"/> <if-not-empty field="userLogin"> <set field="userLogin.partyId" from-field="partyId"/> - <field-to-session field="userLogin" session-name="userLogin" /> + <field-to-session field="userLogin" session-name="userLogin"/> <if-not-empty field="cart"> <call-object-method obj-field="cart" method-name="setOrderPartyId"> <field field="partyId"/> @@ -802,12 +802,12 @@ ]]></call-bsh> <session-to-field field="cart" session-name="shoppingCart"/> <if-not-empty field="cart"> - <set field="shipmentMethodTypeId" from-field="parameters.shipmentMethodTypeId" /> + <set field="shipmentMethodTypeId" from-field="parameters.shipmentMethodTypeId"/> <call-object-method obj-field="cart" method-name="setShipmentMethodTypeId"> <field field="shipmentMethodTypeId"/> </call-object-method> - <set field="carrierPartyId" from-field="parameters.carrierPartyId" /> + <set field="carrierPartyId" from-field="parameters.carrierPartyId"/> <call-object-method obj-field="cart" method-name="setCarrierPartyId"> <field field="carrierPartyId"/> </call-object-method> Modified: ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Tue Apr 7 08:27:15 2009 @@ -29,13 +29,13 @@ <property-to-field resource="security" property="username.lowercase" default="false" field="username_lowercase"/> <property-to-field resource="security" property="password.lowercase" default="false" field="password_lowercase"/> - <set field="default_user_password" value="ungssblepsswd" /> + <set field="default_user_password" value="ungssblepsswd"/> <now-timestamp field="nowStamp"/> <if-compare field="create_allow_password" operator="not-equals" value="true"> - <set field="parameters.password" from-field="default_user_password" /> - <set field="parameters.confirmPassword" from-field="default_user_password" /> - <set field="parameters.passwordHint" value="No hint set, accout not yet enabled" /> + <set field="parameters.password" from-field="default_user_password"/> + <set field="parameters.confirmPassword" from-field="default_user_password"/> + <set field="parameters.passwordHint" value="No hint set, accout not yet enabled"/> </if-compare> <!-- if username and/or password should be lowercased, do that now --> @@ -62,18 +62,18 @@ </simple-map-processor> </call-map-processor> <if-not-empty field="userLoginContext.userLoginId"> - <set field=" userLoginExistsMap.userLoginId" from-field="userLoginContext.userLoginId" /> + <set field=" userLoginExistsMap.userLoginId" from-field="userLoginContext.userLoginId"/> <find-by-primary-key entity-name="UserLogin" map="userLoginExistsMap" value-field="existingUserLogin"/> <if-not-empty field="existingUserLogin"> - <set field="tempErrorMessage" value="Username in use, please choose another." /> + <set field="tempErrorMessage" value="Username in use, please choose another."/> <field-to-list field="tempErrorMessage" list="error_list"/> </if-not-empty> </if-not-empty> <make-value entity-name="UserLogin" value-field="newUserLogin"/> <set field="newUserLogin.userLoginId" from-field="userLoginContext.userLoginId"/> - <set field="newUserLogin.currentPassword" from-field="userLoginContext.currentPassword" /> - <set field="newUserLogin.passwordHint" from-field="userLoginContext.passwordHint" /> + <set field="newUserLogin.currentPassword" from-field="userLoginContext.currentPassword"/> + <set field="newUserLogin.passwordHint" from-field="userLoginContext.passwordHint"/> <!-- Check the password, etc for validity --> <call-bsh><![CDATA[ @@ -201,7 +201,7 @@ <simple-map-processor name="checkRequiredEmailFormat"> <process field="emailAddress"> <validate-method method="isEmail"> - <fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly" /> + <fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/> </validate-method> </process> </simple-map-processor> @@ -210,12 +210,12 @@ </if-compare> <!-- Create the PartyRole --> - <set field="partyRoleContext.roleTypeId" from-field="parameters.roleTypeId" /> + <set field="partyRoleContext.roleTypeId" from-field="parameters.roleTypeId"/> <!-- Create the Postal Address --> <if-compare field="shipToPostalAddress" operator="equals" value="true"> <if-empty field="parameters.shipToName"> - <set field="parameters.shipToName" value="${personContext.firstName} ${personContext.middleName} ${personContext.lastName}" /> + <set field="parameters.shipToName" value="${personContext.firstName} ${personContext.middleName} ${personContext.lastName}"/> </if-empty> <call-map-processor in-map-name="parameters" out-map-name="shippingAddressContext"> <simple-map-processor name="postalAddress"> @@ -249,7 +249,7 @@ <!-- Check the flag if Second Postal address is not same as First So create Another Postal Address --> <if-compare field="billToPostalAddress" operator="equals" value="true"> <if-empty field="parameters.billToName"> - <set field="parameters.billToName" value="${personContext.firstName} ${personContext.middleName} ${personContext.lastName}" /> + <set field="parameters.billToName" value="${personContext.firstName} ${personContext.middleName} ${personContext.lastName}"/> </if-empty> <call-map-processor in-map-name="parameters" out-map-name="billingAddressContext"> <simple-map-processor name="postalAddress"> @@ -282,9 +282,9 @@ <!-- create the PartyDataSource entry to track where this info came from... --> <make-value entity-name="PartyDataSource" value-field="partyDataSource"/> - <set field="partyDataSource.dataSourceId" value="ECOMMERCE_SITE" /> - <set field="partyDataSource.fromDate" from-field="nowStamp" /> - <set field="partyDataSource.isCreate" value="Y" /> + <set field="partyDataSource.dataSourceId" value="ECOMMERCE_SITE"/> + <set field="partyDataSource.fromDate" from-field="nowStamp"/> + <set field="partyDataSource.isCreate" value="Y"/> <!-- get the visit from the session to get the visitId --> <session-to-field field="visit"/> <set from-field="visit.visitId" field="partyDataSource.visitId"/> @@ -316,7 +316,7 @@ </if-compare> </else> </if-empty> - <set field="partyRoleContext.partyId" from-field="partyId" /> + <set field="partyRoleContext.partyId" from-field="partyId"/> <call-service service-name="createPartyRole" in-map-name="partyRoleContext"/> <else> <set from-field="parameters.partyId" field="personContext.partyId"/> @@ -326,16 +326,16 @@ </if-empty> <!-- now that we have the partyId, put it where it needs to go... --> - <set field="partyDataSource.partyId" from-field="partyId" /> - <set field="userLoginContext.partyId" from-field="partyId" /> - <set field="personContext.partyId" from-field="partyId" /> - <set field="shippingAddressContext.partyId" from-field="partyId" /> - <set field="billingAddressContext.partyId" from-field="partyId" /> - <set field="homePhoneContext.partyId" from-field="partyId" /> - <set field="workPhoneContext.partyId" from-field="partyId" /> - <set field="faxPhoneContext.partyId" from-field="partyId" /> - <set field="mobilePhoneContext.partyId" from-field="partyId" /> - <set field="emailContext.partyId" from-field="partyId" /> + <set field="partyDataSource.partyId" from-field="partyId"/> + <set field="userLoginContext.partyId" from-field="partyId"/> + <set field="personContext.partyId" from-field="partyId"/> + <set field="shippingAddressContext.partyId" from-field="partyId"/> + <set field="billingAddressContext.partyId" from-field="partyId"/> + <set field="homePhoneContext.partyId" from-field="partyId"/> + <set field="workPhoneContext.partyId" from-field="partyId"/> + <set field="faxPhoneContext.partyId" from-field="partyId"/> + <set field="mobilePhoneContext.partyId" from-field="partyId"/> + <set field="emailContext.partyId" from-field="partyId"/> <if-not-empty field="newUserLogin"> <!-- If password encryption is enabled, encrpyt it now --> @@ -344,7 +344,7 @@ if (useEncryption) { newUserLogin.set("currentPassword", org.ofbiz.base.crypto.HashCrypt.getDigestHash((String) newUserLogin.get("currentPassword"))); } ]]></call-bsh> <!-- create the UserLogin manually to get around ordering and security constraints in the service --> - <set field="userLoginContext.partyId" from-field="partyId" /> + <set field="userLoginContext.partyId" from-field="partyId"/> <create-value value-field="newUserLogin"/> </if-not-empty> @@ -468,7 +468,7 @@ <!-- email address --> <if-not-empty field="parameters.emailAddress"> <if-empty field="parameters.emailContactMechId"> - <set field="emailContext.contactMechPurposeTypeId" value="PRIMARY_EMAIL" /> + <set field="emailContext.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/> <call-service service-name="createPartyEmailAddress" in-map-name="emailContext"> <result-to-field result-name="contactMechId" field="parameters.emailContactMechId"/> </call-service> @@ -484,15 +484,15 @@ </simple-method> <simple-method method-name="processCustomerSettings" short-description="Process Customer Settings; to be called as a Request Event" login-required="false"> - <set field="require_email" value="true" /> - <set field="require_phone" value="true" /> - <set field="require_login" value="false" /> + <set field="require_email" value="true"/> + <set field="require_phone" value="true"/> + <set field="require_login" value="false"/> <set field="shipToPostalAddress" value="true"/> <set field="billToPostalAddress" value="true"/> <!-- this parameter must be set to true or the createUser method below will use a default password instead of the one entered by user --> - <set field="create_allow_password" value="true" /> + <set field="create_allow_password" value="true"/> - <set field="parameters.roleTypeId" value="CUSTOMER" /> + <set field="parameters.roleTypeId" value="CUSTOMER"/> <call-simple-method method-name="createUpdateUser"/> <!-- see if we should continue now... --> @@ -517,13 +517,13 @@ } ]]></call-bsh> </if-not-empty> - <set from-field="partyId" field="partyId" /> + <set from-field="partyId" field="partyId"/> <if-not-empty field="partyId"> <set field="lookupKeyValue.userLoginId" value="anonymous"/> <find-by-primary-key map="lookupKeyValue" entity-name="UserLogin" value-field="userLogin"/> <if-not-empty field="userLogin"> <set field="userLogin.partyId" from-field="partyId"/> - <field-to-session field="userLogin" session-name="userLogin" /> + <field-to-session field="userLogin" session-name="userLogin"/> <if-not-empty field="cart"> <call-object-method obj-field="cart" method-name="setOrderPartyId"> <field field="partyId"/> @@ -576,12 +576,12 @@ ]]></call-bsh> <session-to-field field="cart" session-name="shoppingCart"/> <if-not-empty field="cart"> - <set field="shipmentMethodTypeId" from-field="parameters.shipmentMethodTypeId" /> + <set field="shipmentMethodTypeId" from-field="parameters.shipmentMethodTypeId"/> <call-object-method obj-field="cart" method-name="setShipmentMethodTypeId"> <field field="shipmentMethodTypeId"/> </call-object-method> - <set field="carrierPartyId" from-field="parameters.carrierPartyId" /> + <set field="carrierPartyId" from-field="parameters.carrierPartyId"/> <call-object-method obj-field="cart" method-name="setCarrierPartyId"> <field field="carrierPartyId"/> </call-object-method> @@ -605,7 +605,7 @@ </call-object-method> </if-not-empty> - <set field="isGift" from-field="parameters.is_gift" type="Boolean" default-value="false" /> + <set field="isGift" from-field="parameters.is_gift" type="Boolean" default-value="false"/> <call-object-method obj-field="cart" method-name="setIsGift"> <field field="isGift" type="Boolean"/> </call-object-method> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ForumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ForumForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ForumForms.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/ForumForms.xml Tue Apr 7 08:27:15 2009 @@ -27,19 +27,19 @@ </field> <field name="dataResourceId" > <drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY"> - <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}" /> - <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}" /> - <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.EcommerceImageLeft}" /> + <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}"/> + <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}"/> + <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.EcommerceImageLeft}"/> </drop-down> </field> <field name="ftlContentId" position="1"> - <display description="${ftlContentId}" /> + <display description="${ftlContentId}"/> </field> <field name="contentIdTo" position="2"> - <display description="${contentIdTo}" /> + <display description="${contentIdTo}"/> </field> <field name="ownerContentId" > - <hidden value="${contentIdTo}" /> + <hidden value="${contentIdTo}"/> </field> <field name="contentName"> <text/> @@ -50,15 +50,15 @@ <field name="summaryData" title="${uiLabelMap.EcommerceSummary}" use-when=""${summaryDataResourceTypeId}".length()>0" id-name="summaryData"> - <textarea rows="8" cols="80" /> + <textarea rows="8" cols="80"/> </field> <field name="textData" title="${uiLabelMap.ProductText}" id-name="textData"><textarea rows="20" cols="60"/></field> <field name="privilegeEnumId" > <drop-down allow-empty="false" no-current-selected-key="SUBSCRIBE_BRONZE"> - <option key="SUBSCRIBE_BRONZE" description="${uiLabelMap.EcommerceBronze}" /> - <option key="SUBSCRIBE_SILVER" description="${uiLabelMap.EcommerceSilver}" /> - <option key="SUBSCRIBE_GOLD" description="${uiLabelMap.EcommerceGold}" /> + <option key="SUBSCRIBE_BRONZE" description="${uiLabelMap.EcommerceBronze}"/> + <option key="SUBSCRIBE_SILVER" description="${uiLabelMap.EcommerceSilver}"/> + <option key="SUBSCRIBE_GOLD" description="${uiLabelMap.EcommerceGold}"/> </drop-down> </field> <field name="section" > @@ -136,10 +136,10 @@ <display /> </field> <field name="ftlContentId" position="1"> - <display description="${ftlContentId}" /> + <display description="${ftlContentId}"/> </field> <field name="contentIdTo" position="2"> - <display description="${contentIdTo}" /> + <display description="${contentIdTo}"/> </field> <field name="contentName"> <display/> @@ -209,19 +209,19 @@ </field> <field name="dataResourceId" > <drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY"> - <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}" /> - <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}" /> - <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.EcommerceImageLeft}" /> + <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}"/> + <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}"/> + <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.EcommerceImageLeft}"/> </drop-down> </field> <field name="ftlContentId" position="1"> - <display description="${ftlContentId}" /> + <display description="${ftlContentId}"/> </field> <field name="contentIdTo" position="2"> - <display description="${contentIdTo}" /> + <display description="${contentIdTo}"/> </field> <field name="ownerContentId" > - <hidden value="${contentIdTo}" /> + <hidden value="${contentIdTo}"/> </field> <field name="contentName"> <text/> @@ -232,7 +232,7 @@ <field name="summaryData" title="${uiLabelMap.EcommerceSummary}" use-when=""${summaryDataResourceTypeId}".length()>0" id-name="summaryData"> - <textarea rows="8" cols="80" /> + <textarea rows="8" cols="80"/> </field> <field name="textData" title="${uiLabelMap.ContentText}" id-name="textData"><textarea rows="20" cols="60"/></field> @@ -312,7 +312,7 @@ <form name="EditContentInfo" target="updateContent" title="" type="single" default-map-name="currentValue" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"> - <auto-fields-entity entity-name="Content" /> + <auto-fields-entity entity-name="Content"/> <field name="contentId"><display/></field> <field name="contentTypeId"> <drop-down allow-empty="false"> @@ -321,11 +321,11 @@ </field> <field name="dataResourceId"> <drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY"> - <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}" /> - <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}" /> - <option key="TEMPLATE_IMAGE_CENTERED_FILE" description="${uiLabelMap.EcommerceImageCenteredAboveFile}" /> - <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.EcommerceImageLeft}" /> - <option key="TEMPLATE_COMPOSITE" description="${uiLabelMap.EcommerceNestedContent}" /> + <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}"/> + <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}"/> + <option key="TEMPLATE_IMAGE_CENTERED_FILE" description="${uiLabelMap.EcommerceImageCenteredAboveFile}"/> + <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.EcommerceImageLeft}"/> + <option key="TEMPLATE_COMPOSITE" description="${uiLabelMap.EcommerceNestedContent}"/> </drop-down> </field> <field name="ownerContentId"><lookup target-form-name="LookupContent"/></field> @@ -414,7 +414,7 @@ <field name="dataResourceId"><display/></field> <field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field> <field name="dataResourceTypeIdDisplay" title="${uiLabelMap.CommonType}" field-name="dataResourceTypeId" > - <display description="ELECTRONIC_TEXT" also-hidden="false" /> + <display description="ELECTRONIC_TEXT" also-hidden="false"/> </field> <field name="textData" title="${uiLabelMap.ContentText}" id-name="textData"><textarea rows="20" cols="120"/> </field> <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -422,10 +422,10 @@ <form name="ImageUpload" target="uploadImage" title="" type="upload" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"> <field name="dataResourceId" > - <display description="${currentValue.dataResourceId}" /> + <display description="${currentValue.dataResourceId}"/> </field> <field name="objectInfo" title="${uiLabelMap.EcommerceImageFileName}"> - <display description="${currentValue.objectInfo}" /> + <display description="${currentValue.objectInfo}"/> </field> <field name="imageData" entity-name="ImageDataResource"> <file /> @@ -441,9 +441,9 @@ </field> <field name="dataResourceId" > <drop-down allow-empty="false" no-current-selected-key="TEMPLATE_TEXT_ONLY"> - <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}" /> - <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}" /> - <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.EcommerceImageLeft}" /> + <option key="TEMPLATE_TEXT_ONLY" description="${uiLabelMap.EcommerceTextOnly}"/> + <option key="TEMPLATE_IMAGE_CENTERED" description="${uiLabelMap.EcommerceImageCenteredAbove}"/> + <option key="TEMPLATE_IMAGE_LEFT" description="${uiLabelMap.EcommerceImageLeft}"/> </drop-down> </field> <field name="contentId" position="1"> @@ -458,7 +458,7 @@ <field name="summaryData" title="${uiLabelMap.EcommerceSummary}" use-when=""${summaryDataResourceTypeId}".length()>0" id-name="summaryData"> - <textarea rows="8" cols="80" /> + <textarea rows="8" cols="80"/> </field> <field name="textData" title="${uiLabelMap.ContentText}" id-name="textData"><textarea rows="20" cols="80"/></field> @@ -496,7 +496,7 @@ <form name="AddResponse" target="uploadResponse" title="" type="single" extends="AddContent" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"> <field name="contentIdTo" title="${uiLabelMap.EcommerceInResponseTo}"> - <display description="${contentIdTo}" /> + <display description="${contentIdTo}"/> </field> <field name="ownerContentId" > <hidden value="${currentValue.ownerContentId}"/> @@ -542,7 +542,7 @@ <form name="EditResponse" target="uploadResponse" title="" type="upload" extends="AddContent" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"> <field name="contentIdTo" title="${uiLabelMap.EcommerceInResponseTo}"> - <display description="${contentIdTo}" /> + <display description="${contentIdTo}"/> </field> <field name="ownerContentId" > <hidden value="${currentValue.ownerContentId}"/> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Tue Apr 7 08:27:15 2009 @@ -304,7 +304,7 @@ <widgets> <section> <condition> - <if-compare-field field="responseContentId" operator="equals" to-field="rsp.contentId" /> + <if-compare-field field="responseContentId" operator="equals" to-field="rsp.contentId"/> </condition> <widgets> <container style="responseSelected"> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/ForumForms.xml Tue Apr 7 08:27:15 2009 @@ -33,7 +33,7 @@ <field name="pubPtContentId"><hidden value="${parameters.forumId}"/></field> <field name="contentAssocTypeId"><hidden value="${contentAssoc.contentAssocTypeId}"/></field> <field name="textData" map-name="dummy"> - <textarea rows="10" visual-editor-enable="true" visual-editor-buttons="undo redo bold italic underline bullet indent outdent link" /> + <textarea rows="10" visual-editor-enable="true" visual-editor-buttons="undo redo bold italic underline bullet indent outdent link"/> </field> <field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml Tue Apr 7 08:27:15 2009 @@ -66,7 +66,7 @@ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/> <entity-condition list="forumMessages" entity-name="ContentAssocViewTo" > <condition-list combine="and"> - <condition-expr field-name="contentIdStart" from-field="parameters.forumId" /> + <condition-expr field-name="contentIdStart" from-field="parameters.forumId"/> <condition-list combine="or"> <condition-expr field-name="caContentAssocTypeId" value="PUBLISH_LINK"/> <condition-expr field-name="caContentAssocTypeId" value="RESPONSE"/> @@ -150,7 +150,7 @@ <container> <label style="blogheader">${uiLabelMap.EcommerceBlogMessageTree}:</label> </container> - <include-tree name="ResponseTree" location="component://ecommerce/widget/ForumTrees.xml" /> + <include-tree name="ResponseTree" location="component://ecommerce/widget/ForumTrees.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -543,12 +543,12 @@ <widgets> <section> <condition> - <if-compare-field field="responseContentId" operator="equals" to-field="rsp.contentId" /> + <if-compare-field field="responseContentId" operator="equals" to-field="rsp.contentId"/> </condition> <widgets> <container style="responseSelected"> - <label text="${rsp.contentName}" style="responseheader" /> - <label text=" - ${rsp.description} [${rsp.contentId}]" style="responsetext" /> + <label text="${rsp.contentName}" style="responseheader"/> + <label text=" - ${rsp.description} [${rsp.contentId}]" style="responsetext"/> <link text="${uiLabelMap.CommonView}" target="ViewForumMessage" style="buttontext"> <parameter param-name="forumId" from-field="parameters.forumId"/> <parameter param-name="threadContentId" from-field="parameters.threadContentId"/> @@ -559,8 +559,8 @@ </widgets> <fail-widgets> <container> - <label text="${rsp.contentName}" style="responseheader" /> - <label text=" - ${rsp.description} [${rsp.contentId}]" style="responsetext" /> + <label text="${rsp.contentName}" style="responseheader"/> + <label text=" - ${rsp.description} [${rsp.contentId}]" style="responsetext"/> <link text="${uiLabelMap.CommonView}" target="ViewForumMessage" style="buttontext"> <parameter param-name="forumId" from-field="parameters.forumId"/> <parameter param-name="threadContentId" from-field="parameters.threadContentId"/> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ForumTrees.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ForumTrees.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/ForumTrees.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/ForumTrees.xml Tue Apr 7 08:27:15 2009 @@ -27,16 +27,16 @@ <entity-one entity-name="Content" use-cache="false" value-field="rsp"> <field-map field-name="contentId" from-field="parameters.threadContentId"/> </entity-one> - <include-screen name="responseTreeLine" location="component://ecommerce/widget/ForumScreens.xml" /> + <include-screen name="responseTreeLine" location="component://ecommerce/widget/ForumScreens.xml"/> <sub-node node-name="node-body"> <entity-condition entity-name="ContentAssocViewTo" use-cache="false" > <condition-list combine="and"> - <condition-expr field-name="contentIdStart" operator="equals" from-field="rsp.contentId" /> - <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE" /> - <condition-expr field-name="caFromDate" operator="less-equals" from-field="nowTimestamp" /> + <condition-expr field-name="contentIdStart" operator="equals" from-field="rsp.contentId"/> + <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE"/> + <condition-expr field-name="caFromDate" operator="less-equals" from-field="nowTimestamp"/> <condition-list combine="or"> - <condition-expr field-name="caThruDate" operator="equals" /> - <condition-expr field-name="caThruDate" operator="greater" from-field="nowTimestamp" /> + <condition-expr field-name="caThruDate" operator="equals"/> + <condition-expr field-name="caThruDate" operator="greater" from-field="nowTimestamp"/> </condition-list> </condition-list> <order-by field-name="caFromDate DESC"/> @@ -44,16 +44,16 @@ </sub-node> </node> <node name="node-body" entry-name="rsp"> - <include-screen name="responseTreeLine" location="component://ecommerce/widget/ForumScreens.xml" /> + <include-screen name="responseTreeLine" location="component://ecommerce/widget/ForumScreens.xml"/> <sub-node node-name="node-body"> <entity-condition entity-name="ContentAssocViewTo" use-cache="true" > <condition-list combine="and"> - <condition-expr field-name="contentIdStart" operator="equals" from-field="rsp.contentId" /> - <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE" /> - <condition-expr field-name="caFromDate" operator="less-equals" from-field="nowTimestamp" /> + <condition-expr field-name="contentIdStart" operator="equals" from-field="rsp.contentId"/> + <condition-expr field-name="caContentAssocTypeId" operator="equals" value="RESPONSE"/> + <condition-expr field-name="caFromDate" operator="less-equals" from-field="nowTimestamp"/> <condition-list combine="or"> - <condition-expr field-name="caThruDate" operator="equals" /> - <condition-expr field-name="caThruDate" operator="greater" from-field="nowTimestamp" /> + <condition-expr field-name="caThruDate" operator="equals"/> + <condition-expr field-name="caThruDate" operator="greater" from-field="nowTimestamp"/> </condition-list> </condition-list> <order-by field-name="caFromDate DESC"/> Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalDemoData.xml Tue Apr 7 08:27:15 2009 @@ -26,7 +26,7 @@ <PartyRelationship partyIdFrom="DemoEmployee" roleTypeIdFrom="EMAIL_ADMIN" partyIdTo="Company" roleTypeIdTo="_NA_" fromDate="2000-01-01 00:00:00"/> <!-- incoming customer request examples --> - <CustRequest custRequestId="9000" custRequestDate="2008-07-28 09:45:31.928" custRequestTypeId="RF_SUPPORT" statusId="CRQ_SUBMITTED" fromPartyId="DemoCustomer" priority="9" custRequestName="Customer Request Usage" description="Could you please advise us how to use the customer request facility within ofbiz?" productStoreId="9000" createdDate="2008-07-28 11:45:31.928" createdByUserLogin="admin" lastModifiedDate="2008-07-28 11:45:31.928" lastModifiedByUserLogin="admin" /> + <CustRequest custRequestId="9000" custRequestDate="2008-07-28 09:45:31.928" custRequestTypeId="RF_SUPPORT" statusId="CRQ_SUBMITTED" fromPartyId="DemoCustomer" priority="9" custRequestName="Customer Request Usage" description="Could you please advise us how to use the customer request facility within ofbiz?" productStoreId="9000" createdDate="2008-07-28 11:45:31.928" createdByUserLogin="admin" lastModifiedDate="2008-07-28 11:45:31.928" lastModifiedByUserLogin="admin"/> <CustRequestItem custRequestId="9000" custRequestItemSeqId="00001" story="This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request.This can be the longer story of an item on the customer request."/> <CustRequest custRequestId="9001" custRequestDate="2008-07-21 11:45:31.928" custRequestTypeId="RF_SUPPORT" statusId="CRQ_SUBMITTED" fromPartyId="DemoCustAgent" priority="9" custRequestName="Hardware?" description="Please provide us with the hardware requirements of OFBiz" productStoreId="9000" createdDate="2008-07-28 11:45:31.928" createdByUserLogin="admin" lastModifiedDate="2008-07-28 11:45:31.928" lastModifiedByUserLogin="admin"/> <CustRequest custRequestId="9002" custRequestDate="2008-07-19 18:45:31.928" custRequestTypeId="RF_SUPPORT" statusId="CRQ_SUBMITTED" fromPartyId="DemoCustomer2" priority="9" custRequestName="Customer Same company" description="This will contain a request from the same company?" productStoreId="9000" createdDate="2008-07-28 11:45:31.928" createdByUserLogin="admin" lastModifiedDate="2008-07-28 11:45:31.928" lastModifiedByUserLogin="admin"/> @@ -66,7 +66,7 @@ requireInventory="N" balanceResOnOrderCreation="N" defaultCurrencyUomId="USD" allowPassword="Y" explodeOrderItems="N" checkGcBalance="N" retryFailedAuths="Y" headerApprovedStatus="ORDER_APPROVED" itemApprovedStatus="ITEM_APPROVED" digitalItemApprovedStatus="ITEM_APPROVED" headerDeclinedStatus="ORDER_REJECTED" itemDeclinedStatus="ITEM_REJECTED" headerCancelStatus="ORDER_CANCELLED" itemCancelStatus="ITEM_CANCELLED" usePrimaryEmailUsername="N" requireCustomerRole="N" autoInvoiceDigitalItems="Y" reqShipAddrForDigItems="Y" showCheckoutGiftOptions="Y" selectPaymentTypePerItem="N" showPricesWithVatTax="N" showTaxIsExempt="Y" enableAutoSuggestionList="N" enableDigProdUpload="N" prodSearchExcludeVariants="Y" autoOrderCcTryExp="Y" autoOrderCcTryOtherCards="Y" autoOrderCcTryLaterNsf="Y" autoApproveInvoice="Y" autoApproveOrder="Y" - shipIfCaptureFails="Y" addToCartRemoveIncompat="Y" addToCartReplaceUpsell="Y" splitPayPrefPerShpGrp="Y" /> + shipIfCaptureFails="Y" addToCartRemoveIncompat="Y" addToCartReplaceUpsell="Y" splitPayPrefPerShpGrp="Y"/> <ProductStoreEmailSetting productStoreId="MYPORTAL" emailType="PRDS_CUST_REGISTER" bodyScreenLocation="component://myportal/widget/MyPortalScreens.xml#CreateUserNotification" subject="New Account Created" bccAddress="[hidden email]" fromAddress="[hidden email]"/> Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Tue Apr 7 08:27:15 2009 @@ -30,51 +30,51 @@ <!-- no security group --> <PortalPage portalPageId="MYPORTAL_NONE" sequenceNum="0" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="_NA_"/><!-- user belonging to no portal security group --> - <PortalPage portalPageId="MYPORTAL_EMPLOYEE" sequenceNum="0" portalPageName="Main" description="The OFBiz My Portal Main page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPLOYEE" /> + <PortalPage portalPageId="MYPORTAL_EMPLOYEE" sequenceNum="0" portalPageName="Main" description="The OFBiz My Portal Main page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPLOYEE"/> <PortalPage portalPageId="MYPORTAL_EMPLOYEE1" sequenceNum="100" portalPageName="My Profile" description="The OFBiz My Portal Profile page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/> <PortalPage portalPageId="MYPORTAL_EMPLOYEE2" sequenceNum="200" portalPageName="Other Party Comms" description="The OFBiz My Portal other commmunication page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/> <PortalPage portalPageId="MYPORTAL_EMPLOYEE3" sequenceNum="300" portalPageName="Company Events" description="The OFBiz My Portal Company Events page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/> <PortalPage portalPageId="MYPORTAL_EMPLOYEE4" sequenceNum="400" portalPageName="My Time Sheet" description="The OFBiz My Portal Timesheet page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/> <PortalPage portalPageId="MYPORTAL_EMPLOYEE5" sequenceNum="500" portalPageName="My Tasks" description="The OFBiz My Portal My Task page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPLOYEE"/> - <PortalPage portalPageId="MYPORTAL_EMPL-NOEML" sequenceNum="0" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPL-NOEML" /> + <PortalPage portalPageId="MYPORTAL_EMPL-NOEML" sequenceNum="0" portalPageName="Main" description="The default OFBiz portal page" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_EMPL-NOEML"/> <PortalPage portalPageId="MYPORTAL_EMPL-NOEML1" sequenceNum="100" portalPageName="My Profile" description="The OFBiz My Portal Profile page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/> <PortalPage portalPageId="MYPORTAL_EMPL-NOEML2" sequenceNum="200" portalPageName="Other Party Comms" description="The OFBiz My Portal other commmunication page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/> <PortalPage portalPageId="MYPORTAL_EMPL-NOEML3" sequenceNum="300" portalPageName="Company Events" description="The OFBiz My Portal Company Events page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/> <PortalPage portalPageId="MYPORTAL_EMPL-NOEML4" sequenceNum="400" portalPageName="My Time Sheet" description="The OFBiz My Portal Timesheet page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/> <PortalPage portalPageId="MYPORTAL_EMPL-NOEML5" sequenceNum="500" portalPageName="My Tasks" description="The OFBiz My Portal My Task page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_EMPL-NOEML"/> - <PortalPage portalPageId="MYPORTAL_CUSTOMER" sequenceNum="0" portalPageName="Main" description="The default OFBiz portal page for a customers" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_CUSTOMER" /> - <PortalPage portalPageId="MYPORTAL_CUSTOMER1" sequenceNum="100" portalPageName="My Profile" description="The OFBiz My Portal Profile page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER" /> - <PortalPage portalPageId="MYPORTAL_CUSTOMER2" sequenceNum="200" portalPageName="Invoices" description="The OFBiz My Portal Invoices page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER" /> - <PortalPage portalPageId="MYPORTAL_CUSTOMER3" sequenceNum="300" portalPageName="Projects" description="The OFBiz My Portal Project page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER" /> - - <PortalPageColumn portalPageId="MYPORTAL_NONE" columnSeqId="00001" /> - <PortalPageColumn portalPageId="MYPORTAL_NONE" columnSeqId="00002" columnWidthPercentage="50" /> - - <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE" columnSeqId="00001" /> - <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE1" columnSeqId="00001" columnWidthPercentage="50" /> - <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE1" columnSeqId="00002" columnWidthPercentage="50" /> - <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE2" columnSeqId="00001" /> - <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE3" columnSeqId="00001" /> - <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE4" columnSeqId="00001" /> - <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE5" columnSeqId="00001" /> - - <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML" columnSeqId="00001" /> - <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML1" columnSeqId="00001" columnWidthPercentage="50" /> - <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML1" columnSeqId="00002" columnWidthPercentage="50" /> - <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML2" columnSeqId="00001" /> - <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML3" columnSeqId="00001" /> - <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML4" columnSeqId="00001" /> - <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML5" columnSeqId="00001" /> - - <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER" columnSeqId="00001" /> - <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER1" columnSeqId="00001" columnWidthPercentage="50" /> - <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER1" columnSeqId="00002" columnWidthPercentage="50" /> - <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER2" columnSeqId="00001" /> - <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER3" columnSeqId="00001" /> + <PortalPage portalPageId="MYPORTAL_CUSTOMER" sequenceNum="0" portalPageName="Main" description="The default OFBiz portal page for a customers" ownerUserLoginId="_NA_" securityGroupId="MYPORTAL_CUSTOMER"/> + <PortalPage portalPageId="MYPORTAL_CUSTOMER1" sequenceNum="100" portalPageName="My Profile" description="The OFBiz My Portal Profile page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER"/> + <PortalPage portalPageId="MYPORTAL_CUSTOMER2" sequenceNum="200" portalPageName="Invoices" description="The OFBiz My Portal Invoices page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER"/> + <PortalPage portalPageId="MYPORTAL_CUSTOMER3" sequenceNum="300" portalPageName="Projects" description="The OFBiz My Portal Project page" ownerUserLoginId="_NA_" parentPortalPageId="MYPORTAL_CUSTOMER"/> + + <PortalPageColumn portalPageId="MYPORTAL_NONE" columnSeqId="00001"/> + <PortalPageColumn portalPageId="MYPORTAL_NONE" columnSeqId="00002" columnWidthPercentage="50"/> + + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE" columnSeqId="00001"/> + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE1" columnSeqId="00001" columnWidthPercentage="50"/> + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE1" columnSeqId="00002" columnWidthPercentage="50"/> + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE2" columnSeqId="00001"/> + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE3" columnSeqId="00001"/> + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE4" columnSeqId="00001"/> + <PortalPageColumn portalPageId="MYPORTAL_EMPLOYEE5" columnSeqId="00001"/> + + <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML" columnSeqId="00001"/> + <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML1" columnSeqId="00001" columnWidthPercentage="50"/> + <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML1" columnSeqId="00002" columnWidthPercentage="50"/> + <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML2" columnSeqId="00001"/> + <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML3" columnSeqId="00001"/> + <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML4" columnSeqId="00001"/> + <PortalPageColumn portalPageId="MYPORTAL_EMPL-NOEML5" columnSeqId="00001"/> + + <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER" columnSeqId="00001"/> + <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER1" columnSeqId="00001" columnWidthPercentage="50"/> + <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER1" columnSeqId="00002" columnWidthPercentage="50"/> + <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER2" columnSeqId="00001"/> + <PortalPageColumn portalPageId="MYPORTAL_CUSTOMER3" columnSeqId="00001"/> - <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0" /> + <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/> <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="5"/> <PortalPagePortlet portalPageId="MYPORTAL_NONE" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" sequenceNum="8"/> @@ -85,7 +85,7 @@ <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="0"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" sequenceNum="1"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="LoyaltyPoints" portletSeqId="00001" columnSeqId="00001" sequenceNum="2"/> - <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="3" /> + <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="3"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="AvsSettings" portletSeqId="00001" columnSeqId="00001" sequenceNum="4"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="5"/> <PortalPagePortlet portalPageId="MYPORTAL_EMPLOYEE1" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" sequenceNum="6"/> @@ -121,13 +121,13 @@ <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" columnSeqId="00001" sequenceNum="2"/> <PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" attrName="statusGroup" attrValue="COMPLETED"/> <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" columnSeqId="00001" sequenceNum="2"/> - <PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" attrName="statusGroup" attrValue="OPEN" /> - <PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" attrName="otherContacts" attrValue="Y" /> + <PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" attrName="statusGroup" attrValue="OPEN"/> + <PortletAttribute portalPageId="MYPORTAL_CUSTOMER" portalPortletId="ListCustRequests" portletSeqId="00002" attrName="otherContacts" attrValue="Y"/> <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER" portalPortletId="MyCommunications" portletSeqId="00001" columnSeqId="00001" sequenceNum="4"/> <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="party" portletSeqId="00001" columnSeqId="00001" sequenceNum="6"/> <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="contact" portletSeqId="00001" columnSeqId="00001" sequenceNum="8"/> <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="PaymentMethods" portletSeqId="00001" columnSeqId="00001" sequenceNum="10"/> - <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="3" /> + <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="UserLogin" portletSeqId="00001" columnSeqId="00002" sequenceNum="3"/> <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Attributes" portletSeqId="00001" columnSeqId="00002" sequenceNum="4"/> <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Visits" portletSeqId="00001" columnSeqId="00002" sequenceNum="5"/> <PortalPagePortlet portalPageId="MYPORTAL_CUSTOMER1" portalPortletId="Content" portletSeqId="00001" columnSeqId="00002" sequenceNum="6"/> @@ -139,6 +139,6 @@ <PortletPortletCategory portalPortletId="ListCustomerProjects" portletCategoryId="LIST_CUSTOMER"/> <PortletPortletCategory portalPortletId="ListCustomerInvoices" portletCategoryId="LIST_CUSTOMER"/> - <WebSite webSiteId="MYPORTAL" siteName="My Portal" visualThemeSetId="BACKOFFICE" /> + <WebSite webSiteId="MYPORTAL" siteName="My Portal" visualThemeSetId="BACKOFFICE"/> </entity-engine-xml> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Tue Apr 7 08:27:15 2009 @@ -131,7 +131,7 @@ </call-service> <set-current-user-login value-field="createdUserLogin"/> <else> - <set field="errorMessage" value="Username in use, please choose another." /> + <set field="errorMessage" value="Username in use, please choose another."/> <field-to-list field="errorMessage" list="error_list"/> <check-errors error-list-name="error_list" error-code="resultPage"/> </else> Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml Tue Apr 7 08:27:15 2009 @@ -97,9 +97,9 @@ <result-to-field result-name="emailAddress" field="emailParams.sendTo"/> </call-service> <entity-and list="webSites" entity-name="WebSite"> - <field-map field-name="productStoreId" from-field="storeEmail.productStoreId" /> + <field-map field-name="productStoreId" from-field="storeEmail.productStoreId"/> </entity-and> - <first-from-list entry="webSite" list="webSites" /> + <first-from-list entry="webSite" list="webSites"/> <entity-one entity-name="UserLogin" value-field="userLoginSystem"> <field-map field-name="userLoginId" value="system"/> </entity-one> Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Tue Apr 7 08:27:15 2009 @@ -223,7 +223,7 @@ location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <include-screen name="MyCompanyComms" - location="component://myportal/widget/MyPortalScreens.xml" /> + location="component://myportal/widget/MyPortalScreens.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -250,7 +250,7 @@ location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <include-screen name="MyCommunications" - location="component://myportal/widget/MyPortalScreens.xml" /> + location="component://myportal/widget/MyPortalScreens.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -262,7 +262,7 @@ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-screen name="MyTasks" location="component://myportal/widget/MyPortalScreens.xml" /> + <include-screen name="MyTasks" location="component://myportal/widget/MyPortalScreens.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -275,7 +275,7 @@ location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <include-screen name="OtherCommunications" - location="component://myportal/widget/MyPortalScreens.xml" /> + location="component://myportal/widget/MyPortalScreens.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml?rev=762648&r1=762647&r2=762648&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml (original) +++ ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml Tue Apr 7 08:27:15 2009 @@ -23,7 +23,7 @@ <simple-method method-name="createOagisMessageInfo" short-description="Create MessageInfo"> <make-value entity-name="OagisMessageInfo" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity" /> + <set-pk-fields map="parameters" value-field="newEntity"/> <!-- make sure it doesn't already exist: motivation: if it already exists we'll get a HUGE error message on the create with the whole XML file in it if debug is on for that, so we want a smaller error message --> <find-by-primary-key map="newEntity" value-field="currentOagisMessageInfo"/> @@ -48,7 +48,7 @@ <simple-method method-name="createOagisMessageErrorInfo" short-description="Create MessageErrorInfo"> <make-value entity-name="OagisMessageErrorInfo" value-field="newEntity"/> - <set-pk-fields map="parameters" value-field="newEntity" /> + <set-pk-fields map="parameters" value-field="newEntity"/> <make-next-seq-id value-field="newEntity" seq-field-name="errorSeqId"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <create-value value-field="newEntity"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |