svn commit: r450525 - in /incubator/ofbiz/trunk/applications/order: entitydef/entitymodel.xml script/org/ofbiz/order/quote/QuoteServices.xml script/org/ofbiz/order/request/CustRequestServices.xml webapp/ordermgr/request/RequestForms.xml

[jacopoc]

Author: jacopoc
Date: Wed Sep 27 10:54:52 2006
New Revision: 450525

URL: http://svn.apache.org/viewvc?view=rev&rev=450525
Log:
Added salesChannelEnumId to the CustRequest entity.
The field is populated from the cart when the cart is saved as a request, and is also propagated to the quote when a quote is created from the request.

Modified:
    incubator/ofbiz/trunk/applications/order/entitydef/entitymodel.xml
    incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
    incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml

Modified: incubator/ofbiz/trunk/applications/order/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/entitydef/entitymodel.xml?view=diff&rev=450525&r1=450524&r2=450525
==============================================================================
--- incubator/ofbiz/trunk/applications/order/entitydef/entitymodel.xml (original)
+++ incubator/ofbiz/trunk/applications/order/entitydef/entitymodel.xml Wed Sep 27 10:54:52 2006
@@ -1469,6 +1469,7 @@
       <field name="description" type="description"></field>
       <field name="maximumAmountUomId" type="id"></field>
       <field name="productStoreId" type="id"></field>
+      <field name="salesChannelEnumId" type="id"></field>
       <field name="createdDate" type="date-time"></field>
       <field name="createdByUserLogin" type="id-vlong"></field>
       <field name="lastModifiedDate" type="date-time"></field>
@@ -1491,6 +1492,9 @@
       </relation>
       <relation type="one" fk-name="CUST_REQ_PRDS" rel-entity-name="ProductStore">
         <key-map field-name="productStoreId"/>
+      </relation>
+      <relation type="one" fk-name="CUST_REQ_CHANNEL" title="SalesChannel" rel-entity-name="Enumeration">
+        <key-map field-name="salesChannelEnumId" rel-field-name="enumId"/>
       </relation>
       <relation type="many" rel-entity-name="CustRequestTypeAttr">
         <key-map field-name="custRequestTypeId"/>

Modified: incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?view=diff&rev=450525&r1=450524&r2=450525
==============================================================================
--- incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml (original)
+++ incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml Wed Sep 27 10:54:52 2006
@@ -463,6 +463,7 @@
         <set from-field="custRequest.description" field="newQuote.description"/>
         <set from-field="custRequest.maximumAmountUomId" field="newQuote.currencyUomId"/>
         <set from-field="custRequest.productStoreId" field="newQuote.productStoreId"/>
+        <set from-field="custRequest.salesChannelEnumId" field="newQuote.salesChannelEnumId"/>
         <set from-field="custRequestItem.story" field="newQuoteItem.comments"/>
         <create-value value-name="newQuote"/>
         <create-value value-name="newQuoteItem"/>
@@ -742,6 +743,7 @@
 
         <set field="createQuoteInMap.partyId" from-field="custRequest.fromPartyId"/>
         <set field="createQuoteInMap.productStoreId" from-field="custRequest.productStoreId"/>
+        <set field="createQuoteInMap.salesChannelEnumId" from-field="custRequest.salesChannelEnumId"/>
         <set field="createQuoteInMap.quoteName" from-field="custRequest.custRequestName"/>
         <set field="createQuoteInMap.description" from-field="custRequest.description"/>
         <set field="createQuoteInMap.currencyUomId" from-field="custRequest.maximumAmountUomId"/>

Modified: incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?view=diff&rev=450525&r1=450524&r2=450525
==============================================================================
--- incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original)
+++ incubator/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Wed Sep 27 10:54:52 2006
@@ -195,6 +195,7 @@
         <set field="createCustRequestInMap.custRequestName" from-field="parameters.custRequestName"/>
         <call-object-method obj-field-name="parameters.cart" method-name="getCurrency" ret-field-name="createCustRequestInMap.maximumAmountUomId"/>
         <call-object-method obj-field-name="parameters.cart" method-name="getProductStoreId" ret-field-name="createCustRequestInMap.productStoreId"/>
+        <call-object-method obj-field-name="parameters.cart" method-name="getChannelType" ret-field-name="createCustRequestInMap.salesChannelEnumId"/>
         <call-service service-name="createCustRequest" in-map-name="createCustRequestInMap">
             <result-to-field result-name="custRequestId" field-name="custRequestId"/>
         </call-service>

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?view=diff&rev=450525&r1=450524&r2=450525
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Wed Sep 27 10:54:52 2006
@@ -35,6 +35,14 @@
                 </entity-options>
             </drop-down>
         </field>
+        <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}" widget-style="selectBox">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                    <entity-constraint name="enumTypeId" value="ORDER_SALES_CHANNEL"/>
+                    <entity-order-by field-name="sequenceId"/>
+                </entity-options>
+            </drop-down>
+        </field>
         <field name="fromPartyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="custRequestCategoryId"><hidden/></field>
         <field name="priority"><hidden/></field>
@@ -127,6 +135,14 @@
         <field name="custRequestTypeId">
             <drop-down allow-empty="false">
                 <entity-options entity-name="CustRequestType" description="${description}"/>
+            </drop-down>
+        </field>
+        <field name="salesChannelEnumId" title="${uiLabelMap.OrderSalesChannel}" widget-style="selectBox">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+                    <entity-constraint name="enumTypeId" value="ORDER_SALES_CHANNEL"/>
+                    <entity-order-by field-name="sequenceId"/>
+                </entity-options>
             </drop-down>
         </field>
         <field name="custRequestCategoryId">