[OFBiz] SVN: r6489 - in trunk/specialized/opentravelsystem: script/org/ofbiz/opentravelsystem servicedef webapp/hotelbackend/WEB-INF webapp/hotelbackend/catalog webapp/hotelbackend/screens
hansbak@svn.ofbiz.org
hansbak at svn.ofbiz.org
Wed Jan 11 02:49:31 CST 2006
Author: hansbak
Date: 2006-01-11 02:48:12 -0600 (Wed, 11 Jan 2006)
New Revision: 6489
Modified:
trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/CatalogServices.xml
trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/PaymentServices.xml
trunk/specialized/opentravelsystem/servicedef/services.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/catalog/CategoryTabBar.ftl
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogForms.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/Menus.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/PartyScreens.xml
Log:
OTS: modified create services which now prefixes the Id number wit the company abbreviation
Modified: trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/CatalogServices.xml
===================================================================
--- trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/CatalogServices.xml 2006-01-10 19:54:28 UTC (rev 6488)
+++ trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/CatalogServices.xml 2006-01-11 08:48:12 UTC (rev 6489)
@@ -30,51 +30,66 @@
<!-- Opentravelsystem Catalog Services -->
<!-- ================================================================ -->
- <!-- create a new category and the link to the catalog -->
- <simple-method method-name="CreateProductCategoryLinkToProdCatalog" short-description="--Create a Category and link to catalog--">
- <check-permission permission="CATALOG" action="_CREATE">
- <alt-permission permission="CATALOG_ROLE" action="_CREATE"/>
- <fail-message message="Security Error: to update you need CATALOG_CREATE or CATALOG_ADMIN permission, or the limited CATALOG_ROLE_CREATE permission"/>
+ <simple-method method-name="createProductCategory" short-description="--Add a ProductCategory with the invoice prefix--">
+ <check-permission permission="OPENTRAVELSYSTEM" action="_RW">
+ <alt-permission permission="${parameters.userLogin.partyId}" action="_RW"/>
+ <fail-message message="Security Error: to update you need RW access to "${parameters.partyId}" in the "OPENTRAVELSYSTEM""/>
</check-permission>
<check-errors/>
- <!-- create new entity productCategory and create all the fields -->
- <make-value value-name="newEntity" entity-name="ProductCategory"/>
- <field-to-field field-name="productCategoryTypeId" map-name="parameters" to-map-name="newEntity"/>
- <field-to-field field-name="primaryParentCategoryId" map-name="parameters" to-map-name="newEntity"/>
- <field-to-field field-name="description" map-name="parameters" to-map-name="newEntity"/>
- <field-to-field field-name="productCategoryId" map-name="parameters" to-map-name="newEntity"/>
- <!-- create a non existing ID if not supplied -->
- <if-empty field-name="productCategoryId" map-name="newEntity">
- <sequenced-id-to-env sequence-name="ProductCategory" env-name="productCategoryId"/>
- <to-string field-name="productCategoryId"/>
- <env-to-field env-name="productCategoryId" map-name="newEntity"/>
- <field-to-result field-name="productCategoryId" result-name="productCategoryId"/>
- <else>
- <!-- check the provided ID -->
- <check-id field-name="productCategoryId" map-name="newEntity"/>
- <check-errors/>
- </else>
- </if-empty>
-
- <!-- create the relation to the catalog and create all the fields -->
- <make-value value-name="newEntity1" entity-name="ProdCatalogCategory"/>
- <string-to-field string="HotelDemoCtlg" field-name="prodCatalogId"/>
- <field-to-field field-name="prodCatalogId" map-name="parameters" to-map-name="newEntity1"/>
- <field-to-field field-name="productCategoryId" map-name="newEntity" to-map-name="newEntity1"/>
- <field-to-field field-name="prodCatalogCategoryTypeId" map-name="parameters" to-map-name="newEntity1"/>
- <if-empty field-name="fromDate" map-name="parameters">
- <now-timestamp-to-env env-name="nowTimestamp"/>
- <env-to-field env-name="nowTimestamp" field-name="fromDate" map-name="parameters"/>
- </if-empty>
- <field-to-field field-name="fromDate" map-name="parameters" to-map-name="newEntity1"/>
+ <!-- create id using the invoice prefix -->
+ <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" auto-field-map="false" use-cache="true">
+ <field-map field-name="partyId" env-name="parameters.userLogin.partyId"/>
+ </entity-one>
+ <set-service-fields service-name="createProductCategoryOfbiz" map-name="parameters" to-map-name="createProductCategory"/>
+ <sequenced-id-to-env sequence-name="${partyAcctgPreference.invoiceIdPrefix}ProductCategory" env-name="nextProductCategoryId"/>
+ <set field="createProductCategory.productCategoryId" value="${partyAcctgPreference.invoiceIdPrefix}${nextProductCategoryId}"/>
+ <!-- call original ofbiz service with preset ProductCategoryId -->
+ <call-service service-name="createProductCategoryOfbiz" in-map-name="createProductCategory">
+ <result-to-result result-name="productCategoryId" service-result-name="productCategoryId"/>
+ </call-service>
- <transaction-begin/>
- <create-value value-name="newEntity"/>
+ </simple-method>
+
+ <simple-method method-name="createProduct" short-description="--Add a Product with the invoice prefix--">
+ <check-permission permission="OPENTRAVELSYSTEM" action="_RW">
+ <alt-permission permission="${parameters.userLogin.partyId}" action="_RW"/>
+ <fail-message message="Security Error: to update you need RW access to "${parameters.partyId}" in the "OPENTRAVELSYSTEM""/>
+ </check-permission>
<check-errors/>
- <create-value value-name="newEntity1"/>
+
+ <!-- create id using the invoice prefix -->
+ <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" auto-field-map="false" use-cache="true">
+ <field-map field-name="partyId" env-name="parameters.userLogin.partyId"/>
+ </entity-one>
+ <set-service-fields service-name="createProductOfbiz" map-name="parameters" to-map-name="createProduct"/>
+ <sequenced-id-to-env sequence-name="${partyAcctgPreference.invoiceIdPrefix}Product" env-name="nextProductId"/>
+ <set field="createProduct.productId" value="${partyAcctgPreference.invoiceIdPrefix}${nextProductId}"/>
+ <!-- call original ofbiz service with preset ProductId -->
+ <call-service service-name="createProductOfbiz" in-map-name="createProduct">
+ <result-to-result result-name="productId" service-result-name="productId"/>
+ </call-service>
+ </simple-method>
+
+ <simple-method method-name="createFixedAsset" short-description="--Add a FixedAsset with the invoice prefix--">
+ <check-permission permission="OPENTRAVELSYSTEM" action="_RW">
+ <alt-permission permission="${parameters.userLogin.partyId}" action="_RW"/>
+ <fail-message message="Security Error: to update you need RW access to "${parameters.partyId}" in the "OPENTRAVELSYSTEM""/>
+ </check-permission>
<check-errors/>
- <transaction-commit/>
+
+ <!-- create id using the invoice prefix -->
+ <entity-one entity-name="PartyAcctgPreference" value-name="partyAcctgPreference" auto-field-map="false" use-cache="true">
+ <field-map field-name="partyId" env-name="parameters.userLogin.partyId"/>
+ </entity-one>
+ <set-service-fields service-name="createFixedAssetOfbiz" map-name="parameters" to-map-name="createFixedAsset"/>
+ <sequenced-id-to-env sequence-name="${partyAcctgPreference.invoiceIdPrefix}FixedAsset" env-name="nextFixedAssetId"/>
+ <set field="createFixedAsset.fixedAssetId" value="${partyAcctgPreference.invoiceIdPrefix}${nextFixedAssetId}"/>
+ <!-- call original ofbiz service with preset FixedAssetId -->
+ <call-service service-name="createFixedAssetOfbiz" in-map-name="createFixedAsset">
+ <result-to-result result-name="fixedAssetId" service-result-name="fixedAssetId"/>
+ </call-service>
+
</simple-method>
-
+
</simple-methods>
\ No newline at end of file
Modified: trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/PaymentServices.xml
===================================================================
--- trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/PaymentServices.xml 2006-01-10 19:54:28 UTC (rev 6488)
+++ trunk/specialized/opentravelsystem/script/org/ofbiz/opentravelsystem/PaymentServices.xml 2006-01-11 08:48:12 UTC (rev 6489)
@@ -27,7 +27,7 @@
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd">
<!-- ================================================================ -->
- <!-- Opentravelsystem Party Services -->
+ <!-- Opentravelsystem Payment Services -->
<!-- ================================================================ -->
<simple-method method-name="createPayment" short-description="--Add a payment with the invoice prefix--">
Modified: trunk/specialized/opentravelsystem/servicedef/services.xml
===================================================================
--- trunk/specialized/opentravelsystem/servicedef/services.xml 2006-01-10 19:54:28 UTC (rev 6488)
+++ trunk/specialized/opentravelsystem/servicedef/services.xml 2006-01-11 08:48:12 UTC (rev 6489)
@@ -280,7 +280,7 @@
<service name="createInvoice" engine="simple" default-entity-name="Invoice"
location="org/ofbiz/opentravelsystem/InvoiceServices.xml" invoke="createInvoice">
<description>Create Invoice Record with company prefix</description>
- <auto-attributes mode="INOUT" include="pk" optional="true"/>
+ <auto-attributes mode="OUT" include="pk" optional="true"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
<override name="invoiceTypeId" mode="IN" optional="false"/>
<override name="statusId" mode = "IN" optional="false"/>
@@ -293,5 +293,61 @@
<override name="invoiceTypeId" mode="IN" optional="false"/>
<override name="statusId" mode = "IN" optional="false"/>
</service>
+ <service name="createProductCategory" default-entity-name="ProductCategory" engine="simple"
+ location="org/ofbiz/opentravelsystem/CatalogServices.xml" invoke="createProductCategory" auth="true">
+ <description>Create an ProductCategory</description>
+ <auto-attributes include="pk" mode="OUT" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="productCategoryTypeId" optional="false"/>
+ </service>
+ <service name="createProductCategoryOfbiz" default-entity-name="ProductCategory" engine="simple"
+ location="org/ofbiz/product/category/CategoryServices.xml" invoke="createProductCategory" auth="true">
+ <description>Create an ProductCategory</description>
+ <auto-attributes include="pk" mode="INOUT" optional="true"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="productCategoryTypeId" optional="false"/>
+ </service>
+ <service name="createProduct" default-entity-name="Product" engine="simple"
+ location="org/ofbiz/opentravelsystem/CatalogServices.xml" invoke="createProduct" auth="true">
+ <description>Create a Product</description>
+ <implements service="interfaceProduct"/>
+ <auto-attributes include="pk" mode="OUT" optional="false"/>
+ <override name="productTypeId" optional="false"/>
+ <override name="internalName" optional="false"/>
+ </service>
+ <service name="createProductOfbiz" default-entity-name="Product" engine="simple"
+ location="org/ofbiz/product/product/ProductServices.xml" invoke="createProduct" auth="true">
+ <description>Create a Product</description>
+ <implements service="interfaceProduct"/>
+ <auto-attributes include="pk" mode="INOUT" optional="true"/>
+ <override name="productTypeId" optional="false"/>
+ <override name="internalName" optional="false"/>
+ </service>
+ <service name="createFixedAsset" default-entity-name="FixedAsset" engine="simple"
+ location="org/ofbiz/opentravelsystem/CatalogServices.xml" invoke="createFixedAsset" auth="true">
+ <description>Create an FixedAsset</description>
+ <auto-attributes include="pk" mode="OUT" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="fixedAssetTypeId" optional="false"/>
+ </service>
+ <service name="createFixedAssetOfbiz" default-entity-name="FixedAsset" engine="simple"
+ location="org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="createFixedAsset" auth="true">
+ <description>Create an FixedAsset</description>
+ <auto-attributes include="pk" mode="INOUT" optional="true"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="fixedAssetTypeId" optional="false"/>
+ </service>
+ <service name="createOrderHeader" default-entity-name="OrderHeader" engine="simple"
+ location="org/ofbiz/opentravelsystem/OrderServices.xml" invoke="createOrderHeader" auth="true">
+ <description>Create OrderHeader</description>
+ <auto-attributes include="pk" mode="OUT" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="createOrderHeaderOfbiz" default-entity-name="OrderHeader" engine="simple"
+ location="org/ofbiz/order/order/OrderServices.xml" invoke="createOrderHeader" auth="true">
+ <description>Create OrderHeader</description>
+ <auto-attributes include="pk" mode="INOUT" optional="true"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
</services>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml 2006-01-10 19:54:28 UTC (rev 6488)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml 2006-01-11 08:48:12 UTC (rev 6489)
@@ -232,15 +232,9 @@
<request-map uri="EditCategory">
<security https="true" auth="true"/>
- <response name="success" type="view" value="EditCategory"/>
+ <response name="success" type="view" value="EditProductCategory"/>
</request-map>
- <request-map uri="CreateProductCategoryLinkToProdCatalog">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="CreateProductCategoryLinkToProdCatalog"/>
- <response name="success" type="view" value="EditProdCatalogCategories"/>
- <response name="error" type="view" value="EditCategory"/>
- </request-map>
<!-- =============== Fixed Asset mapping =================-->
<request-map uri="ListFixedAssets"><!-- show a tabular list -->
@@ -786,6 +780,19 @@
<response name="error" type="view" value="EditCategory"/>
</request-map>
+ <request-map uri="createProductCategory">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="createProductCategory"/>
+ <response name="success" type="view" value="EditProductCategory"/>
+ <response name="error" type="view" value="EditProductCategory"/>
+ </request-map>
+ <request-map uri="DuplicateProductCategory">
+ <security https="true" auth="true"/>
+ <event type="service" path="" invoke="duplicateProductCategory"/>
+ <response name="success" type="view" value="EditProductCategory"/>
+ <response name="error" type="view" value="EditProductCategory"/>
+ </request-map>
+
<!-- ================ Category Rollup Requests ================= -->
<request-map uri="EditCategoryRollup">
<security https="true" auth="true"/>
@@ -793,7 +800,7 @@
</request-map>
<request-map uri="addProductCategoryToCategory">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="safeAddProductCategoryToCategory"/>
+ <event type="service" path="" invoke="addProductCategoryToCategory"/>
<response name="success" type="view" value="EditCategoryRollup"/>
<response name="error" type="view" value="EditCategoryRollup"/>
</request-map>
@@ -817,7 +824,7 @@
</request-map>
<request-map uri="addCategoryProductMember">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="safeAddProductToCategory"/>
+ <event type="service" path="" invoke="addProductToCategory"/>
<response name="success" type="view" value="EditCategoryProducts"/>
<response name="error" type="view" value="EditCategoryProducts"/>
</request-map>
@@ -1059,7 +1066,7 @@
<request-map uri="addFixedAssetProduct">
<security https="true" auth="true"/>
<event type="service" path="org.ofbiz.accounting.fixedasset.FixedAssetServices.xml" invoke="addFixedAssetProduct"/>
- <response name="success" type="view" value="showProductAssetUsage"/>
+ <response name="success" type="view" value="ListFixedAssetProducts"/>
<response name="error" type="view" value="newFixedAssetProduct"/>
</request-map>
<request-map uri="updFixedAssetProduct">
@@ -1272,7 +1279,7 @@
</request-map>
<request-map uri="addProductToCategory">
<security https="true" auth="true"/>
- <event type="service" path="" invoke="safeAddProductToCategory"/>
+ <event type="service" path="" invoke="addProductToCategory"/>
<response name="success" type="view" value="EditProductCategories"/>
<response name="error" type="view" value="EditProductCategories"/>
</request-map>
@@ -3034,7 +3041,6 @@
<view-map name="EditProductAssetUsage" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#EditProductAssetUsage"/>
<view-map name="showFixedAssetProduct" type="screen" page="component://product/widget/catalog/ProductScreens.xml#showFixedAssetProduct"/>
<view-map name="newFixedAssetProduct" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#newFixedAssetProduct"/>
- <view-map name="EditCategory" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#EditCategory"/>
<view-map name="EditProdCatalogCategories" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#EditProdCatalogCategories"/>
<view-map name="EditCategoryRollup" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#EditCategoryRollup"/>
<view-map name="EditProductStore" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStore"/>
@@ -3044,7 +3050,7 @@
<view-map name="EditProductStorePaySetup" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStorePaySetup"/>
<view-map name="selectStore" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#selectStore"/>
<view-map name="ImportProduct" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#ImportProduct"/>
- <!--view-map name="EditProductCategory" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#EditProductCategory"/-->
+ <view-map name="EditProductCategory" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#EditProductCategory"/>
<view-map name="EditProducts" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#EditProducts"/>
<view-map name="EditCategoryProducts" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#EditCategoryProducts"/>
<view-map name="EditFixedAssets" type="screen" page="component://opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml#EditFixedAssets"/>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/catalog/CategoryTabBar.ftl
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/catalog/CategoryTabBar.ftl 2006-01-10 19:54:28 UTC (rev 6488)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/catalog/CategoryTabBar.ftl 2006-01-11 08:48:12 UTC (rev 6489)
@@ -31,11 +31,11 @@
<#if productCategory?has_content>
<div class="tabContainer">
- <a href="<@ofbizUrl>EditCategory?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategory?default(unselectedClassName)}">${uiLabelMap.ProductCategory}</a>
- <!--a href="<@ofbizUrl>EditCategoryContent?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryContent?default(unselectedClassName)}">${uiLabelMap.ProductCategoryContent}</a-->
- <a href="<@ofbizUrl>EditCategoryRollup?showProductCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryRollup?default(unselectedClassName)}">${uiLabelMap.ProductRollupShort}</a>
- <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryProducts?default(unselectedClassName)}">${uiLabelMap.ProductProducts}</a>
- <!--a href="<@ofbizUrl>EditCategoryProdCatalogs?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryProdCatalogs?default(unselectedClassName)}">${uiLabelMap.ProductCatalogs}</a>
+ <a href="<@ofbizUrl>EditCategory?productCategoryId=${productCategory.productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategory?default(unselectedClassName)}">${uiLabelMap.ProductCategory}</a>
+ <#--a href="<@ofbizUrl>EditCategoryContent?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryContent?default(unselectedClassName)}">${uiLabelMap.ProductCategoryContent}</a-->
+ <a href="<@ofbizUrl>EditCategoryRollup?showProductCategoryId=${productCategory.productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryRollup?default(unselectedClassName)}">${uiLabelMap.ProductRollupShort}</a>
+ <a href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategory.productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryProducts?default(unselectedClassName)}">${uiLabelMap.ProductProducts}</a>
+ <#--a href="<@ofbizUrl>EditCategoryProdCatalogs?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryProdCatalogs?default(unselectedClassName)}">${uiLabelMap.ProductCatalogs}</a>
<a href="<@ofbizUrl>EditCategoryFeatureCats?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryFeatureCats?default(unselectedClassName)}">${uiLabelMap.ProductFeatureCats}</a>
<a href="<@ofbizUrl>EditCategoryParties?productCategoryId=${productCategoryId}</@ofbizUrl>" class="${selectedClassMap.EditCategoryParties?default(unselectedClassName)}">${uiLabelMap.PartyParties}</a>
--> </div>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogForms.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogForms.xml 2006-01-10 19:54:28 UTC (rev 6488)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogForms.xml 2006-01-11 08:48:12 UTC (rev 6489)
@@ -2,8 +2,23 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
+ <!-- create and update a productCategory -->
+ <form name="EditProductCategory" type="single"
+ target="updateProductCategory" title="" default-map-name="productCategory"
+ default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ <actions>
+ <set field="partyId1" from-field="partyId"></set>
+ </actions>
+ <alt-target use-when="productCategory==null" target="createProductCategory"/>
+ <field use-when="productCategory!=null" name="productCategoryId" title="${uiLabelMap.AccountingproductCategoryId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field name="productCategoryTypeId"><drop-down><entity-options entity-name="ProductCategoryType" description="${description}"></entity-options></drop-down></field>
+ <field name="description"><text/></field>
+ <field use-when="productCategory!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field use-when="productCategory==null" name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
<!-- Edit the list of active categories (connected to the catalog) and allow to add categories
- where the primary category is the same as the productStoreId -->
+ where the prefix is the company prefix -->
<form name="editProdCatalogCategory" type="single" default-map-name="productCategory"
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext" target="updateProductCategory">
@@ -40,9 +55,15 @@
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap"/>
+ <entity-condition entity-name="Product" list-name="products">
+ <condition-list>
+ <condition-expr field-name="productId" operator="like" value="${prefix}%"/>
+ </condition-list>
+ <order-by field-name="productId"/>
+ </entity-condition>
</actions>
<field name="productId" widget-style="buttontext"><hyperlink target="EditProduct?productId=${productId}" description="${productId}"/></field>
- <field name="description"><display/></field>
+ <field name="internalName"><display/></field>
<field name="reservMaxPersons"><display/></field>
<field name="reserv2ndPPPerc"><display/></field>
<field name="reservNthPPPerc"><display/></field>
@@ -62,7 +83,7 @@
<field name="thruDate" title="${uiLabelMap.CommonThruDate}" widget-style="inputBox"> <date-time/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
- <hyperlink target="removeCategoryProductMember" description="[Remove Product from Category]" also-hidden="false"/>
+ <hyperlink target="removeCategoryProductMember?productCategoryId=${productCategoryId}&productId=${productId}&fromDate=${fromDate}" description="[Remove Product from Category]" also-hidden="false"/>
</field>
</form>
@@ -84,9 +105,7 @@
<field use-when="product==null" name="isCreate"><hidden value="true"/></field>
- <field use-when="product!=null" name="productId" title="${uiLabelMap.ProductProductId}" tooltip="${uiLabelMap.ProductNotModificationRecreatingProduct}"><display/></field>
- <field use-when="product==null&&productId==null" name="productId" title="${uiLabelMap.ProductProductId}"><text size="20" maxlength="20"/></field>
- <field use-when="product==null&&productId!=null" name="productId" title="${uiLabelMap.ProductProductId}" tooltip="${uiLabelMap.ProductNotFindProductId} [${productId}]"><text size="20" maxlength="20"/></field>
+ <field use-when="product!=null" name="productId"><hidden value="productId"/></field>
<!--field position="1" name="isVirtual" title="${uiLabelMap.ProductVirtualProduct}" widget-style="selectBox">
<drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}" /><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
@@ -112,6 +131,7 @@
<field name="primaryProductCategoryId" ><hidden value="${productStoreId}"/></field><!-- fix to this value -->
<field name="internalName" title="${uiLabelMap.ProductInternalName}"><text size="30" maxlength="60"/></field>
+ <field name="description" title="${uiLabelMap.ProductDescription}"><text size="30" maxlength="60"/></field>
<!--field name="brandName" title="${uiLabelMap.ProductBrandName}" ><text size="30" maxlength="60"/></field-->
<field name="comments" title="${uiLabelMap.ProductComments}"><text size="60" maxlength="250"/></field>
@@ -191,10 +211,10 @@
<field position="1" name="returnable" title="${uiLabelMap.ProductReturnable}" widget-style="selectBox">
<drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
- </field>
+ </field-->
<field position="2" name="includeInPromotions" title="${uiLabelMap.ProductIncludePromotions}" widget-style="selectBox">
<drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
- </field-->
+ </field>
<field position="1" name="taxable" title="${uiLabelMap.ProductTaxable}" widget-style="selectBox">
<drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down>
@@ -267,8 +287,6 @@
<auto-fields-service service-name="updateFixedAsset" map-name="fixedAsset"/>
<field use-when="fixedAsset!=null" name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
- <field use-when="fixedAsset==null&&fixedAssetId==null" name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}"><text size="20" maxlength="20"/></field>
- <field use-when="fixedAsset==null&&fixedAssetId!=null" name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" tooltip="${uiLabelMap.CommonCannotBeFound}:[${fixedAssetId}]"><text size="20" maxlength="20"/></field>
<field name="parentFixedAssetId"><hidden value="${productStoreId}"/></field>
<field name="partyId"><hidden/></field>
@@ -307,4 +325,26 @@
<submit button-type="button"/>
</field>
</form>
+ <form name="ListFixedAssets" type="list" list-name="fixedAssets"
+ default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+ <actions>
+ <entity-condition entity-name="FixedAsset" list-name="fixedAssets">
+ <condition-expr field-name="fixedAssetId" operator="like" value="${prefix}%"/>
+ <order-by field-name="fixedAssetId"/>
+ </entity-condition>
+ </actions>
+ <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" widget-style="linktext">
+ <hyperlink also-hidden="false" description="${fixedAssetId}" target="EditFixedAsset?fixedAssetId=${fixedAssetId}"/>
+ </field>
+ <field name="fixedAssetName" title="${uiLabelMap.AccountingFixedAssetName}">
+ <display/>
+ </field>
+ <field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedTypeId}"><display-entity entity-name="FixedAssetType"/></field>
+ <field name="parentFixedAssetId" title="${uiLabelMap.AccountingFixedAssetParentId}">
+ <display-entity entity-name="FixedAsset" key-field-name="fixedAssetId" description="${fixedAssetName}">
+ <sub-hyperlink target="EditFixedAsset?fixedAssetId=${parentFixedAssetId}" description="${parentFixedAssetId}" link-style="buttontext"/>
+ </display-entity>
+ </field>
+ </form>
+
</forms>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml 2006-01-10 19:54:28 UTC (rev 6488)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CatalogScreens.xml 2006-01-11 08:48:12 UTC (rev 6489)
@@ -49,6 +49,45 @@
</section>
</screen>
+ <screen name="EditProductCategory">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditProductCategory"/>
+ <set field="headerItem" value="category"/>
+ <set field="tabButtonItem" value="EditCategory"/>
+ <set field="labelTitleProperty" value="ProductCategory"/>
+
+ <set field="productCategoryId" from-field="parameters.productCategoryId"/>
+ <entity-one entity-name="ProductCategory" value-name="productCategory"/>
+
+ <!--entity-condition entity-name="ProductCategory" list-name="categoryList">
+ <condition-expr field-name="showInSelect" operator="not-equals" value="N"/>
+ <order-by field-name="description"/>
+ </entity-condition>
+ <entity-condition entity-name="ProductCategoryType" list-name="productCategoryTypes">
+ <order-by field-name="description"/>
+ </entity-condition>
+
+ <script location="component://product/webapp/catalog/WEB-INF/actions/category/EditCategory.bsh"/-->
+ </actions>
+ <widgets>
+ <decorator-screen name="CatalogDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container>
+ <platform-specific><html>
+ <html-template location="component://opentravelsystem/webapp/hotelbackend/catalog/CategoryTabBar.ftl"/>
+ </html></platform-specific>
+ </container>
+ <container>
+ <label style="head1"><br>Edit/Add a product category ${productCategoryId}</label>
+ </container>
+ <include-form name="EditProductCategory" location="component://opentravelsystem/webapp/hotelbackend/screens/CatalogForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
<screen name="EditProdCatalogCategories">
<section>
<!--condition>
@@ -60,7 +99,9 @@
<set field="productStoreId" from-scope="user" from-field="productStoreId"/>
<set field="prodCatalogId" from-scope="user" from-field="prodCatalogId"/>
<!--set field="leftbarScreenName" value="leftbar"/-->
- <entity-one entity-name="ProdCatalog" value-name="prodCatalog" use-cache="true"/>
+ <entity-one entity-name="ProdCatalog" value-name="prodCatalog" use-cache="true">
+ <field-map field-name="prodCatalogId" value="${prodCatalogId}"/>
+ </entity-one>
<entity-condition entity-name="ProdCatalogCategory" list-name="prodCatalogCategories">
<condition-expr field-name="prodCatalogId" operator="equals" value="${prodCatalogId}"/>
<order-by field-name="productCategoryId"/>
@@ -68,8 +109,8 @@
<order-by field-name="fromDate"/>
</entity-condition>
<entity-condition entity-name="ProductCategory" list-name="productCategories">
- <condition-expr field-name="primaryParentCategoryId" operator="equals" value="${productStoreId}"/>
- <order-by field-name="productCategoryId"/>
+ <condition-expr field-name="productCategoryId" operator="like" value="${prefix}%"/>
+ <order-by field-name="description"/>
</entity-condition>
<entity-condition entity-name="ProdCatalogCategoryType" list-name="prodCatalogCategoryTypes">
<order-by field-name="prodCatalogCategoryTypeId"/>
@@ -90,39 +131,13 @@
<html-template location="component://opentravelsystem/webapp/hotelbackend/catalog/EditProdCatalogCategories.ftl"/>
</html>
</platform-specific>
- <link target="EditCategory" text="[Create new Category]" style="buttontext"/>
+ <link target="EditProductCategory" text="[Create new Category]" style="buttontext"/>
</container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
- <screen name="EditCategory">
- <section>
- <actions>
- <set field="page.appTabButtonItem" value="Product"/>
- <set field="page.headerItem" value="categories"/>
- <set field="page.tabButtonItem" value="EditCategory"/>
- <set field="productStoreId" from-scope="user" from-field="productStoreId"/>
- <set field="prodCatalogId" from-scope="user" from-field="prodCatalogId"/>
- <set field="productCategoryId" from-field="parameters.productCategoryId"/>
- <!--set field="leftbarScreenName" value="leftbar"/-->
- <entity-one entity-name="ProductCategory" value-name="productCategory"/>
- </actions>
- <widgets>
- <decorator-screen name="CatalogDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://opentravelsystem/webapp/hotelbackend/catalog/CategoryTabBar.ftl"/></html>
- </platform-specific>
- <label style="head1">Add/Update Category</label>
- <link target="EditCategory" text="[New Category]" style="buttontext"/>
- <include-form name="editProdCatalogCategory" location="component://opentravelsystem/webapp/hotelbackend/screens/CatalogForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="EditCategoryProducts">
<section>
@@ -132,12 +147,11 @@
<set field="page.appTabButtonItem" value="Product"/>
<set field="page.headerItem" value="categories"/>
<set field="page.tabButtonItem" value="EditCategoryProducts"/>
- <set field="productCategoryId" from-field="parameters.productCategoryId"/>
- <entity-one entity-name="ProductCategory" value-name="productCategory"></entity-one>
+ <entity-one entity-name="ProductCategory" value-name="productCategory">
+ <field-map field-name="productCategoryId" value="${parameters.productCategoryId}"/>
+ </entity-one>
<entity-condition entity-name="ProductCategoryMember" list-name="productCategoryMembers">
- <condition-list>
- <condition-expr field-name="productCategoryId" operator="equals" value="${productCategoryId}"/>
- </condition-list>
+ <condition-expr field-name="productCategoryId" operator="equals" value="${parameters.productCategoryId}"/>
<order-by field-name="productId"/>
<order-by field-name="fromDate"/>
</entity-condition>
@@ -149,13 +163,13 @@
<platform-specific>
<html><html-template location="component://opentravelsystem/webapp/hotelbackend/catalog/CategoryTabBar.ftl"/></html>
</platform-specific>
- <label style="head1">${uiLabelMap.PageTitleEditCategoryProducts} for Category "${productCategory.description}" [${productCategoryId}]</label>
</container>
<container>
<link target="EditProduct"
text="[${uiLabelMap.ProductNewProduct}]" style="buttontext"/>
</container>
<container>
+ <label style="head1">${uiLabelMap.PageTitleEditCategoryProducts} for Category "${productCategory.description}" [${productCategory.productCategoryId}]</label>
<include-form name="EditCategoryProducts" location="component://opentravelsystem/webapp/hotelbackend/screens/CatalogForms.xml"/>
<container>
<label style="head1"><br>${uiLabelMap.ProductAddProductCategoryMember}</label>
@@ -174,28 +188,19 @@
<set field="productStoreId" from-scope="user" from-field="productStoreId"/>
<set field="page.appTabButtonItem" value="Product"/>
<set field="page.headerItem" value="products"/>
- <!--set field="leftbarScreenName" value="leftbar"/-->
- <entity-condition entity-name="Product" list-name="products">
- <condition-expr field-name="primaryProductCategoryId" operator="equals" value="${productStoreId}"/>
- <order-by field-name="productId"/>
- </entity-condition>
</actions>
<widgets>
<decorator-screen name="CatalogDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
- <label style="head1">${uiLabelMap.ProductProducts}</label>
- </container>
- <container>
<link target="EditProduct"
text="[${uiLabelMap.ProductNewProduct}]" style="buttontext"/>
</container>
<container>
- <include-form name="EditProducts" location="component://opentravelsystem/webapp/hotelbackend/screens/CatalogForms.xml"/>
+ <label style="head1">${uiLabelMap.ProductProducts}</label>
</container>
<container>
- <link target="EditProduct"
- text="[${uiLabelMap.ProductNewProduct}]" style="buttontext"/>
+ <include-form name="EditProducts" location="component://opentravelsystem/webapp/hotelbackend/screens/CatalogForms.xml"/>
</container>
</decorator-section>
</decorator-screen>
@@ -209,27 +214,18 @@
<set field="productStoreId" from-scope="user" from-field="productStoreId"/>
<set field="page.appTabButtonItem" value="Product"/>
<set field="page.headerItem" value="fixedassets"/>
- <!--set field="leftbarScreenName" value="leftbar"/-->
- <entity-condition entity-name="FixedAsset" list-name="fixedAssets">
- <condition-expr field-name="parentFixedAssetId" operator="equals" value="${productStoreId}"/>
- <order-by field-name="fixedAssetId"/>
- </entity-condition>
</actions>
<widgets>
<decorator-screen name="CatalogDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
- <label style="head1">${uiLabelMap.AccountingFixedAssets}</label>
- </container>
- <container>
<link target="EditFixedAsset"
text="[${uiLabelMap.AccountingNewFixedAsset}]" style="buttontext"/>
</container>
- <include-form name="ListFixedAssets" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/>
<container>
- <link target="EditFixedAsset"
- text="[${uiLabelMap.AccountingNewFixedAsset}]" style="buttontext"/>
+ <label style="head1">${uiLabelMap.AccountingFixedAssets}</label>
</container>
+ <include-form name="ListFixedAssets" location="component://opentravelsystem/webapp/hotelbackend/screens/CatalogForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -326,7 +322,7 @@
<platform-specific>
<html><html-template location="component://opentravelsystem/webapp/hotelbackend/catalog/ProductTabBar.ftl"/></html>
</platform-specific>
- <label style="head1">${uiLabelMap.ProductEditProduct}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}]</label>
+ <label style="head1">${uiLabelMap.ProductEditProduct}: ${product.internalName} [${uiLabelMap.CommonId}:${product.productId}]</label>
</container>
<include-form name="EditProduct" location="component://opentravelsystem/webapp/hotelbackend/screens/CatalogForms.xml"/>
<!-- include the duplicate product form template -->
@@ -683,7 +679,7 @@
<entity-one entity-name="ProductCategory" value-name="productCategory"/>
<entity-condition entity-name="ProductCategoryRollup" list-name="currentProductCategoryRollups">
- <condition-expr field-name="productCategoryId" env-name="productCategoryId"/>
+ <condition-expr field-name="productCategoryId" operator="like" value="${prefix}%"/>
<order-by field-name="sequenceNum"/>
</entity-condition>
<entity-condition entity-name="ProductCategoryRollup" list-name="parentProductCategoryRollups">
@@ -692,8 +688,8 @@
</entity-condition>
<entity-condition entity-name="ProductCategory" list-name="productCategoryCol">
- <condition-expr field-name="primaryParentCategoryId" operator="equals" value="${productStoreId}" />
- <order-by field-name="description"/>
+ <condition-expr field-name="productCategoryId" operator="like" value="${prefix}%"/>
+ <order-by field-name="description"/>
</entity-condition>
</actions>
<widgets>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml 2006-01-10 19:54:28 UTC (rev 6488)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/CommonScreens.xml 2006-01-11 08:48:12 UTC (rev 6489)
@@ -56,6 +56,10 @@
<set field="layoutSettings.headerImageUrl" value="/${organizationPartyId}/html/images/company.jpg" global="true"/>
<!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
<!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
+ <entity-one entity-name="PartyAcctgPreference" value-name="preference" use-cache="true">
+ <field-map field-name="partyId" value="${organizationPartyId}"/>
+ </entity-one>
+ <set field="prefix" from-field="preference.invoiceIdPrefix" global="true"/>
</actions>
<widgets>
<!-- render header -->
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/Menus.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/Menus.xml 2006-01-10 19:54:28 UTC (rev 6488)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/Menus.xml 2006-01-11 08:48:12 UTC (rev 6489)
@@ -28,7 +28,6 @@
default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="headerButtonLeft"
default-align-style="col" menu-container-style="row" fill-style="col-fill" orientation="horizontal" type="simple">
<menu-item name="Find" title="Find"><link target="findParties?statusId=PARTYREL-ACTIVE"/></menu-item>
- <menu-item name="New" title="New"><link target="editParty"/></menu-item>
<menu-item name="Disabled" title="Disabled Parties"><link target="findParties?statusId=PARTYREL-DELETED"/></menu-item>
<menu-item name="Security" title="Security"><link target="security"/></menu-item>
<menu-item name="CompanyInfo" title="CompanyInfo"><link target="editCompany?organizationPartyId=${organizationPartyId}"/></menu-item>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/PartyScreens.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/PartyScreens.xml 2006-01-10 19:54:28 UTC (rev 6488)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/PartyScreens.xml 2006-01-11 08:48:12 UTC (rev 6489)
@@ -36,6 +36,7 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <container><link target="editParty" text="${uiLabelMap.CommonCreateNew} Party" style="buttontext"/></container>
<container><label style="head1" text="Find Parties"/></container>
<include-form name="FindParties" location="component://opentravelsystem/webapp/hotelbackend/screens/PartyForms.xml"/>
<section>
More information about the Svn
mailing list