svn commit: r451605 - in /incubator/ofbiz/trunk/applications/product: config/ webapp/catalog/WEB-INF/ webapp/catalog/find/ webapp/catalog/product/ widget/catalog/

[jacopoc]

Author: jacopoc
Date: Sat Sep 30 07:23:49 2006
New Revision: 451605

URL: http://svn.apache.org/viewvc?view=rev&rev=451605
Log:
Added "view agreements" screen to the product's detail screens: it shows product's information about purchase, sales and commission agreements.

Modified:
    incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties
    incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl
    incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
    incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductTabBar.ftl
    incubator/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml

Modified: incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?view=diff&rev=451605&r1=451604&r2=451605
==============================================================================
--- incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties Sat Sep 30 07:23:49 2006
@@ -274,6 +274,7 @@
 ProductAdvancedSearch=Advanced Search
 ProductAdvancedSearchIn=Advanced Search in
 ProductAdvancedSearchinCategory=Advanced Search in Category
+ProductAgreements=Agreements
 ProductAggregatedPrice=Product Aggregated Price
 ProductAisle=Aisle
 ProductAllowCo=Allow Co
@@ -378,6 +379,7 @@
 ProductChooseFeatureCategory=Choose a Feature Category
 ProductChooseFeatureGroup=Choose a Feature Group
 ProductChooseTopCategory=Choose Top Category
+ProductCommissions=Commissions
 ProductComplete=Complete
 ProductCompleteForce=Force Complete
 ProductComments=Comments
@@ -442,6 +444,7 @@
 ProductCurrency=Currency
 ProductCurrencyUom=Currency UOM
 ProductCurrencyUomId=Currency Uom Id
+ProductCustomer=Customer
 ProductCustomerRating=Customer Rating
 ProductDateFilter=Date Filter
 ProductDateReceived=Date Received
@@ -993,7 +996,8 @@
 ProductPromotionReqEmailOrParty=Req. Email or Party
 ProductPromotionUseLimits=Use Limits
 ProductPromotions=Promotions
-ProductPurchaseFrom=Purchase From
+ProductCommissions=Commissions
+ProductPurchases=Purchases
 ProductPurchaseFromDate=Purchase From Date
 ProductPurchaseOrder=Purchase Order
 ProductPurchaseOrderNumber=Purchase Order Number
@@ -1096,6 +1100,7 @@
 ProductRuleName=Rule Name
 ProductRuleNameFromDateThruDate=Rule Name, Description, From Date, Thru Date
 ProductRules=Rules
+ProductSales=Sales
 ProductSaleRule=Sale Rule
 ProductSalesDiscontinuationNotAvailable=Disc. When Inv. Not Avail?
 ProductSalesTax=Sales Tax

Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?view=diff&rev=451605&r1=451604&r2=451605
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Sat Sep 30 07:23:49 2006
@@ -758,6 +758,12 @@
         <response name="success" type="view" value="ViewProductManufacturing"/>
     </request-map>
 
+    <!-- ================ Product Agreements Requests ================= -->
+    <request-map uri="ViewProductAgreements">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ViewProductAgreements"/>
+    </request-map>
+
     <!-- ================ Product Costs Requests ================= -->
     <request-map uri="EditProductCosts"><security https="true" auth="true"/><response name="success" type="view" value="EditProductCosts"/></request-map>
     <request-map uri="createCostComponent">
@@ -2200,6 +2206,7 @@
     <view-map name="EditProductKeyword" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProductKeyword"/>
     <view-map name="EditProductAssoc" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProductAssoc"/>
     <view-map name="ViewProductManufacturing" type="screen" page="component://product/widget/catalog/ProductScreens.xml#ViewProductManufacturing"/>
+    <view-map name="ViewProductAgreements" type="screen" page="component://product/widget/catalog/ProductScreens.xml#ViewProductAgreements"/>
     <view-map name="EditProductCosts" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProductCosts"/>
 
     <view-map name="EditProductAttributes" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProductAttributes"/>

Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl?view=diff&rev=451605&r1=451604&r2=451605
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl Sat Sep 30 07:23:49 2006
@@ -98,6 +98,7 @@
                     <option value="<@ofbizUrl>EditProductFacilityLocations</@ofbizUrl>">${uiLabelMap.ProductLocations}</option>
                     <option value="<@ofbizUrl>EditProductInventoryItems</@ofbizUrl>">${uiLabelMap.ProductInventory}</option>
                     <option value="<@ofbizUrl>EditProductSuppliers</@ofbizUrl>">${uiLabelMap.ProductSuppliers}</option>
+                    <option value="<@ofbizUrl>ViewProductAgreements</@ofbizUrl>">${uiLabelMap.ProductAgreements}</option>
                     <option value="<@ofbizUrl>EditProductGlAccounts</@ofbizUrl>">${uiLabelMap.ProductAccounts}</option>
                     <option value="<@ofbizUrl>QuickAddVariants</@ofbizUrl>">${uiLabelMap.ProductVariants}</option>
                     <option value="<@ofbizUrl>EditProductConfigs</@ofbizUrl>">${uiLabelMap.ProductConfigs}</option>

Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?view=diff&rev=451605&r1=451604&r2=451605
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Sat Sep 30 07:23:49 2006
@@ -1164,4 +1164,48 @@
         
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
+
+    <form name="ListPurchaseAgreements" type="list" list-name="purchaseAgreements"
+            default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext" >
+        <field name="agreementId" widget-style="buttontext">
+            <hyperlink target="/accounting/control/EditAgreementItemProduct?agreementId=${agreementId}&amp;agreementItemSeqId=${agreementItemSeqId}&amp;productId=${productId}" target-type="inter-app"
+                description="${agreementId}/${agreementItemSeqId}" also-hidden="false"/>
+        </field>
+        <field name="partyIdTo" title="${uiLabelMap.ProductSupplier}"><display/></field>
+        <field name="agreementText"><display/></field>
+        <field name="description"><display/></field>
+        <field name="fromDate"><display/></field>
+        <field name="thruDate"><display/></field>
+        <field name="currencyUomId"><display/></field>
+        <field name="price"><display/></field>
+    </form>
+    <form name="ListSalesAgreements" type="list" list-name="salesAgreements"
+            default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext" >
+        <field name="agreementId" widget-style="buttontext">
+            <hyperlink target="/accounting/control/EditAgreementItemProduct?agreementId=${agreementId}&amp;agreementItemSeqId=${agreementItemSeqId}&amp;productId=${productId}" target-type="inter-app"
+                description="${agreementId}/${agreementItemSeqId}" also-hidden="false"/>
+        </field>
+        <field name="partyIdFrom" title="${uiLabelMap.PartyCustomer}"><display/></field>
+        <field name="agreementText"><display/></field>
+        <field name="description"><display/></field>
+        <field name="fromDate"><display/></field>
+        <field name="thruDate"><display/></field>
+        <field name="currencyUomId"><display/></field>
+        <field name="price"><display/></field>
+    </form>
+    <form name="ListProductAgreements" type="list" list-name="productAgreements"
+            default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext" >
+        <field name="agreementId" widget-style="buttontext">
+            <hyperlink target="/accounting/control/EditAgreementItemProduct?agreementId=${agreementId}&amp;agreementItemSeqId=${agreementItemSeqId}&amp;productId=${productId}" target-type="inter-app"
+                description="${agreementId}/${agreementItemSeqId}" also-hidden="false"/>
+        </field>
+        <field name="partyIdTo"><display/></field>
+        <field name="agreementText"><display/></field>
+        <field name="description"><display/></field>
+        <field name="fromDate"><display/></field>
+        <field name="thruDate"><display/></field>
+        <field name="currencyUomId"><display/></field>
+        <field name="price"><display/></field>
+    </form>
+
 </forms>

Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductTabBar.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductTabBar.ftl?view=diff&rev=451605&r1=451604&r2=451605
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductTabBar.ftl (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductTabBar.ftl Sat Sep 30 07:23:49 2006
@@ -35,6 +35,7 @@
         <a href="<@ofbizUrl>EditProductFacilityLocations?productId=${productId}</@ofbizUrl>" class="${selectedClassMap.EditProductFacilityLocations?default(unselectedClassName)}">${uiLabelMap.ProductLocations}</a>
         <a href="<@ofbizUrl>EditProductInventoryItems?productId=${productId}&showAllFacilities=Y</@ofbizUrl>" class="${selectedClassMap.EditProductInventoryItems?default(unselectedClassName)}">${uiLabelMap.ProductInventory}</a>
         <a href="<@ofbizUrl>EditProductSuppliers?productId=${productId}</@ofbizUrl>" class="${selectedClassMap.EditSupplierProduct?default(unselectedClassName)}">${uiLabelMap.ProductSuppliers}</a>
+        <a href="<@ofbizUrl>ViewProductAgreements?productId=${productId}</@ofbizUrl>" class="${selectedClassMap.ViewProductAgreements?default(unselectedClassName)}">${uiLabelMap.ProductAgreements}</a>
         <a href="<@ofbizUrl>EditProductGlAccounts?productId=${productId}</@ofbizUrl>" class="${selectedClassMap.EditProductGlAccounts?default(unselectedClassName)}">${uiLabelMap.ProductAccounts}</a>
         <a href="<@ofbizUrl>EditProductPaymentMethodTypes?productId=${productId}</@ofbizUrl>" class="${selectedClassMap.EditProductPaymentMethodTypes?default(unselectedClassName)}">${uiLabelMap.ProductPaymentTypes}</a>
         <a href="<@ofbizUrl>EditProductMaints?productId=${productId}</@ofbizUrl>" class="${selectedClassMap.EditProductMaints?default(unselectedClassName)}">${uiLabelMap.ProductMaintenance}</a>

Modified: incubator/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?view=diff&rev=451605&r1=451604&r2=451605
==============================================================================
--- incubator/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Sat Sep 30 07:23:49 2006
@@ -73,6 +73,45 @@
             </widgets>
         </section>
     </screen>
+    <screen name="ViewProductAgreements">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleViewProductAgreements"/>
+                <set field="tabButtonItem" value="ViewProductAgreements"/>
+                <set field="labelTitleProperty" value="ProductAgreements"/>
+    
+                <set field="productId" from-field="parameters.productId"/>
+                <entity-one entity-name="Product" value-name="product"/>
+                <entity-and entity-name="AgreementItemAndProductAppl" list-name="purchaseAgreements">
+                    <field-map field-name="productId"/>
+                    <field-map field-name="agreementTypeId" value="PURCHASE_AGREEMENT"/>
+                    <order-by field-name="fromDate"/>
+                </entity-and>
+                <entity-and entity-name="AgreementItemAndProductAppl" list-name="salesAgreements">
+                    <field-map field-name="productId"/>
+                    <field-map field-name="agreementTypeId" value="SALES_AGREEMENT"/>
+                    <order-by field-name="fromDate"/>
+                </entity-and>
+                <entity-and entity-name="AgreementItemAndProductAppl" list-name="productAgreements">
+                    <field-map field-name="productId"/>
+                    <field-map field-name="agreementTypeId" value="PRODUCT_AGREEMENT"/>
+                    <order-by field-name="fromDate"/>
+                </entity-and>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <container><label style="head2">${uiLabelMap.ProductPurchases}</label></container>
+                        <include-form name="ListPurchaseAgreements" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+                        <container><label style="head2">${uiLabelMap.ProductSales}</label></container>
+                        <include-form name="ListSalesAgreements" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+                        <container><label style="head2">${uiLabelMap.ProductCommissions}</label></container>
+                        <include-form name="ListProductAgreements" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
     <screen name="EditProductCategories">
         <section>
             <actions>
@@ -225,7 +264,7 @@
                 <decorator-screen name="CommonProductDecorator"  location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <!--<include-form name="UpdateProductPrice" location="component://product/webapp/catalog/product/ProductForms.xml"/>-->
-                        <container><label style="head2">${uiLabelMap.ProductRoutings}</label></container>    
+                        <container><label style="head2">${uiLabelMap.ProductRoutings}</label></container>
                         <include-form name="ListProductRoutings" location="component://product/webapp/catalog/product/ProductForms.xml"/>
                         <container><label style="head2">${uiLabelMap.ProductLowLevelCode}: ${product.billOfMaterialLevel}</label></container>
                         <container><label style="head2">${uiLabelMap.ProductComponents}</label></container>