[OFBiz] SVN: r6088 - in trunk: applications/order/config applications/order/entitydef applications/order/webapp/ordermgr/order applications/party/entitydef framework/common/config

[jaz at svn.ofbiz.org]

Author: jaz
Date: 2005-11-07 15:14:02 -0600 (Mon, 07 Nov 2005)
New Revision: 6088

Modified:
   trunk/applications/order/config/OrderUiLabels.properties
   trunk/applications/order/entitydef/entitymodel.xml
   trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
   trunk/applications/party/entitydef/entitymodel.xml
   trunk/framework/common/config/CommonUiLabels.properties
Log:
added a few missing labels; few additional fields for integrations


Modified: trunk/applications/order/config/OrderUiLabels.properties
===================================================================
--- trunk/applications/order/config/OrderUiLabels.properties	2005-11-07 18:03:24 UTC (rev 6087)
+++ trunk/applications/order/config/OrderUiLabels.properties	2005-11-07 21:14:02 UTC (rev 6088)
@@ -84,6 +84,7 @@
 OrderIsThisGift = Is This a Gift?
 OrderIssuedToShipmentItem = Issued to Shipment Item
 OrderItemTotal = Item Total
+OrderItemsBackOrdered = Items Backordered
 OrderItemsOrdered = Items Ordered
 OrderItemsReturned = Items Returned
 OrderItemsSubTotal = Items SubTotal
@@ -127,7 +128,7 @@
 OrderOrderBillToParty = Bill To Party
 OrderOrderConfirmation = Order Confirmation
 OrderOrderDate = Order Date
-OrderOrdered=Ordered
+OrderOrdered = Ordered
 OrderOrderEntry = Order Entry
 OrderOrderEntryCustomerInfo = Order Entry Customer Info
 OrderOrderEntryOrderTerms = Order Entry Order Terms
@@ -189,7 +190,6 @@
 OrderOrderTerms = Order Terms
 OrderOrderTotal = Order Total
 OrderOrderType = Order Type
-OrderOrdered = Ordered
 OrderOriginFacility = Origin Facility
 OrderOverridePrice=Override Price
 OrderPONumber = PO Number
@@ -373,5 +373,5 @@
 OrderSendConfirmationEmail=Send a confirmation email
 OrderSendConfirmationEmailSendTo=Send To
 OrderSendConfirmationEmailCCTo=CC To
-OrderSendConfirmationEmailSubject=Subject 
+OrderSendConfirmationEmailSubject=Subject
 OrderSendConfirmationEmailNote=Note

Modified: trunk/applications/order/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/order/entitydef/entitymodel.xml	2005-11-07 18:03:24 UTC (rev 6087)
+++ trunk/applications/order/entitydef/entitymodel.xml	2005-11-07 21:14:02 UTC (rev 6088)
@@ -276,6 +276,7 @@
             title="Order Header Entity">
       <field name="orderId" type="id-ne"></field>
       <field name="orderTypeId" type="id"></field>
+      <field name="externalId" type="id"></field>
       <field name="salesChannelEnumId" type="id"></field>
       <field name="orderDate" type="date-time"></field>
       <field name="entryDate" type="date-time"></field>
@@ -293,6 +294,7 @@
       <field name="transactionId" type="id-long"></field>
       <field name="needsInventoryIssuance" type="indicator"></field>
       <field name="isRushOrder" type="indicator"></field>
+      <field name="internalCode" type="id-long"></field>
       <field name="remainingSubTotal" type="currency-amount"></field>
       <field name="grandTotal" type="currency-amount"></field>
       <prim-key field="orderId"/>
@@ -332,6 +334,9 @@
       <relation type="many" rel-entity-name="OrderItemAndShipGroupAssoc">
         <key-map field-name="orderId"/>
       </relation>
+      <index name="ORDEREXT_ID_IDX">
+        <index-field name="externalId"/>
+      </index>
     </entity>
     <entity entity-name="OrderHeaderNote"
             package-name="org.ofbiz.order.order"
@@ -390,7 +395,7 @@
       <field name="unitListPrice" type="currency-amount"></field>
       <field name="unitAverageCost" type="currency-amount"></field>
       <field name="unitRecurringPrice" type="currency-amount"></field>
-      <field name="isModifiedPrice" type="indicator"></field>		
+      <field name="isModifiedPrice" type="indicator"></field>
       <field name="recurringFreqUomId" type="id"></field>
       <field name="itemDescription" type="description"></field>
       <field name="comments" type="comment"></field>
@@ -1621,11 +1626,11 @@
             <key-map field-name="workEffortId"/>
         </relation>
     </entity>
-    
+
     <!-- ========================================================= -->
     <!-- org.ofbiz.order.requirement -->
     <!-- ========================================================= -->
-    
+
     <entity entity-name="DesiredFeature"
             package-name="org.ofbiz.order.requirement"
             title="Desired Feature Entity">
@@ -1880,7 +1885,7 @@
     <!-- ========================================================= -->
     <!-- org.ofbiz.order.return -->
     <!-- ========================================================= -->
-    
+
     <entity entity-name="ReturnHeader"
         package-name="org.ofbiz.order.return"
         title="Return Entity">
@@ -2032,7 +2037,7 @@
         <field name="sequenceId" type="id"></field>
         <prim-key field="returnTypeId"/>
     </entity>
-    
+
   <!-- ========================================================= -->
   <!-- org.ofbiz.order.shoppingcart -->
   <!-- ========================================================= -->

Modified: trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/order/findOrders.ftl	2005-11-07 18:03:24 UTC (rev 6087)
+++ trunk/applications/order/webapp/ordermgr/order/findOrders.ftl	2005-11-07 21:14:02 UTC (rev 6088)
@@ -328,7 +328,7 @@
           </td>
           <td width="5%" align="left"><div class="tableheadtext">${uiLabelMap.OrderOrderType}</div></td>
           <td width="5%" align="left"><div class="tableheadtext">${uiLabelMap.OrderOrderId}</div></td>
-          <td width="20%" align="left"><div class="tableheadtext">${uiLabelMap.PartyUserLoginId}</div></td>
+          <td width="20%" align="left"><div class="tableheadtext">${uiLabelMap.PartyName}</div></td>
           <td width="5%" align="right"><div class="tableheadtext">${uiLabelMap.OrderSurvey}</div></td>
           <td width="5%" align="right"><div class="tableheadtext">${uiLabelMap.OrderItemsOrdered}</div></td>
           <td width="5%" align="right"><div class="tableheadtext">${uiLabelMap.OrderItemsBackOrdered}</div></td>

Modified: trunk/applications/party/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/party/entitydef/entitymodel.xml	2005-11-07 18:03:24 UTC (rev 6087)
+++ trunk/applications/party/entitydef/entitymodel.xml	2005-11-07 21:14:02 UTC (rev 6088)
@@ -1018,7 +1018,7 @@
             <key-map field-name="contactMechId"/>
         </relation>
     </view-entity>
-    
+
   <!-- ========================================================= -->
   <!-- org.ofbiz.party.need -->
   <!-- ========================================================= -->
@@ -1124,7 +1124,7 @@
       <relation type="many" rel-entity-name="PartyTypeAttr">
         <key-map field-name="partyTypeId"/>
       </relation>
-      <index name="EXTERNAL_ID_IDX">
+      <index name="PARTYEXT_ID_IDX">
         <index-field name="externalId"/>
       </index>
     </entity>

Modified: trunk/framework/common/config/CommonUiLabels.properties
===================================================================
--- trunk/framework/common/config/CommonUiLabels.properties	2005-11-07 18:03:24 UTC (rev 6087)
+++ trunk/framework/common/config/CommonUiLabels.properties	2005-11-07 21:14:02 UTC (rev 6088)
@@ -110,6 +110,7 @@
 CommonCreated=Created
 CommonCreatedBy=Created By
 CommonCredit=Credit
+CommonCurrency=Currency
 CommonCurrent=Current
 CommonDatabaseProblem=Database Problem
 CommonDate=Date