1st part of an effort to remove trailing spaces

" +/> => "/>
Should be easier when dealing with Eclipse S/R regexp

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@762648 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jacques Le Roux
2009-04-07 08:27:15 +00:00
parent f9326c0ead
commit 08ae117fe5
34 changed files with 285 additions and 285 deletions
+1 -1
View File
@@ -18,5 +18,5 @@ specific language governing permissions and limitations
under the License.
-->
<entity-engine-xml>
<WebSite webSiteId="ASSETMAINT" siteName="Asset Maintenance Application" visualThemeSetId="BACKOFFICE" />
<WebSite webSiteId="ASSETMAINT" siteName="Asset Maintenance Application" visualThemeSetId="BACKOFFICE"/>
</entity-engine-xml>
+1 -1
View File
@@ -74,7 +74,7 @@
<include-form name="FindFixedAssetMaint" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
<include-form name="ListFixedAssetMaints" location="component://assetmaint/widget/forms/FixedAssetForms.xml" />
<include-form name="ListFixedAssetMaints" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
+2 -2
View File
@@ -36,10 +36,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
<include-form name="lookupProduct" location="component://assetmaint/widget/forms/ProductForms.xml" />
<include-form name="lookupProduct" location="component://assetmaint/widget/forms/ProductForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
<include-form name="listLookupProduct" location="component://assetmaint/widget/forms/ProductForms.xml" />
<include-form name="listLookupProduct" location="component://assetmaint/widget/forms/ProductForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
+1 -1
View File
@@ -23,7 +23,7 @@
<!-- Person Lookup forms -->
<form name="lookupPerson" target="LookupPerson" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<!--<auto-fields-entity entity-name="Person" default-field-type="find" />-->
<!--<auto-fields-entity entity-name="Person" default-field-type="find"/>-->
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
<field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
<field name="lastName" title="${uiLabelMap.PartyLastName}"><text-find/></field>
+1 -1
View File
@@ -80,7 +80,7 @@
</form>
<form name="lookupProduct" target="${submitTarget}" type="single"
header-row-style="header-row" default-table-style="basic-table">
<!-- <auto-fields-entity entity-name="Product" default-field-type="hidden" /> -->
<!-- <auto-fields-entity entity-name="Product" default-field-type="hidden"/> -->
<field name="productId" title="${uiLabelMap.CommonId}"><text-find default-option="contains" ignore-case="true"/></field>
<field name="brandName" title="${uiLabelMap.ProductBrandName}"><text-find default-option="contains" ignore-case="true"/></field>
<field name="internalName" title="${uiLabelMap.ProductInternalName}"><text-find default-option="contains" ignore-case="true"/></field>
+4 -4
View File
@@ -36,10 +36,10 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
<include-form name="LookupComputerHardware" location="component://assetmaint/widget/ismgr/FieldLookupForms.xml" />
<include-form name="LookupComputerHardware" location="component://assetmaint/widget/ismgr/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
<include-form name="ListLookupComputerHardware" location="component://assetmaint/widget/ismgr/FieldLookupForms.xml" />
<include-form name="ListLookupComputerHardware" location="component://assetmaint/widget/ismgr/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -61,10 +61,10 @@ under the License.
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
<include-form name="LookupComputerSoftware" location="component://assetmaint/widget/ismgr/FieldLookupForms.xml" />
<include-form name="LookupComputerSoftware" location="component://assetmaint/widget/ismgr/FieldLookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
<include-form name="ListLookupComputerSoftware" location="component://assetmaint/widget/ismgr/FieldLookupForms.xml" />
<include-form name="ListLookupComputerSoftware" location="component://assetmaint/widget/ismgr/FieldLookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
+2 -2
View File
@@ -267,7 +267,7 @@ under the License.
<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 @@ under the License.
<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"/>
@@ -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"/>
+4 -4
View File
@@ -29,8 +29,8 @@ under the License.
<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 @@ under the License.
<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"/>
+3 -3
View File
@@ -29,7 +29,7 @@ under the License.
<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 @@ under the License.
<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 @@ under the License.
<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"/>
@@ -470,13 +470,13 @@ under the License.
}
]]></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 @@ under the License.
]]></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>
@@ -29,13 +29,13 @@ under the License.
<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 @@ under the License.
</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 @@ under the License.
<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 @@ under the License.
</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 @@ under the License.
<!-- 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 @@ under the License.
<!-- 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 @@ under the License.
</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 @@ under the License.
</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 @@ under the License.
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 @@ under the License.
<!-- 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 @@ under the License.
</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 @@ under the License.
}
]]></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 @@ under the License.
]]></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 @@ under the License.
</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>
+34 -34
View File
@@ -27,19 +27,19 @@ under the License.
</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 @@ under the License.
<field name="summaryData" title="${uiLabelMap.EcommerceSummary}"
use-when="&quot;${summaryDataResourceTypeId}&quot;.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 @@ under the License.
<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 @@ under the License.
</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 @@ under the License.
<field name="summaryData" title="${uiLabelMap.EcommerceSummary}"
use-when="&quot;${summaryDataResourceTypeId}&quot;.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 @@ under the License.
<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 @@ under the License.
</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 @@ under the License.
<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 @@ under the License.
<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 @@ under the License.
</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 @@ under the License.
<field name="summaryData" title="${uiLabelMap.EcommerceSummary}"
use-when="&quot;${summaryDataResourceTypeId}&quot;.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 @@ under the License.
<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 @@ under the License.
<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}"/>
+1 -1
View File
@@ -304,7 +304,7 @@ under the License.
<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">
+1 -1
View File
@@ -33,7 +33,7 @@ under the License.
<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>
+7 -7
View File
@@ -66,7 +66,7 @@ under the License.
<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 @@ under the License.
<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 @@ under the License.
<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 @@ under the License.
</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"/>
+12 -12
View File
@@ -27,16 +27,16 @@ under the License.
<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 @@ under the License.
</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"/>
+2 -2
View File
@@ -26,7 +26,7 @@ under the License.
<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 @@ under the License.
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="ofbiztest@yahoo.com" fromAddress="ofbiztest@yahoo.com"/>
+33 -33
View File
@@ -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" />
<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_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_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_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" />
<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>
@@ -131,7 +131,7 @@ under the License.
</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>
@@ -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>
+4 -4
View File
@@ -223,7 +223,7 @@ under the License.
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 @@ under the License.
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 @@ under the License.
<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 @@ under the License.
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>
@@ -23,7 +23,7 @@ under the License.
<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 @@ under the License.
<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"/>
+23 -23
View File
@@ -98,56 +98,56 @@
<!-- TO DO
<request-map uri="UploadOagisMessage">
<security https="true" auth="true" />
<response name="success" type="view" value="UploadOagisMessage" />
<security https="true" auth="true"/>
<response name="success" type="view" value="UploadOagisMessage"/>
</request-map>
<request-map uri="importConfirmBODOagisMessage">
<security https="true" auth="true" />
<event type="service" path="" invoke="importConfirmBOD" />
<response name="success" type="view" value="UploadOagisMessage" />
<security https="true" auth="true"/>
<event type="service" path="" invoke="importConfirmBOD"/>
<response name="success" type="view" value="UploadOagisMessage"/>
<response name="error" type="view" value="UploadOagisMessage"/>
</request-map>
<request-map uri="importSyncInventoryOagisMessage">
<security https="true" auth="true" />
<event type="service" path="" invoke="importConfirmBOD" />
<response name="success" type="view" value="UploadOagisMessage" />
<security https="true" auth="true"/>
<event type="service" path="" invoke="importConfirmBOD"/>
<response name="success" type="view" value="UploadOagisMessage"/>
<response name="error" type="view" value="UploadOagisMessage"/>
</request-map>
<request-map uri="importAcknowledgementDeliveryOagisMessage">
<security https="true" auth="true" />
<event type="service" path="" invoke="importConfirmBOD" />
<response name="success" type="view" value="UploadOagisMessage" />
<security https="true" auth="true"/>
<event type="service" path="" invoke="importConfirmBOD"/>
<response name="success" type="view" value="UploadOagisMessage"/>
<response name="error" type="view" value="UploadOagisMessage"/>
</request-map>
<request-map uri="importProcessShipmentOagisMessage">
<security https="true" auth="true" />
<event type="service" path="" invoke="importConfirmBOD" />
<response name="success" type="view" value="UploadOagisMessage" />
<security https="true" auth="true"/>
<event type="service" path="" invoke="importConfirmBOD"/>
<response name="success" type="view" value="UploadOagisMessage"/>
<response name="error" type="view" value="UploadOagisMessage"/>
</request-map>
<request-map uri="importShowShipmentOagisMessage">
<security https="true" auth="true" />
<event type="service" path="" invoke="importConfirmBOD" />
<response name="success" type="view" value="UploadOagisMessage" />
<security https="true" auth="true"/>
<event type="service" path="" invoke="importConfirmBOD"/>
<response name="success" type="view" value="UploadOagisMessage"/>
<response name="error" type="view" value="UploadOagisMessage"/>
</request-map>
<request-map uri="importAcknowledgementDeliveryOagisMessage">
<security https="true" auth="true" />
<event type="service" path="" invoke="importConfirmBOD" />
<response name="success" type="view" value="UploadOagisMessage" />
<security https="true" auth="true"/>
<event type="service" path="" invoke="importConfirmBOD"/>
<response name="success" type="view" value="UploadOagisMessage"/>
<response name="error" type="view" value="UploadOagisMessage"/>
</request-map>
<request-map uri="importReceiveDeliveryOagisMessage">
<security https="true" auth="true" />
<event type="service" path="" invoke="importConfirmBOD" />
<response name="success" type="view" value="UploadOagisMessage" />
<security https="true" auth="true"/>
<event type="service" path="" invoke="importConfirmBOD"/>
<response name="success" type="view" value="UploadOagisMessage"/>
<response name="error" type="view" value="UploadOagisMessage"/>
</request-map>
-->
+45 -45
View File
@@ -5,86 +5,86 @@
<!-- user 'admin' has full access and can create projects, add resources etc. -->
<!-- Demo Employee is an employee with no access to any projects-->
<Party partyId="DemoEmployee" partyTypeId="PERSON" statusId="PARTY_ENABLED" />
<Person partyId="DemoEmployee" firstName="Demo" lastName="Employee" />
<Party partyId="DemoEmployee" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="DemoEmployee" firstName="Demo" lastName="Employee"/>
<UserLogin userLoginId="DemoEmployee" partyId="DemoEmployee"/>
<PartyRole partyId="DemoEmployee" roleTypeId="EMPLOYEE"/>
<PartyRole partyId="DemoEmployee" roleTypeId="PROVIDER_ANALYST"/>
<PartyContactMech partyId="DemoEmployee" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
<PartyContactMech partyId="DemoEmployee" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
<PartyContactMech partyId="DemoEmployee" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
<PartyContactMech partyId="DemoEmployee" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
<PartyContactMech partyId="DemoEmployee" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
<PartyContactMech partyId="DemoEmployee" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
<PartyRole partyId="DemoEmployee" roleTypeId="PROJECT_TEAM"/>
<UserLoginSecurityGroup groupId="PROJECTADMIN" userLoginId="DemoEmployee" fromDate="2000-01-01 00:00:00.0"/>
<!-- Demo Employee1 manager is a projectmanager of both projects and can can maintain data within the project-->
<Party partyId="DemoEmployee1" partyTypeId="PERSON" statusId="PARTY_ENABLED" />
<Person partyId="DemoEmployee1" firstName="Peter" lastName="Manager" />
<Party partyId="DemoEmployee1" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="DemoEmployee1" firstName="Peter" lastName="Manager"/>
<UserLogin userLoginId="DemoEmployee1" partyId="DemoEmployee1"/>
<PartyRole partyId="DemoEmployee1" roleTypeId="EMPLOYEE"/>
<PartyRole partyId="DemoEmployee1" roleTypeId="PROVIDER_MANAGER"/>
<PartyContactMech partyId="DemoEmployee1" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
<PartyContactMech partyId="DemoEmployee1" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
<PartyContactMech partyId="DemoEmployee1" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
<PartyContactMech partyId="DemoEmployee1" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
<PartyContactMech partyId="DemoEmployee1" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
<PartyContactMech partyId="DemoEmployee1" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
<PartyRole partyId="DemoEmployee1" roleTypeId="PROJECT_TEAM"/>
<UserLoginSecurityGroup groupId="PROJECTADMIN" userLoginId="DemoEmployee1" fromDate="2000-01-01 00:00:00.0"/>
<!-- Demo Employee2 analist of project 1 can register time, accept and assign tasks withn his project 1 only-->
<Party partyId="DemoEmployee2" partyTypeId="PERSON" statusId="PARTY_ENABLED" />
<Person partyId="DemoEmployee2" firstName="Jo" lastName="Analist1" />
<Party partyId="DemoEmployee2" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="DemoEmployee2" firstName="Jo" lastName="Analist1"/>
<UserLogin userLoginId="DemoEmployee2" partyId="DemoEmployee2"/>
<PartyRole partyId="DemoEmployee2" roleTypeId="PROVIDER_ANALYST"/>
<PartyRole partyId="DemoEmployee2" roleTypeId="EMPLOYEE"/>
<PartyContactMech partyId="DemoEmployee2" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
<PartyContactMech partyId="DemoEmployee2" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
<PartyContactMech partyId="DemoEmployee2" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
<PartyContactMech partyId="DemoEmployee2" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
<PartyContactMech partyId="DemoEmployee2" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
<PartyContactMech partyId="DemoEmployee2" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
<PartyRole partyId="DemoEmployee2" roleTypeId="PROJECT_TEAM"/>
<UserLoginSecurityGroup groupId="PROJECTUSER" userLoginId="DemoEmployee2" fromDate="2000-01-01 00:00:00.0"/>
<!-- Demo Employee3 analist of project 2 can register time, accept and assign tasks withn his project 2 only-->
<Party partyId="DemoEmployee3" partyTypeId="PERSON" statusId="PARTY_ENABLED" />
<Person partyId="DemoEmployee3" firstName="Tom" lastName="Analist2" />
<Party partyId="DemoEmployee3" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="DemoEmployee3" firstName="Tom" lastName="Analist2"/>
<UserLogin userLoginId="DemoEmployee3" partyId="DemoEmployee3"/>
<PartyRole partyId="DemoEmployee3" roleTypeId="PROVIDER_ANALYST"/>
<PartyRole partyId="DemoEmployee3" roleTypeId="EMPLOYEE"/>
<PartyContactMech partyId="DemoEmployee3" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
<PartyContactMech partyId="DemoEmployee3" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
<PartyContactMech partyId="DemoEmployee3" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE" />
<PartyContactMech partyId="DemoEmployee3" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
<PartyContactMech partyId="DemoEmployee3" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
<PartyContactMech partyId="DemoEmployee3" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="EMPLOYEE"/>
<PartyRole partyId="DemoEmployee3" roleTypeId="PROJECT_TEAM"/>
<UserLoginSecurityGroup groupId="PROJECTUSER" userLoginId="DemoEmployee3" fromDate="2000-01-01 00:00:00.0"/>
<!-- Demo Customer1 client for demo project 1 has access to project 1 only-->
<Party partyId="DemoCustomer1" partyTypeId="PERSON" statusId="PARTY_ENABLED" />
<Person partyId="DemoCustomer1" firstName="ManagerP1" lastName="Customer 1" />
<Party partyId="DemoCustomer1" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="DemoCustomer1" firstName="ManagerP1" lastName="Customer 1"/>
<UserLogin userLoginId="DemoCustomer1" partyId="DemoCustomer1"/>
<PartyRole partyId="DemoCustomer1" roleTypeId="CUSTOMER"/>
<PartyRole partyId="DemoCustomer1" roleTypeId="CLIENT_MANAGER"/>
<PartyContactMech partyId="DemoCustomer1" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
<PartyContactMech partyId="DemoCustomer1" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
<PartyContactMech partyId="DemoCustomer1" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
<PartyContactMech partyId="DemoCustomer1" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
<PartyContactMech partyId="DemoCustomer1" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
<PartyContactMech partyId="DemoCustomer1" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
<PartyRole partyId="DemoCustomer1" roleTypeId="PROJECT_TEAM"/>
<UserLoginSecurityGroup groupId="PROJECTUSER" userLoginId="DemoCustomer1" fromDate="2000-01-01 00:00:00.0"/>
<!-- Demo Customer2 client for demo project 2 has access to project 2 only-->
<Party partyId="DemoCustomer2" partyTypeId="PERSON" statusId="PARTY_ENABLED" />
<Party partyId="DemoCustomer2" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="DemoCustomer2" firstName="ManagerP2" lastName="Customer 2"/>
<UserLogin userLoginId="DemoCustomer2" partyId="DemoCustomer2"/>
<PartyRole partyId="DemoCustomer2" roleTypeId="CUSTOMER"/>
<PartyRole partyId="DemoCustomer2" roleTypeId="CLIENT_MANAGER"/>
<PartyContactMech partyId="DemoCustomer2" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
<PartyContactMech partyId="DemoCustomer2" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
<PartyContactMech partyId="DemoCustomer2" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
<PartyContactMech partyId="DemoCustomer2" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
<PartyContactMech partyId="DemoCustomer2" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
<PartyContactMech partyId="DemoCustomer2" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
<PartyRole partyId="DemoCustomer2" roleTypeId="PROJECT_TEAM"/>
<UserLoginSecurityGroup groupId="PROJECTUSER" userLoginId="DemoCustomer2" fromDate="2000-01-01 00:00:00.0"/>
<!-- Demo Customer3 billing for demo project 1 and project 2 -->
<Party partyId="DemoCustomer3" partyTypeId="PERSON" statusId="PARTY_ENABLED" />
<Party partyId="DemoCustomer3" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="DemoCustomer3" firstName="Billing" lastName="Customer 2"/>
<UserLogin userLoginId="DemoCustomer3" partyId="DemoCustomer3"/>
<PartyRole partyId="DemoCustomer3" roleTypeId="CUSTOMER"/>
<PartyRole partyId="DemoCustomer3" roleTypeId="CLIENT_BILLING"/>
<PartyContactMech partyId="DemoCustomer3" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
<PartyContactMech partyId="DemoCustomer3" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
<PartyContactMech partyId="DemoCustomer3" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER" />
<PartyContactMech partyId="DemoCustomer3" contactMechId="9020" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
<PartyContactMech partyId="DemoCustomer3" contactMechId="9001" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
<PartyContactMech partyId="DemoCustomer3" contactMechId="9023" fromDate="2000-01-01 10:01:48.933" roleTypeId="CUSTOMER"/>
<PartyRole partyId="DemoCustomer3" roleTypeId="PROJECT_TEAM"/>
<UserLoginSecurityGroup groupId="PROJECTUSER" userLoginId="DemoCustomer3" fromDate="2000-01-01 00:00:00.0"/>
@@ -102,16 +102,16 @@
<!-- First Demo project from customer 1 and employee 1,2-->
<WorkEffort workEffortId="9000" workEffortTypeId="PROJECT" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 15:07:52.901" scopeEnumId="WES_PUBLIC" workEffortName="Demo Project1 Cust1" revisionNumber="1"/>
<WorkEffortPartyAssignment workEffortId="9000" partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2009-04-05 20:27:52.818" />
<WorkEffortPartyAssignment workEffortId="9000" partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2009-04-05 20:27:52.818"/>
<WorkEffortPartyAssignment workEffortId="9000" partyId="admin" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
<WorkEffortPartyAssignment workEffortId="9000" partyId="DemoCustomer1" statusId="PAS_ASSIGNED" roleTypeId="CLIENT_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
<WorkEffortPartyAssignment workEffortId="9000" partyId="DemoCustomer3" statusId="PAS_ASSIGNED" roleTypeId="CLIENT_BILLING" fromDate="2007-12-14 16:45:21.831"/>
<WorkEffortPartyAssignment workEffortId="9000" partyId="DemoEmployee1" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
<WorkEffortPartyAssignment workEffortId="9000" partyId="DemoEmployee2" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_ANALYST" fromDate="2007-12-14 16:45:21.831"/>
<WorkEffort workEffortId="9001" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:14.226" workEffortParentId="9000" workEffortName="phase1" revisionNumber="1" />
<WorkEffort workEffortId="9002" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9001" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1" />
<WorkEffort workEffortId="9001" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:14.226" workEffortParentId="9000" workEffortName="phase1" revisionNumber="1"/>
<WorkEffort workEffortId="9002" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9001" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1"/>
<WorkEffortSkillStandard workEffortId="9002" skillTypeId="9000" estimatedDuration="16.0"/>
<WorkEffort workEffortId="9003" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:29.453" workEffortParentId="9001" scopeEnumId="WES_PUBLIC" workEffortName="task2" estimatedStartDate="2007-12-05 00:00:00.0" estimatedCompletionDate="2007-12-16 00:00:00.0" revisionNumber="1" />
<WorkEffort workEffortId="9003" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:29.453" workEffortParentId="9001" scopeEnumId="WES_PUBLIC" workEffortName="task2" estimatedStartDate="2007-12-05 00:00:00.0" estimatedCompletionDate="2007-12-16 00:00:00.0" revisionNumber="1"/>
<WorkEffortSkillStandard workEffortId="9003" skillTypeId="9000" estimatedDuration="24.0"/>
<WorkEffort workEffortId="9004" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:35.939" workEffortParentId="9000" workEffortName="phase2" revisionNumber="1"/>
<WorkEffort workEffortId="9005" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:50.84" workEffortParentId="9004" scopeEnumId="WES_PUBLIC" workEffortName="task3" estimatedStartDate="2007-12-16 00:00:00.0" estimatedCompletionDate="2007-12-17 00:00:00.0" revisionNumber="1"/>
@@ -127,15 +127,15 @@
<!-- Second Demo project for customer 2 and employee 1,3-->
<WorkEffort workEffortId="9100" workEffortTypeId="PROJECT" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 15:07:52.911" scopeEnumId="WES_PUBLIC" workEffortName="Demo Project2 Cust 2" revisionNumber="1"/>
<WorkEffortPartyAssignment workEffortId="9100" partyId="admin" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
<WorkEffortPartyAssignment workEffortId="9100" partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2009-04-05 20:27:52.818" />
<WorkEffortPartyAssignment workEffortId="9100" partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2009-04-05 20:27:52.818"/>
<WorkEffortPartyAssignment workEffortId="9100" partyId="DemoCustomer2" statusId="PAS_ASSIGNED" roleTypeId="CLIENT_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
<WorkEffortPartyAssignment workEffortId="9100" partyId="DemoCustomer3" statusId="PAS_ASSIGNED" roleTypeId="CLIENT_BILLING" fromDate="2007-12-14 16:45:21.831"/>
<WorkEffortPartyAssignment workEffortId="9100" partyId="DemoEmployee1" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
<WorkEffortPartyAssignment workEffortId="9100" partyId="DemoEmployee3" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_ANALYST" fromDate="2007-12-14 16:45:21.831"/>
<WorkEffort workEffortId="9101" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:14.226" workEffortParentId="9100" workEffortName="phase1" revisionNumber="1" />
<WorkEffort workEffortId="9102" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9101" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1" />
<WorkEffort workEffortId="9101" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:14.226" workEffortParentId="9100" workEffortName="phase1" revisionNumber="1"/>
<WorkEffort workEffortId="9102" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9101" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1"/>
<WorkEffortSkillStandard workEffortId="9102" skillTypeId="9000" estimatedDuration="16.0"/>
<WorkEffort workEffortId="9103" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:29.453" workEffortParentId="9101" scopeEnumId="WES_PUBLIC" workEffortName="task2" estimatedStartDate="2007-12-05 00:00:00.0" estimatedCompletionDate="2007-12-16 00:00:00.0" revisionNumber="1" />
<WorkEffort workEffortId="9103" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:29.453" workEffortParentId="9101" scopeEnumId="WES_PUBLIC" workEffortName="task2" estimatedStartDate="2007-12-05 00:00:00.0" estimatedCompletionDate="2007-12-16 00:00:00.0" revisionNumber="1"/>
<WorkEffortSkillStandard workEffortId="9103" skillTypeId="9000" estimatedDuration="24.0"/>
<WorkEffort workEffortId="9104" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:35.939" workEffortParentId="9100" workEffortName="phase2" revisionNumber="1"/>
<WorkEffort workEffortId="9105" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:50.84" workEffortParentId="9104" scopeEnumId="WES_PUBLIC" workEffortName="task3" estimatedStartDate="2007-12-16 00:00:00.0" estimatedCompletionDate="2007-12-17 00:00:00.0" revisionNumber="1"/>
@@ -150,12 +150,12 @@
<!-- Another Demo project for DemoCustomeCompanyr and employee 1,3-->
<WorkEffort workEffortId="9200" workEffortTypeId="PROJECT" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 15:07:52.911" scopeEnumId="WES_PUBLIC" workEffortName="Demo Project3 DemoCustomerCompany" revisionNumber="1"/>
<WorkEffortPartyAssignment workEffortId="9200" partyId="DemoEmployee3" roleTypeId="PROVIDER_ANALYST" fromDate="2007-12-14 16:45:21.831" statusId="PAS_ASSIGNED" />
<WorkEffortPartyAssignment workEffortId="9200" partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2009-04-05 20:27:52.818" />
<WorkEffortPartyAssignment workEffortId="9200" partyId="DemoEmployee3" roleTypeId="PROVIDER_ANALYST" fromDate="2007-12-14 16:45:21.831" statusId="PAS_ASSIGNED"/>
<WorkEffortPartyAssignment workEffortId="9200" partyId="Company" roleTypeId="INTERNAL_ORGANIZATIO" fromDate="2009-04-05 20:27:52.818"/>
<WorkEffortPartyAssignment workEffortId="9200" partyId="DemoCustCompany" roleTypeId="CLIENT_BILLING" fromDate="2009-04-05 20:27:52.893"/>
<WorkEffortPartyAssignment workEffortId="9200" partyId="DemoEmployee1" statusId="PAS_ASSIGNED" roleTypeId="PROVIDER_MANAGER" fromDate="2007-12-14 16:45:21.831"/>
<WorkEffort workEffortId="9201" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:14.226" workEffortParentId="9200" workEffortName="phase1" revisionNumber="1" />
<WorkEffort workEffortId="9202" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9201" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1" />
<WorkEffort workEffortId="9201" workEffortTypeId="PHASE" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 16:45:14.226" workEffortParentId="9200" workEffortName="phase1" revisionNumber="1"/>
<WorkEffort workEffortId="9202" workEffortTypeId="TASK" currentStatusId="PTS_CREATED" lastStatusUpdate="2007-12-14 16:45:21.831" workEffortParentId="9201" scopeEnumId="WES_PUBLIC" workEffortName="task1" estimatedStartDate="2007-12-03 00:00:00.0" estimatedCompletionDate="2007-12-05 00:00:00.0" revisionNumber="1"/>
<WorkEffortSkillStandard workEffortId="9202" skillTypeId="9000" estimatedDuration="16.0"/>
+3 -3
View File
@@ -24,7 +24,7 @@
portletName="My Timesheet"
screenName="CurrentTimesheet"
screenLocation="component://projectmgr/widget/TimeSheetScreens.xml"
description="My Current Timesheet" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
description="My Current Timesheet" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW"/>
<PortletPortletCategory portalPortletId="mytimesheet" portletCategoryId="PROJECTMANAGER"/>
<PortalPortlet
@@ -32,14 +32,14 @@
portletName="MyTasks"
screenName="MyTaskList"
screenLocation="component://projectmgr/widget/TaskScreens.xml"
description="My Tasks from the Project Manager" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
description="My Tasks from the Project Manager" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW"/>
<PortletPortletCategory portalPortletId="mytasks" portletCategoryId="PROJECTMANAGER"/>
<PortalPortlet portalPortletId="ListCustomerProjects"
portletName="List Customer Projects"
screenName="ListCustomerProjects"
screenLocation="component://projectmgr/widget/ProjectScreens.xml"
description="List Projects For a certain Customer" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW" />
description="List Projects For a certain Customer" securityServiceName="portalPermissionIsCustomer" securityMainAction="VIEW"/>
<PortletPortletCategory portalPortletId="ListCustomerProjects" portletCategoryId="PROJECTMANAGER"/>
+1 -1
View File
@@ -76,6 +76,6 @@ under the License.
<!-- for current installations -->
<StatusValidChange condition="" statusId="_NA_" statusIdTo="PRJ_CLOSED" transitionName="Close project"/>
<WebSite webSiteId="PROJECTMGR" siteName="Project Manager" visualThemeSetId="BACKOFFICE" />
<WebSite webSiteId="PROJECTMGR" siteName="Project Manager" visualThemeSetId="BACKOFFICE"/>
</entity-engine-xml>
@@ -907,40 +907,40 @@
<!-- set the dates from the lower level tasks -->
<if-not-empty field="lowInfo.estimatedStartDate">
<if-empty field="highInfo.estimatedStartDate">
<set field="highInfo.estimatedStartDate" from-field="lowInfo.estimatedStartDate" />
<set field="highInfo.estimatedStartDate" from-field="lowInfo.estimatedStartDate"/>
<else>
<if-compare-field to-field="lowInfo.estimatedStartDate" field="highInfo.estimatedStartDate" operator="greater">
<set field="highInfo.estimatedStartDate" from-field="lowInfo.estimatedStartDate" />
<set field="highInfo.estimatedStartDate" from-field="lowInfo.estimatedStartDate"/>
</if-compare-field>
</else>
</if-empty>
</if-not-empty>
<if-not-empty field="lowInfo.estimatedCompletionDate">
<if-empty field="highInfo.estimatedCompletionDate">
<set field="highInfo.estimatedCompletionDate" from-field="lowInfo.estimatedCompletionDate" />
<set field="highInfo.estimatedCompletionDate" from-field="lowInfo.estimatedCompletionDate"/>
<else>
<if-compare-field to-field="lowInfo.estimatedCompletionDate" field="highInfo.estimatedCompletionDate" operator="less">
<set field="highInfo.estimatedCompletionDate" from-field="lowInfo.estimatedCompletionDate" />
<set field="highInfo.estimatedCompletionDate" from-field="lowInfo.estimatedCompletionDate"/>
</if-compare-field>
</else>
</if-empty>
</if-not-empty>
<if-not-empty field="lowInfo.actualStartDate">
<if-empty field="highInfo.actualStartDate">
<set field="highInfo.actualStartDate" from-field="lowInfo.actualStartDate" />
<set field="highInfo.actualStartDate" from-field="lowInfo.actualStartDate"/>
<else>
<if-compare-field to-field="lowInfo.actualStartDate" field="highInfo.actualStartDate" operator="greater">
<set field="highInfo.actualStartDate" from-field="lowInfo.actualStartDate" />
<set field="highInfo.actualStartDate" from-field="lowInfo.actualStartDate"/>
</if-compare-field>
</else>
</if-empty>
</if-not-empty>
<if-not-empty field="lowInfo.actualCompletionDate">
<if-empty field="highInfo.actualCompletionDate">
<set field="highInfo.actualCompletionDate" from-field="lowInfo.actualCompletionDate" />
<set field="highInfo.actualCompletionDate" from-field="lowInfo.actualCompletionDate"/>
<else>
<if-compare-field to-field="lowInfo.actualCompletionDate" field="highInfo.actualCompletionDate" operator="less">
<set field="highInfo.actualCompletionDate" from-field="lowInfo.actualCompletionDate" />
<set field="highInfo.actualCompletionDate" from-field="lowInfo.actualCompletionDate"/>
</if-compare-field>
</else>
</if-empty>
@@ -949,10 +949,10 @@
<!-- combine the priorities -->
<if-not-empty field="lowInfo.priority">
<if-empty field="highInfo.priority">
<set field="highInfo.priority" from-field="lowInfo.priority" />
<set field="highInfo.priority" from-field="lowInfo.priority"/>
<else>
<if-compare-field to-field="lowInfo.priority" field="highInfo.priority" operator="greater">
<set field="highInfo.priority" from-field="lowInfo.priority" />
<set field="highInfo.priority" from-field="lowInfo.priority"/>
</if-compare-field>
</else>
</if-empty>
@@ -26,7 +26,7 @@
<result-to-field result-name="custRequestId" field="custRequestId"/>
</call-service>
<if-not-empty field="parameters.workEffortParentId">
<set-service-fields service-name="createWorkEffort" map="parameters" to-map="createTask" />
<set-service-fields service-name="createWorkEffort" map="parameters" to-map="createTask"/>
<set field="createTask.custRequestId" from-field="custRequestId"/>
<set field="createTask.workEffortName" from-field="parameters.custRequestName"/>
<call-service service-name="createWorkEffort" in-map-name="createTask" >
@@ -40,7 +40,7 @@
<set field="assignParty.partyId" from-field="parameters.partyId"/>
<set field="assignParty.roleTypeId" from-field="parameters.roleTypeId"/>
<set field="assignParty.statusId" value="PAS_ASSIGNED"/>
<call-service service-name="assignPartyToWorkEffort" in-map-name="assignParty" />
<call-service service-name="assignPartyToWorkEffort" in-map-name="assignParty"/>
</if-not-empty>
</if-not-empty>
</simple-method>
+1 -1
View File
@@ -462,7 +462,7 @@ under the License.
<section>
<actions>
<set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
<set field="parameters.workEffortParentId" from-field="projectId" />
<set field="parameters.workEffortParentId" from-field="projectId"/>
</actions>
<widgets>
<container style="screenlet">
+1 -1
View File
@@ -277,7 +277,7 @@
<field name="statusId"><hidden value="PAS_ASSIGNED"/></field>
<field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}" use-when="parameters.get(&quot;workEffortId&quot;)!=null">
<display-entity entity-name="WorkEffort" description="${workEffortName}[${workEffortId}]">
<sub-hyperlink target="MyTasks" description="[${uiLabelMap.CommonChange}]" />
<sub-hyperlink target="MyTasks" description="[${uiLabelMap.CommonChange}]"/>
</display-entity></field>
<field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}" event="onChange" action="javascript:document.assignTaskToMe.submit();" use-when="parameters.get(&quot;workEffortId&quot;)==null">
<drop-down allow-empty="true">
+2 -2
View File
@@ -141,8 +141,8 @@
<!--field name="comments" title="${uiLabelMap.CommonComments}"><display/></field-->
<field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
<hyperlink target="TimeSheetStatusToComplete" description="${completeLink}">
<parameter param-name="timesheetId" />
<parameter param-name="statusId" value="TIMESHEET_COMPLETED" />
<parameter param-name="timesheetId"/>
<parameter param-name="statusId" value="TIMESHEET_COMPLETED"/>
</hyperlink>
</field>
</form>
+7 -7
View File
@@ -50,9 +50,9 @@ under the License.
<request-map uri="checkLogin" edit="false">
<description>Verify a user is logged in.</description>
<security https="true" auth="false"/>
<event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin" />
<response name="success" type="view" value="main" />
<response name="error" type="view" value="login" />
<event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin"/>
<response name="success" type="view" value="main"/>
<response name="error" type="view" value="login"/>
</request-map>
<request-map uri="login">
@@ -85,12 +85,12 @@ under the License.
<response name="error" type="request" value="main"/>
</request-map>
<request-map uri="LookupLocales">
<security https="true" auth="false" />
<response name="success" type="view" value="LookupLocales" />
<security https="true" auth="false"/>
<response name="success" type="view" value="LookupLocales"/>
</request-map>
<request-map uri="LookupTimezones">
<security https="true" auth="false" />
<response name="success" type="view" value="LookupTimezones" />
<security https="true" auth="false"/>
<response name="success" type="view" value="LookupTimezones"/>
</request-map>
<!-- Request Mappings -->
+1 -1
View File
@@ -151,7 +151,7 @@ under the License.
<actions>
<set field="MainColumnStyle" value="center"/>
<set field="titleProperty" value="PageTitleMain"/>
<set field="headerItem" value="Main" />
<set field="headerItem" value="Main"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">