You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/11/28 09:04:34 UTC

svn commit: r1207005 [7/9] - in /ofbiz/branches/jackrabbit20100709: ./ applications/accounting/config/ applications/accounting/servicedef/ applications/commonext/config/ applications/commonext/data/ applications/commonext/widget/ applications/content/ ...

Modified: ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml Mon Nov 28 08:04:21 2011
@@ -543,7 +543,7 @@
     <property key="FormFieldTitle_noteDateTime">
         <value xml:lang="de">Notizdatumszeit</value>
         <value xml:lang="en">Note Date Time</value>
-        <value xml:lang="">Date de la note</value>
+        <value xml:lang="fr">Date de la note</value>
         <value xml:lang="it">Data ora nota</value>
         <value xml:lang="nl">Notitiedatum-tijd</value>
         <value xml:lang="pt_BR">Data e hora da nota</value>
@@ -1065,6 +1065,7 @@
         <value xml:lang="zh_TW">採購列表ID</value>
     </property>
     <property key="FormFieldTitle_shoppingListItemSeqId">
+        <value xml:lang="de">Folgenummer Einkaufslistenposition</value>
         <value xml:lang="en">Shopping List Item Seq Id</value>
         <value xml:lang="fr">Ligne de liste d'achat</value>
         <value xml:lang="it">Seq. riga lista d'acquisto</value>
@@ -2315,6 +2316,7 @@
         <value xml:lang="zh_TW">紙箱</value>
     </property>
     <property key="OrderChangedByUser">
+        <value xml:lang="de">Von Benutzer geändert</value>
         <value xml:lang="en">Changed by user</value>
         <value xml:lang="fr">Par l'utilisateur</value>
     </property>
@@ -2530,7 +2532,8 @@
         <value xml:lang="zh_TW">開源軟件OFBiz家族的一部分</value>
     </property>
     <property key="OrderCompleteOrder">
-        <value xml:lang="de">Auftrag abschliessen</value>
+        <value xml:lang="de">Auftrag abschließen</value>
+        <value xml:lang="de_CH">Auftrag abschliessen</value>
         <value xml:lang="en">Complete Order</value>
         <value xml:lang="es">Cerrar el pedido</value>
         <value xml:lang="fr">Terminer la commande</value>
@@ -2850,6 +2853,8 @@
         <value xml:lang="zh_TW">新建報價明細</value>
     </property>
     <property key="OrderCreateOrderQuoteNote">
+        <value xml:lang="de">Neue Anmerkung zu Angebot erstellen</value>
+        <value xml:lang="de_CH">Neue Anmerkung zu Offerte erstellen</value>
         <value xml:lang="en">Create New Quote Note</value>
     </property>
     <property key="OrderCreateOrderQuoteRole">
@@ -5213,6 +5218,7 @@
         <value xml:lang="zh_TW">沒有有效位址</value>
     </property>
     <property key="OrderNoAgreementFoundWithIdNotDoingPromotions">
+        <value xml:lang="de">Keine Vereinbarung mit dieser ID gefunden. Es werden keine Aktion angewendet</value>
         <value xml:lang="en">No Agreement Found With Id Not Doing Promotions</value>
         <value xml:lang="fr">Pas d'accord trouvé avec cette référence. Aucune promotion activée</value>
         <value xml:lang="it">Nessun contratto trovato con questo id nessuna promozione verrà creata</value>
@@ -5221,6 +5227,7 @@
         <value xml:lang="zh_TW">找不到帶有不做促銷ID的合同</value>
     </property>
     <property key="OrderNoAgreementItemFoundForAgreementWithIdNotDoingPromotions">
+        <value xml:lang="de">Kein Vereinbarungselement mit dieser ID gefunden. Es werden keine Aktion angewendet</value>
         <value xml:lang="en">No Agreement Item Found With Id Not Doing Promotions</value>
         <value xml:lang="fr">Pas ligne d'accord trouvée avec cette référence. Aucune promotion activée</value>
         <value xml:lang="it">Nessuna riga contratto trovata con questo id nessuna promozione verrà creata</value>
@@ -5430,7 +5437,7 @@
     </property>
     <property key="OrderNoQuoteFound">
         <value xml:lang="de">Keine Angebote gefunden</value>
-        <value xml:lang="de_DE">Keine Angebote gefunden</value>
+        <value xml:lang="de_CH">Keine Offerten gefunden</value>
         <value xml:lang="en">No Quotes Found</value>
         <value xml:lang="es">No se ha enontrado un presupuesto.</value>
         <value xml:lang="fr">Aucun devis trouvé</value>
@@ -8170,7 +8177,7 @@
         <value xml:lang="zh_TW">這個訂單當前處于『有效』狀態。</value>
     </property>
     <property key="OrderProcessingInHold">
-        <value xml:lang="de">Dieser Auftrag ist aktuel im 'Warten' Status. Die Aktivität wurde ausgesetzt.</value>
+        <value xml:lang="de">Dieser Auftrag ist aktuell im 'Warten' Status. Die Aktivität wurde ausgesetzt.</value>
         <value xml:lang="en">This order is currently in a 'Hold' state. The activity has been suspended.</value>
         <value xml:lang="es">Este pedido se encuentra en estado 'En espera'</value>
         <value xml:lang="fr">Cette commande est actuellement dans un état «Bloquée». L'activité a été suspendue.</value>
@@ -10683,7 +10690,7 @@
         <value xml:lang="zh_TW">收件人</value>
     </property>
     <property key="OrderSendConfirmationEmailSubject">
-        <value xml:lang="de">Thema</value>
+        <value xml:lang="de">Betreff</value>
         <value xml:lang="en">Subject</value>
         <value xml:lang="es">Asunto</value>
         <value xml:lang="fr">Objet</value>
@@ -11099,6 +11106,7 @@
         <value xml:lang="zh_TW">遞送資訊</value>
     </property>
     <property key="OrderShippingNotes">
+        <value xml:lang="de">Anmerkungen zum Versand</value>
         <value xml:lang="en">Shipping Notes</value>
         <value xml:lang="fr">Note d'expédition</value>
         <value xml:lang="it">Note di spedizione</value>
@@ -11637,7 +11645,7 @@
         <value xml:lang="zh_TW">合計</value>
     </property>
     <property key="OrderTotalCubicSize">
-        <value xml:lang="de">Total Volumen</value>
+        <value xml:lang="de">Gesamtvolumen</value>
         <value xml:lang="en">Total Cubic Size</value>
         <value xml:lang="es">Volumen total</value>
         <value xml:lang="fr">Volume total</value>
@@ -11687,7 +11695,7 @@
         <value xml:lang="zh_TW">其他訂單調整合計</value>
     </property>
     <property key="OrderTotalQty">
-        <value xml:lang="de">Total Menge</value>
+        <value xml:lang="de">Gesamtmenge</value>
         <value xml:lang="en">Total Qty</value>
         <value xml:lang="es">Cant. Total</value>
         <value xml:lang="fr">Qté totale</value>
@@ -11808,7 +11816,7 @@
         <value xml:lang="zh_TW">發貨和包裝合計</value>
     </property>
     <property key="OrderTotalWeight">
-        <value xml:lang="de">Total Gewicht</value>
+        <value xml:lang="de">Gesamtgewicht</value>
         <value xml:lang="en">Total  Weight</value>
         <value xml:lang="es">Peso total</value>
         <value xml:lang="fr">Poids total</value>
@@ -11961,6 +11969,7 @@
         <value xml:lang="zh_TW">更新明細</value>
     </property>
     <property key="OrderUpdateReturnAdjustment">
+        <value xml:lang="de">Retourenanpassung mit Id:${returnAdjustmentId} zu Betrag ${amount} erfolgreich geändert.</value>
         <value xml:lang="en">Update ReturnAdjustment with Id:${returnAdjustmentId} to amount ${amount} successfully.</value>
         <value xml:lang="fr">La mise à jour de ligne d'ajustement de référence ${returnAdjustmentId} a été effectuée avec le montant ${amount}.</value>
         <value xml:lang="it">Aggiornato aggiustamento reso:${returnAdjustmentId} per l'importo ${amount} con successo.</value>
@@ -11999,7 +12008,7 @@
         <value xml:lang="zh_TW">作為下一條記錄的預設評論</value>
     </property>
     <property key="OrderUseDefaultDesiredDeliveryDate">
-        <value xml:lang="de">Als voreingestellten gewünschten Liefertermin für den nächsten EIntrag verwenden</value>
+        <value xml:lang="de">Als voreingestellten gewünschten Liefertermin für den nächsten Eintrag verwenden</value>
         <value xml:lang="en">Use as default desired delivery date for next entry</value>
         <value xml:lang="es">Usar como fecha de envío deseada por defecto para los siguientes ítems</value>
         <value xml:lang="fr">Utiliser par défaut la date d'expédition souhaitée pour les autres lignes</value>
@@ -12356,7 +12365,7 @@
         <value xml:lang="zh_TW">使用代碼</value>
     </property>
     <property key="OrderWorkEffortRequirements">
-        <value xml:lang="de">Bedürfnisse</value>
+        <value xml:lang="de">Bedarfe</value>
         <value xml:lang="en">Requirements</value>
         <value xml:lang="es">Requisitos</value>
         <value xml:lang="fr">Besoins</value>
@@ -12637,6 +12646,7 @@
         <value xml:lang="zh_TW">查詢退貨</value>
     </property>
     <property key="PageTitleListOrderHeaders">
+        <value xml:lang="de">Auftragsköpfe anzeigen</value>
         <value xml:lang="en">List Order Headers</value>
         <value xml:lang="fr">Liste des entêtes de commande</value>
         <value xml:lang="it">Lista testate ordini</value>
@@ -13033,9 +13043,11 @@
         <value xml:lang="zh_TW">瀏覽要求</value>
     </property>
     <property key="QuoteEditNote">
+        <value xml:lang="de">Anmerkung bearbeiten</value>
         <value xml:lang="en">Update Note</value>
     </property>
     <property key="OrderRent">
+        <value xml:lang="de">Miete</value>
         <value xml:lang="en">Rent</value>
     </property>
 </resource>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel.xml Mon Nov 28 08:04:21 2011
@@ -2877,285 +2877,5 @@ under the License.
         </relation>
     </entity>
 
-  <!-- ========================================================= -->
-  <!-- org.ofbiz.order.opportunity -->
-  <!-- ========================================================= -->
-
-    <entity entity-name="SalesOpportunity"
-            package-name="org.ofbiz.order.opportunity"
-            title="Main entity of information about sales opportunities">
-        <field name="salesOpportunityId" type="id-ne"></field>
-        <field name="opportunityName" type="name"></field>
-        <field name="description" type="very-long"/>
-        <field name="nextStep" type="very-long"/>
-        <field name="estimatedAmount" type="currency-amount"/>
-        <field name="estimatedProbability" type="fixed-point"/>
-        <field name="currencyUomId" type="id-ne"/>
-        <field name="marketingCampaignId" type="id-ne"/>
-        <field name="dataSourceId" type="id-ne"/>
-        <field name="estimatedCloseDate" type="date-time"/>
-        <field name="opportunityStageId" type="id-ne"/>
-        <field name="typeEnumId" type="id-ne"/>
-        <field name="createdByUserLogin" type="id-vlong"/>
-        <prim-key field="salesOpportunityId"/>
-        <relation fk-name="SLSOPP_CRNCY_UOM" rel-entity-name="Uom" type="one">
-            <key-map field-name="currencyUomId" rel-field-name="uomId"/>
-        </relation>
-        <relation fk-name="SLSOPP_STAGE" rel-entity-name="SalesOpportunityStage" type="one">
-            <key-map field-name="opportunityStageId"/>
-        </relation>
-        <relation title="Type" fk-name="SLSOPP_TYP_ENUM" rel-entity-name="Enumeration" type="one">
-            <key-map field-name="typeEnumId" rel-field-name="enumId"/>
-        </relation>
-        <relation fk-name="SLSOPP_MKTGCMPG" rel-entity-name="MarketingCampaign" type="one">
-            <key-map field-name="marketingCampaignId"/>
-        </relation>
-        <relation fk-name="SLSOPP_USRLGN" rel-entity-name="UserLogin" type="one">
-            <key-map field-name="createdByUserLogin" rel-field-name="userLoginId"/>
-        </relation>
-    </entity>
-
-    <entity entity-name="SalesOpportunityHistory"
-            package-name="org.ofbiz.order.opportunity"
-            title="Tracks a history of sales opportunity information">
-        <field name="salesOpportunityHistoryId" type="id-ne"></field>
-        <field name="salesOpportunityId" type="id-ne"></field>
-        <field name="description" type="very-long"/>
-        <field name="nextStep" type="very-long"/>
-        <field name="estimatedAmount" type="currency-amount"/>
-        <field name="estimatedProbability" type="fixed-point"/>
-        <field name="currencyUomId" type="id-ne"/>
-        <field name="estimatedCloseDate" type="date-time"/>
-        <field name="opportunityStageId" type="id-ne"/>
-        <field name="changeNote" type="very-long">
-            <description>Used to track a reason for this change</description> <!-- maybe one day this should be a link to NoteData -->
-        </field>
-        <field name="modifiedByUserLogin" type="id-vlong"/>
-        <field name="modifiedTimestamp" type="date-time"/>
-        <prim-key field="salesOpportunityHistoryId"/>
-        <relation fk-name="SLOPHI_CRNCY_UOM" rel-entity-name="Uom" type="one">
-            <key-map field-name="currencyUomId" rel-field-name="uomId"/>
-        </relation>
-        <relation fk-name="SLOPHI_STAGE" rel-entity-name="SalesOpportunityStage" type="one">
-            <key-map field-name="opportunityStageId"/>
-        </relation>
-        <relation fk-name="SLOPHI_SLSOPP" rel-entity-name="SalesOpportunity" type="one">
-            <key-map field-name="salesOpportunityId"/>
-        </relation>
-        <relation fk-name="SLOPHI_USRLGN" rel-entity-name="UserLogin" type="one">
-            <key-map field-name="modifiedByUserLogin" rel-field-name="userLoginId"/>
-        </relation>
-    </entity>
-
-    <entity entity-name="SalesOpportunityRole"
-            package-name="org.ofbiz.order.opportunity"
-            title="Describes roles of different parties involved in a sales opportunity">
-        <field name="salesOpportunityId" type="id-ne"></field>
-        <field name="partyId" type="id-ne"></field>
-        <field name="roleTypeId" type="id-ne"/>
-        <!-- it may be nice to add fromDate and thruDate at some point to track changing roles if that's ever important -->
-        <prim-key field="salesOpportunityId"/>
-        <prim-key field="partyId"/>
-        <prim-key field="roleTypeId"/>
-        <relation fk-name="SLSOPPRL_SLSOPP" rel-entity-name="SalesOpportunity" type="one">
-            <key-map field-name="salesOpportunityId"/>
-        </relation>
-        <relation fk-name="SLSOPPRL_PARTY" rel-entity-name="Party" type="one">
-            <key-map field-name="partyId"/>
-        </relation>
-        <relation fk-name="SLSOPPRL_ROLETYPE" rel-entity-name="RoleType" type="one">
-            <key-map field-name="roleTypeId"/>
-        </relation>
-        <relation fk-name="SLSOPPRL_PTYROLE" rel-entity-name="PartyRole" type="one"> <!-- make sure the party actually is in the role specified -->
-            <key-map field-name="partyId"/>
-            <key-map field-name="roleTypeId"/>
-        </relation>
-    </entity>
-
-    <view-entity entity-name="SalesOpportunityAndRole" package-name="org.ofbiz.order.opportunity" title="SalesOpportunity And Role View Entity">
-      <member-entity entity-alias="SO" entity-name="SalesOpportunity"/>
-      <member-entity entity-alias="SR" entity-name="SalesOpportunityRole"/>
-      <alias-all entity-alias="SO"/>
-      <alias name="partyId" entity-alias="SR"/>
-      <alias name="roleTypeId" entity-alias="SR"/>
-      <view-link entity-alias="SO" rel-entity-alias="SR">
-        <key-map field-name="salesOpportunityId"/>
-      </view-link>
-    </view-entity>
-
-    <entity entity-name="SalesOpportunityStage"
-            package-name="org.ofbiz.order.opportunity"
-            title="Describes stages of a sales opportunity with associated probability factors.">
-        <field name="opportunityStageId" type="id-ne"></field>
-        <field name="description" type="description"/>
-        <field name="defaultProbability" type="fixed-point"/>
-        <field name="sequenceNum" type="numeric"/>
-        <prim-key field="opportunityStageId"/>
-    </entity>
-
-    <entity entity-name="SalesOpportunityWorkEffort"
-            package-name="org.ofbiz.order.opportunity"
-            title="Relates sales opportunities to their work efforts.">
-        <field name="salesOpportunityId" type="id-ne"></field>
-        <field name="workEffortId" type="id-ne"></field>
-        <prim-key field="salesOpportunityId"/>
-        <prim-key field="workEffortId"/>
-        <relation type="one" fk-name="SOPPWEFF_SOPP" rel-entity-name="SalesOpportunity">
-            <key-map field-name="salesOpportunityId"/>
-        </relation>
-        <relation type="one" fk-name="SOPPWEFF_WEFF" rel-entity-name="WorkEffort">
-            <key-map field-name="workEffortId"/>
-        </relation>
-    </entity>
-
-    <entity entity-name="SalesOpportunityQuote"
-            package-name="org.ofbiz.order.opportunity"
-            title="Relates sales opportunities to their quotes.">
-        <field name="salesOpportunityId" type="id-ne"></field>
-        <field name="quoteId" type="id-ne"></field>
-        <prim-key field="salesOpportunityId"/>
-        <prim-key field="quoteId"/>
-        <relation type="one" fk-name="SOPPQTE_SOPP" rel-entity-name="SalesOpportunity">
-            <key-map field-name="salesOpportunityId"/>
-        </relation>
-        <relation type="one" fk-name="SOPPQTE_QTE" rel-entity-name="Quote">
-            <key-map field-name="quoteId"/>
-        </relation>
-    </entity>
-
-    <entity entity-name="SalesForecast"
-            package-name="org.ofbiz.order.opportunity"
-            title="Stores sales forecast data for sales opportunities.">
-        <field name="salesForecastId" type="id-ne"></field>
-        <field name="parentSalesForecastId" type="id"></field>
-        <field name="organizationPartyId" type="id"></field>
-        <field name="internalPartyId" type="id"></field>
-        <field name="customTimePeriodId" type="id"></field>
-        <field name="currencyUomId" type="id"></field>
-        <field name="quotaAmount" type="currency-amount"></field>
-        <field name="forecastAmount" type="currency-amount"></field>
-        <field name="bestCaseAmount" type="currency-amount"></field>
-        <field name="closedAmount" type="currency-amount"/>
-        <field name="percentOfQuotaForecast" type="fixed-point"/>
-        <field name="percentOfQuotaClosed" type="fixed-point"/>
-        <field name="pipelineAmount" type="currency-amount"></field>
-        <field name="createdByUserLoginId" type="id-vlong"></field>
-        <field name="modifiedByUserLoginId" type="id-vlong"></field>
-        <prim-key field="salesForecastId"/>
-        <relation type="one" fk-name="SALES4C_PARENT" title="Parent" rel-entity-name="SalesForecast">
-            <key-map field-name="parentSalesForecastId" rel-field-name="salesForecastId"/>
-        </relation>
-        <relation type="one" fk-name="SALES4C_ORG_PARTY" title="Organization" rel-entity-name="Party">
-            <key-map field-name="organizationPartyId" rel-field-name="partyId"/>
-        </relation>
-        <relation type="one" fk-name="SALES4C_INT_PARTY" title="Internal" rel-entity-name="Party">
-            <key-map field-name="internalPartyId" rel-field-name="partyId"/>
-        </relation>
-        <relation type="one" fk-name="SALES4C_TIME_PER" rel-entity-name="CustomTimePeriod">
-            <key-map field-name="customTimePeriodId"/>
-        </relation>
-        <relation type="one" fk-name="SALES4C_CUR_UOM" rel-entity-name="Uom">
-            <key-map field-name="currencyUomId" rel-field-name="uomId"/>
-        </relation>
-        <relation type="one" fk-name="SALES4C_CRT_USER" title="CreatedBy" rel-entity-name="UserLogin">
-            <key-map field-name="createdByUserLoginId" rel-field-name="userLoginId"/>
-        </relation>
-        <relation type="one" fk-name="SALES4C_MOD_USER" title="ModifiedBy" rel-entity-name="UserLogin">
-            <key-map field-name="modifiedByUserLoginId" rel-field-name="userLoginId"/>
-        </relation>
-    </entity>
-
-    <entity entity-name="SalesForecastDetail"
-            package-name="org.ofbiz.order.opportunity"
-            title="Stores Details of Resourses of Sales Forecast for simulation of MRP">
-        <field name="salesForecastId" type="id-ne"/>
-        <field name="salesForecastDetailId" type="id-ne"/>
-        <field name="amount" type="currency-amount"/>
-        <field name="quantityUomId" type="id"/>
-        <field name="quantity" type="fixed-point"/>
-        <field name="productId" type="id"/>
-        <field name="productCategoryId" type="id"/>
-        <prim-key field="salesForecastId"/>
-        <prim-key field="salesForecastDetailId"/>
-        <relation type="one" fk-name="SALES4CDTL_SALES4C" rel-entity-name="SalesForecast">
-            <key-map field-name="salesForecastId"/>
-        </relation>
-        <relation type="one" fk-name="SALES4CDTL_QTY_UOM" title="Quantity" rel-entity-name="Uom">
-            <key-map field-name="quantityUomId" rel-field-name="uomId"/>
-        </relation>
-        <relation type="one" fk-name="SALES4CDTL_PROD" rel-entity-name="Product">
-            <key-map field-name="productId"/>
-        </relation>
-        <relation type="one" fk-name="SALES4CDTL_PCTGRY" rel-entity-name="ProductCategory">
-            <key-map field-name="productCategoryId"/>
-        </relation>
-    </entity>
-
-    <entity entity-name="SalesForecastHistory"
-            package-name="org.ofbiz.order.opportunity"
-            title="Keeps a record of changes to a sales forecast.">
-        <field name="salesForecastHistoryId" type="id-ne"></field>
-        <field name="salesForecastId" type="id-ne"></field>
-        <field name="parentSalesForecastId" type="id"></field>
-        <field name="organizationPartyId" type="id"></field>
-        <field name="internalPartyId" type="id"></field>
-        <field name="customTimePeriodId" type="id"></field>
-        <field name="currencyUomId" type="id"></field>
-        <field name="quotaAmount" type="currency-amount"></field>
-        <field name="forecastAmount" type="currency-amount"></field>
-        <field name="bestCaseAmount" type="currency-amount"></field>
-        <field name="closedAmount" type="currency-amount"/>
-        <field name="percentOfQuotaForecast" type="fixed-point"/>
-        <field name="percentOfQuotaClosed" type="fixed-point"/>
-        <field name="changeNote" type="very-long">
-            <description>Used to track a reason for this change</description> <!-- maybe one day this should be a link to NoteData -->
-        </field>
-        <field name="modifiedByUserLoginId" type="id-vlong"></field>
-        <field name="modifiedTimestamp" type="date-time"/>
-        <prim-key field="salesForecastHistoryId"/>
-        <relation type="one" fk-name="SALES4CH_SALES4C" rel-entity-name="SalesForecast">
-            <key-map field-name="salesForecastId"/>
-        </relation>
-        <relation type="one" fk-name="SALES4CH_ORG_PARTY" title="Organization" rel-entity-name="Party">
-            <key-map field-name="organizationPartyId" rel-field-name="partyId"/>
-        </relation>
-        <relation type="one" fk-name="SALES4CH_INT_PARTY" title="Internal" rel-entity-name="Party">
-            <key-map field-name="internalPartyId" rel-field-name="partyId"/>
-        </relation>
-        <relation type="one" fk-name="SALES4CH_TIME_PER" rel-entity-name="CustomTimePeriod">
-            <key-map field-name="customTimePeriodId"/>
-        </relation>
-        <relation type="one" fk-name="SALES4CH_CUR_UOM" rel-entity-name="Uom">
-            <key-map field-name="currencyUomId" rel-field-name="uomId"/>
-        </relation>
-        <relation type="one" fk-name="SALES4CH_MOD_USER" title="ModifiedBy" rel-entity-name="UserLogin">
-            <key-map field-name="modifiedByUserLoginId" rel-field-name="userLoginId"/>
-        </relation>
-    </entity>
-    <entity entity-name="SalesOpportunityCompetitor"
-            package-name="org.ofbiz.order.opportunity"
-            title="Sales opportunity competitors record">
-        <field name="salesOpportunityId" type="id-ne"></field>
-        <field name="competitorPartyId" type="id-ne"></field>
-        <field name="positionEnumId" type="id-ne"></field>
-        <field name="strengths" type="very-long"></field>
-        <field name="weaknesses" type="very-long"></field>
-        <prim-key field="salesOpportunityId"/>
-        <prim-key field="competitorPartyId"/>
-        <relation type="one" fk-name="SOPPCOMP_SOPP" rel-entity-name="SalesOpportunity">
-            <key-map field-name="salesOpportunityId"/>
-        </relation>
-    </entity>
-    <entity entity-name="SalesOpportunityTrckCode"
-            package-name="org.ofbiz.order.opportunity"
-            title="Sales opportunity traking code">
-        <field name="salesOpportunityId" type="id-ne"></field>
-        <field name="trackingCodeId" type="id-ne"></field>
-        <field name="receivedDate" type="date-time"></field>
-        <prim-key field="salesOpportunityId"/>
-        <prim-key field="trackingCodeId"/>
-        <relation type="one" fk-name="SOPPTRKCD_SOPP" rel-entity-name="SalesOpportunity">
-            <key-map field-name="salesOpportunityId"/>
-        </relation>
-    </entity>
-</entitymodel>
+ </entitymodel>
+ 
\ No newline at end of file

Modified: ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel_view.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel_view.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/entitydef/entitymodel_view.xml Mon Nov 28 08:04:21 2011
@@ -36,6 +36,7 @@ under the License.
   <!--  - org.ofbiz.order.request -->
   <!--  - org.ofbiz.order.shoppingcart -->
   <!--  - org.ofbiz.order.shoppinglist -->
+  <!--  - org.ofbiz.order.communication -->
   <!-- ========================================================= -->
 
 
@@ -1589,22 +1590,9 @@ under the License.
     </view-entity>
 
   <!-- ========================================================= -->
-  <!-- org.ofbiz.order.opportunity -->
+  <!-- org.ofbiz.order.communication -->
   <!-- ========================================================= -->
 
-    <view-entity entity-name="SalesForecastAndCustomTimePeriod"
-            package-name="org.ofbiz.order.opportunity"
-            title="View for selecting the forecast with its time period.">
-      <member-entity entity-alias="SF" entity-name="SalesForecast"/>
-      <member-entity entity-alias="CTP" entity-name="CustomTimePeriod"/>
-      <alias-all entity-alias="SF"/>
-      <alias-all entity-alias="CTP">
-          <exclude field="organizationPartyId"/>
-      </alias-all>
-      <view-link entity-alias="SF" rel-entity-alias="CTP">
-        <key-map field-name="customTimePeriodId"/>
-      </view-link>
-    </view-entity>
     <view-entity entity-name="CommunicationEventAndOrder"
                  package-name="org.ofbiz.order.communication"
                  title="Communication Event And Order View Entity">

Modified: ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/order/CheckoutServices.xml Mon Nov 28 08:04:21 2011
@@ -67,6 +67,7 @@ under the License.
         <set field="createUpdatePartyTelecomNumberCtx.partyId" from-field="partyId"/>
         <set field="createUpdatePartyTelecomNumberCtx.roleTypeId" value="CUSTOMER"/>
         <set field="createUpdatePartyTelecomNumberCtx.contactMechPurposeTypeId" value="PHONE_SHIPPING"/>
+        <set field="createUpdatePartyTelecomNumberCtx.contactMechId" from-field="parameters.shipToPhoneContactMechId" />
         <call-service service-name="createUpdatePartyTelecomNumber" in-map-name="createUpdatePartyTelecomNumberCtx">
             <result-to-field result-name="contactMechId" field="shipToPhoneContactMechId"/>
             <result-to-result result-name="contactMechId" service-result-name="shipToPhoneContactMechId"/>
@@ -160,6 +161,7 @@ under the License.
         <set field="createUpdatePartyTelecomNumberCtx.partyId" from-field="partyId"/>
         <set field="createUpdatePartyTelecomNumberCtx.roleTypeId" value="CUSTOMER"/>
         <set field="createUpdatePartyTelecomNumberCtx.contactMechPurposeTypeId" value="PHONE_BILLING"/>
+        <set field="createUpdatePartyTelecomNumberCtx.contactMechId" from-field="parameters.billToPhoneContactMechId" />
         <call-service service-name="createUpdatePartyTelecomNumber" in-map-name="createUpdatePartyTelecomNumberCtx">
             <result-to-field result-name="contactMechId" field="billToPhoneContactMechId"/>
             <result-to-result result-name="contactMechId" service-result-name="billToPhoneContactMechId"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/servicedef/secas.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/servicedef/secas.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/servicedef/secas.xml Mon Nov 28 08:04:21 2011
@@ -430,4 +430,10 @@ under the License.
         <condition field-name="paymentId" operator="is-not-empty"/>
         <action service="createOrderPaymentApplication" mode="sync"/>
     </eca>
+
+    <!-- Group Buying -->
+    <eca service="storeOrder" event="commit">
+        <condition field-name="orderTypeId" operator="equals" value="SALES_ORDER"/>
+        <action service="checkOrderItemForProductGroupOrder" mode="sync"/>
+    </eca>
 </service-eca>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/servicedef/services.xml Mon Nov 28 08:04:21 2011
@@ -1127,4 +1127,21 @@ under the License.
          location="component://order/script/org/ofbiz/order/test/ShoppingCartTests.xml" invoke="testCreateOrderRentalProduct">
          <description>Create Test Order Rental of an asset which is shipped from and returned to inventory</description>
     </service>
+    
+    <!-- Order Item Attribute -->
+    <service name="createOrderItemAttribute" engine="entity-auto" default-entity-name="OrderItemAttribute" invoke="create" auth="true">
+        <description>Create Order Item Attribute</description>
+        <auto-attributes mode="IN" entity-name="OrderItemAttribute" include="pk" optional="false"/>
+        <auto-attributes mode="IN" entity-name="OrderItemAttribute" include="nonpk" optional="true"/>
+    </service>
+    <service name="updateOrderItemAttribute" engine="entity-auto" default-entity-name="OrderItemAttribute" invoke="update" auth="true">
+        <description>Update Order Item Attribute</description>
+        <auto-attributes mode="IN" entity-name="OrderItemAttribute" include="pk" optional="false"/>
+        <auto-attributes mode="IN" entity-name="OrderItemAttribute" include="nonpk" optional="true"/>
+    </service>
+    <service name="deleteOrderItemAttribute" engine="entity-auto" default-entity-name="OrderItemAttribute" invoke="delete" auth="true">
+        <description>Delete Order Item Attribute</description>
+        <auto-attributes mode="IN" entity-name="OrderItemAttribute" include="pk" optional="false"/>
+    </service>
+    
 </services>

Modified: ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Mon Nov 28 08:04:21 2011
@@ -124,7 +124,53 @@ under the License.
           <#if !paymentMethod?has_content>
             <#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType")>
             <#if paymentMethodType.paymentMethodTypeId == "EXT_BILLACT">
-              <#assign outputted = "false">
+                <#assign outputted = "false">
+                <#-- billing account -->
+                <#if billingAccount?exists>
+                  <#if outputted?default("false") == "true">
+                    <tr><td colspan="4"><hr /></td></tr>
+                  </#if>
+                  <tr>
+                    <td align="right" valign="top" width="29%">
+                      <#-- billing accounts require a special OrderPaymentPreference because it is skipped from above section of OPPs -->
+                      <div>&nbsp;<span class="label">${uiLabelMap.AccountingBillingAccount}</span>&nbsp;
+                          <#if billingAccountMaxAmount?has_content>
+                          <br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=billingAccountMaxAmount?default(0.00) isoCode=currencyUomId/>
+                          </#if>
+                          </div>
+                    </td>
+                    <td width="1%">&nbsp;</td>
+                    <td valign="top" width="60%">
+                        <table class="basic-table" cellspacing='0'>
+                            <tr>
+                                <td valign="top">
+                                    ${uiLabelMap.CommonNbr}<a href="/accounting/control/EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}&amp;externalLoginKey=${externalLoginKey}" class="buttontext">${billingAccount.billingAccountId}</a>  - ${billingAccount.description?if_exists}
+                                </td>
+                                <td valign="top" align="right">
+                                    <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED" && orderPaymentPreference.statusId != "PAYMENT_RECEIVED">
+                                        <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.AccountingReceivePayment}</a>
+                                    </#if>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                    <td width="10%">
+                        <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))>
+                            <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
+                              <div>
+                                <a href="javascript:document.CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a>
+                                <form name="CancelOrderPaymentPreference_${orderPaymentPreference.orderPaymentPreferenceId}" method="post" action="<@o...@ofbizUrl>">
+                                  <input type="hidden" name="orderId" value="${orderId}" />
+                                  <input type="hidden" name="orderPaymentPreferenceId" value="${orderPaymentPreference.orderPaymentPreferenceId}" />
+                                  <input type="hidden" name="statusId" value="PAYMENT_CANCELLED" />
+                                  <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId?if_exists}" />
+                                </form>
+                              </div>
+                            </#if>
+                        </#if>
+                    </td>
+                  </tr>
+                </#if>
             <#elseif paymentMethodType.paymentMethodTypeId == "FIN_ACCOUNT">
               <#assign finAccount = orderPaymentPreference.getRelatedOne("FinAccount")?if_exists/>
               <#if (finAccount?has_content)>
@@ -503,27 +549,6 @@ under the License.
           </#if>
         </#list>
 
-        <#-- billing account -->
-        <#if billingAccount?exists>
-          <#if outputted?default("false") == "true">
-            <tr><td colspan="4"><hr /></td></tr>
-          </#if>
-          <tr>
-            <td align="right" valign="top" width="29%">
-              <#-- billing accounts require a special OrderPaymentPreference because it is skipped from above section of OPPs -->
-              <div>&nbsp;<span class="label">${uiLabelMap.AccountingBillingAccount}</span>&nbsp;
-                  <#if billingAccountMaxAmount?has_content>
-                  <br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=billingAccountMaxAmount?default(0.00) isoCode=currencyUomId/>
-                  </#if>
-                  </div>
-            </td>
-            <td width="1%">&nbsp;</td>
-            <td valign="top" width="60%">
-                ${uiLabelMap.CommonNbr}<a href="/accounting/control/EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}&amp;externalLoginKey=${externalLoginKey}" class="buttontext">${billingAccount.billingAccountId}</a>  - ${billingAccount.description?if_exists}
-            </td>
-            <td width="10%">&nbsp;</td>
-          </tr>
-        </#if>
         <#if customerPoNumber?has_content>
           <tr><td colspan="4"><hr /></td></tr>
           <tr>

Modified: ofbiz/branches/jackrabbit20100709/applications/party/data/PartyDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/data/PartyDemoData.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/party/data/PartyDemoData.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/party/data/PartyDemoData.xml Mon Nov 28 08:04:21 2011
@@ -47,4 +47,10 @@
 
     <!-- new registration notification -->
     <EmailTemplateSetting emailTemplateSettingId="PARTY_REGISTER" bodyScreenLocation="component://party/widget/partymgr/PartyScreens.xml#CreateUserNotification" subject="New Account Created" bccAddress="ofbiztest@example.com" fromAddress="ofbiztest@example.com"/>
+
+	<!-- make admin an employee of Company -->
+    <PartyRole partyId="admin" roleTypeId="CONTACT"/>
+    <PartyRole partyId="Company" roleTypeId="ACCOUNT"/>
+    <PartyRelationship partyIdFrom="Company" roleTypeIdFrom="ACCOUNT" partyIdTo="admin" roleTypeIdTo="CONTACT" fromDate="2000-01-01 00:00:00.000" partyRelationshipTypeId="EMPLOYMENT"/>
+	
 </entity-engine-xml>

Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml Mon Nov 28 08:04:21 2011
@@ -24,20 +24,27 @@
         <value xml:lang="en">Add new Product Feature to current product</value>
     </property>
     <property key="CatalogWebAnalytics">
+        <value xml:lang="de">Web Analytik</value>
         <value xml:lang="en">Web Analytics</value>
         <value xml:lang="it">Analisi Web</value>
         <value xml:lang="zh_TW">網站分析</value>
     </property>
     <property key="CatalogWebAnalyticsConfigs">
+        <value xml:lang="de">Web Analytik Konfiguration</value>
         <value xml:lang="en">Web Analytics Configuration</value>
         <value xml:lang="it">Configurazione analisi Web</value>
         <value xml:lang="zh_TW">網站分析配置</value>
     </property>
     <property key="CatalogWebAnalyticsTypes">
+        <value xml:lang="de">Web Analytik Typen</value>
         <value xml:lang="en">Web Analytics Types</value>
         <value xml:lang="it">Tipi di analisi Web</value>
         <value xml:lang="zh_TW">網站分析型態</value>
     </property>
+    <property key="CatalogWebAnalyticsType">
+        <value xml:lang="de">Web Analytik Typ</value>
+        <value xml:lang="en">Web Analytics Type</value>
+    </property>
     <property key="CreateNewProductFeatureType">
         <value xml:lang="de">Neuen Merkmaltyp erstellen</value>
         <value xml:lang="en">Create New Product Feature Type</value>
@@ -5755,6 +5762,10 @@
         <value xml:lang="zh">视觉风格</value>
         <value xml:lang="zh_TW">視覺風格</value>
     </property>
+    <property key="FormFieldTitle_webAnalyticsCode">
+        <value xml:lang="de">Web Analytik Code</value>
+        <value xml:lang="en">Web Analytics Code</value>
+    </property>
     <property key="FormFieldTitle_weightBreakId">
         <value xml:lang="de">Gewicht Sprung ID</value>
         <value xml:lang="en">Weight Break Id</value>
@@ -7576,11 +7587,18 @@
         <value xml:lang="zh">编辑经销商产品</value>
         <value xml:lang="zh_TW">編輯經銷商產品</value>
     </property>
+    <property key="PageTitleEditWebAnalyticsConfig">
+        <value xml:lang="de">Web Analytik Konfiguration</value>
+        <value xml:lang="en">Edit Web Analytics Configuration</value>
+        <value xml:lang="it">Aggiorna configurazione analisi Web</value>
+    </property>
     <property key="PageTitleEditWebAnalyticsConfigs">
+        <value xml:lang="de">Web Analytik Konfiguration bearbeiten</value>
         <value xml:lang="en">Edit Web Analytics Configuration</value>
         <value xml:lang="it">Aggiorna configurazione analisi Web</value>
     </property>
     <property key="PageTitleEditWebAnalyticsTypes">
+        <value xml:lang="de">Web Analytik Typ bearbeiten</value>
         <value xml:lang="en">Edit Web Analytics Types</value>
         <value xml:lang="it">Aggiorna tipi di analisi Web</value>
     </property>
@@ -7595,6 +7613,7 @@
         <value xml:lang="en">Facility Geo Location</value>
     </property>
     <property key="PageTitleFindCategory">
+        <value xml:lang="de">Kategorie suchen</value>
         <value xml:lang="en">Find Category</value>
         <value xml:lang="th">ค้นหาหมวดหมู่</value>
     </property>
@@ -7797,10 +7816,12 @@
         <value xml:lang="zh_TW">查找訂閱資源</value>
     </property>
     <property key="PageTitleFindWebAnalyticsConfigs">
+        <value xml:lang="de">Web Analytik Einstellungen suchen</value>
         <value xml:lang="en">Find Web Analytics Configuration</value>
         <value xml:lang="it">Ricerca configurazioni analisi Web</value>
     </property>
     <property key="PageTitleFindWebAnalyticsTypes">
+        <value xml:lang="de">Web Analytik Typen suchen</value>
         <value xml:lang="en">Find Web Analytics Types</value>
         <value xml:lang="it">Ricerca tipi di analisi Web</value>
     </property>
@@ -8866,6 +8887,9 @@
         <value xml:lang="zh">添加总账账户</value>
         <value xml:lang="zh_TW">添加總賬賬戶</value>
     </property>
+    <property key="ProductAddGroupOrder">
+        <value xml:lang="en">Add GroupOrder</value>
+    </property>
     <property key="ProductAddItemsFromInventory">
         <value xml:lang="de">Positionen vom Bestand hinzufügen</value>
         <value xml:lang="en">Add Items From Inventory</value>
@@ -11951,6 +11975,15 @@
         <value xml:lang="zh">货运天数</value>
         <value xml:lang="zh_TW">貨運天數</value>
     </property>
+    <property key="ProductDealEndDate">
+        <value xml:lang="en">Deal End Date</value>
+    </property>
+    <property key="ProductDealQuantity">
+        <value xml:lang="en">Deal Quantity</value>
+    </property>
+    <property key="ProductDealStartDate">
+        <value xml:lang="en">Deal Start Date</value>
+    </property>
     <property key="ProductDefaultAmount">
         <value xml:lang="de">Standart Betrag</value>
         <value xml:lang="en">Default Amount</value>
@@ -12421,6 +12454,9 @@
         <value xml:lang="zh">编辑特征：特征分类</value>
         <value xml:lang="zh_TW">特性分類的特性修改</value>
     </property>
+    <property key="ProductEditGroupOrder">
+        <value xml:lang="en">Edit GroupOrder</value>
+    </property>
     <property key="ProductEditInventoryItemWithId">
         <value xml:lang="de">Bestandsposition bearbeiten mit der ID</value>
         <value xml:lang="en">Edit Inventory Item with ID</value>
@@ -14087,6 +14123,9 @@
         <value xml:lang="zh">组成员维护</value>
         <value xml:lang="zh_TW">組成員維護</value>
     </property>
+    <property key="ProductGroupOrder">
+        <value xml:lang="en">GroupOrder</value>
+    </property>
     <property key="ProductGroupRollupChildGroupsAdd">
         <value xml:lang="de">Gruppe Rollup: Untergeordnete Gruppe hinzufügen</value>
         <value xml:lang="en">Group Rollup : Add Child Groups</value>
@@ -23013,6 +23052,9 @@
         <value xml:lang="zh">软标识</value>
         <value xml:lang="zh_TW">軟式ID</value>
     </property>
+    <property key="ProductSoldQuantity">
+        <value xml:lang="en">Sold Quantity</value>
+    </property>
     <property key="ProductSortOrder">
         <value xml:lang="cs">Pořadí řazení</value>
         <value xml:lang="de">Sortierungsreihenfolge</value>

Modified: ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/data/ProductTypeData.xml Mon Nov 28 08:04:21 2011
@@ -602,10 +602,6 @@ under the License.
     <!-- product subscription type -->
     <SubscriptionType description="Product" hasTable="N" parentTypeId="" subscriptionTypeId="PRODUCT_SUBSCR"/>
 
-    <WebAnalyticsType description="Web Analytics" hasTable="N" parentTypeId="" webAnalyticsTypeId="WEB_ANALYTICS"/>
-    <WebAnalyticsType webAnalyticsTypeId="GOOGLE_ANALYTICS" parentTypeId="WEB_ANALYTICS" hasTable="N" description="Google Analytics"/>
-    <WebAnalyticsType webAnalyticsTypeId="BING_ANALYTICS" parentTypeId="WEB_ANALYTICS" hasTable="N" description="Bing Analytics"/>
-    
     <!-- Image Management -->
     <RoleType roleTypeId="IMAGEAPPROVER" hasTable="N" description="Image Approver"/>
     

Modified: ofbiz/branches/jackrabbit20100709/applications/product/entitydef/eecas.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/entitydef/eecas.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/entitydef/eecas.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/entitydef/eecas.xml Mon Nov 28 08:04:21 2011
@@ -70,4 +70,9 @@ under the License.
         <condition field-name="availableToPromiseDiff" operator="not-equals" value="0" type="BigDecimal"/>
         <action service="setLastInventoryCount" mode="sync"/>
     </eca>
+
+    <!-- Product GroupOrder ECAs -->
+    <eca entity="ProductGroupOrder" operation="create" event="return">
+        <action service="createJobForProductGroupOrder" mode="sync"/>
+    </eca>
 </entity-eca>

Modified: ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/entitydef/entitymodel.xml Mon Nov 28 08:04:21 2011
@@ -4787,40 +4787,6 @@ under the License.
       <prim-key field="supplierRatingTypeId"/>
     </entity>
     
-    <entity entity-name="WebAnalyticsConfig"
-            package-name="org.ofbiz.product.catalog"
-            title="Web Analytics Configuration">
-        <field name="productStoreId" type="id-ne"></field> 
-        <field name="webAnalyticsTypeId" type="id-ne"></field>
-        <field name="webSiteId" type="id"></field>
-        <field name="webAnalyticsCode" type="very-long"><description>copy in here the analitics javascript code without the beginning- and end&lt;script&gt; tags</description></field>
-        <field name="isEnabled" type="indicator"></field>
-        <field name="description" type="description"></field>
-        <prim-key field="productStoreId"/>
-        <prim-key field="webAnalyticsTypeId"/>      
-        <relation type="one" fk-name="WANA_PROD_STORE" rel-entity-name="ProductStore">
-            <key-map field-name="productStoreId"/>
-        </relation>
-        <relation type="one" fk-name="WANA_TYPE" rel-entity-name="WebAnalyticsType">
-          <key-map field-name="webAnalyticsTypeId"/>
-        </relation>
-        <relation type="one" fk-name="WANA_WEBSITE" rel-entity-name="WebSite">
-            <key-map field-name="webSiteId"/>
-        </relation>
-    </entity>
-
-    <entity entity-name="WebAnalyticsType" package-name="org.ofbiz.product.catalog"
-        title="Web Analytics Type Entity">
-        <field name="webAnalyticsTypeId" type="id-ne"></field>
-        <field name="parentTypeId" type="id"></field>
-        <field name="hasTable" type="indicator"></field>
-        <field name="description" type="description"></field>
-        <prim-key field="webAnalyticsTypeId"/>
-        <relation type="one" fk-name="WANA_TYP_PARENT" title="Parent" rel-entity-name="WebAnalyticsType">
-            <key-map field-name="parentTypeId" rel-field-name="webAnalyticsTypeId"/>
-        </relation>
-    </entity>
-
     <entity entity-name="ProductPromoContent"
             package-name="org.ofbiz.product.promo"
             title="Product Promo Content Entity">
@@ -4843,4 +4809,23 @@ under the License.
         <key-map field-name="productPromoContentTypeId" rel-field-name="productContentTypeId"/>
       </relation>
     </entity>
+
+    <entity entity-name="ProductGroupOrder"
+            package-name="org.ofbiz.product.product"
+            title="Product Group Order Entity">
+      <field name="groupOrderId" type="id-ne"></field>
+      <field name="productId" type="id-ne"></field>
+      <field name="fromDate" type="date-time"></field>
+      <field name="thruDate" type="date-time"></field>
+      <field name="reqOrderQty" type="fixed-point"></field>
+      <field name="soldOrderQty" type="fixed-point"></field>
+      <field name="jobId" type="id-ne"></field>
+      <prim-key field="groupOrderId"/>
+      <relation type="one" fk-name="PROD_GROUP_ORDER" rel-entity-name="Product">
+        <key-map field-name="productId"/>
+      </relation>
+      <relation type="one" fk-name="GROUP_ORDER_JOB" rel-entity-name="JobSandbox">
+        <key-map field-name="jobId"/>
+      </relation>
+    </entity>
 </entitymodel>

Modified: ofbiz/branches/jackrabbit20100709/applications/product/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/ofbiz-component.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/ofbiz-component.xml Mon Nov 28 08:04:21 2011
@@ -71,6 +71,7 @@ under the License.
     <test-suite loader="main" location="testdef/CatalogTests.xml"/>
     <test-suite loader="main" location="testdef/FacilityTest.xml"/>
     <test-suite loader="main" location="testdef/CostTests.xml"/>
+    <test-suite loader="main" location="testdef/GroupOrderTest.xml"/>
 
     <webapp name="catalog" title="Catalog" server="default-server" location="webapp/catalog"
         base-permission="OFBTOOLS,CATALOG" mount-point="/catalog"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/product/ProductServices.xml Mon Nov 28 08:04:21 2011
@@ -1045,4 +1045,149 @@ under the License.
         <entity-one entity-name="ProductCategoryGlAccount" value-field="lookedUpValue"/>
         <remove-value value-field="lookedUpValue"/>
     </simple-method>
+
+    <!-- Product GroupOrder Services -->
+    <simple-method method-name="createProductGroupOrder" short-description="Create ProductGroupOrder">
+        <make-value entity-name="ProductGroupOrder" value-field="newEntity"/>
+        <make-next-seq-id value-field="newEntity" seq-field-name="groupOrderId"/>
+        <field-to-result field="newEntity.groupOrderId" result-name="groupOrderId"/>
+        <set-nonpk-fields value-field="newEntity" map="parameters"/>
+        <create-value value-field="newEntity"/>
+    </simple-method>
+
+    <simple-method method-name="updateProductGroupOrder" short-description="Update ProductGroupOrder">
+        <entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder"/>
+        <set-nonpk-fields value-field="productGroupOrder" map="parameters"/>
+        <store-value value-field="productGroupOrder"/>
+        
+        <entity-one entity-name="JobSandbox" value-field="jobSandbox">
+            <field-map field-name="jobId" from-field="productGroupOrder.jobId"/>
+        </entity-one>
+        <if-not-empty field="jobSandbox">
+            <set field="jobSandbox.runTime" from-field="parameters.thruDate"/>
+            <store-value value-field="jobSandbox"/>
+        </if-not-empty>
+        
+        <entity-one value-field="systemUserLogin" entity-name="UserLogin">
+            <field-map field-name="userLoginId" value="system"/>
+        </entity-one>
+        <if-compare field="productGroupOrder.soldOrderQty" operator="equals" value="${productGroupOrder.reqOrderQty}">
+            <set field="checkProductGroupOrderExpiredMap.userLogin" from-field="systemUserLogin"/>
+            <set field="checkProductGroupOrderExpiredMap.groupOrderId" from-field="productGroupOrder.groupOrderId"/>
+            <call-service service-name="checkProductGroupOrderExpired" in-map-name="checkProductGroupOrderExpiredMap"/>
+            
+            <set field="cancelScheduledJobMap.userLogin" from-field="systemUserLogin"/>
+            <set field="cancelScheduledJobMap.jobId" from-field="productGroupOrder.jobId"/>
+            <call-service service-name="cancelScheduledJob" in-map-name="cancelScheduledJobMap"/>
+        </if-compare>
+    </simple-method>
+
+    <simple-method method-name="deleteProductGroupOrder" short-description="Delete ProductGroupOrder">
+        <entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder"/>
+        <remove-value value-field="productGroupOrder"/>
+    </simple-method>
+
+    <simple-method method-name="createJobForProductGroupOrder" short-description="Create ProductGroupOrder">
+        <!-- Create RuntimeData For ProductGroupOrder -->
+        <set field="runtimeDataMap.groupOrderId" from-field="parameters.groupOrderId"/>
+        <call-class-method class-name="org.ofbiz.entity.serialize.XmlSerializer" method-name="serialize"  ret-field="runtimeInfo">
+            <field field="runtimeDataMap" type="Object"/>
+        </call-class-method>
+        <make-value entity-name="RuntimeData" value-field="runtimeData"/>
+        <sequenced-id sequence-name="RuntimeData" field="runtimeData.runtimeDataId"/>
+        <set field="runtimeDataId" from-field="runtimeData.runtimeDataId"/>
+        <set field="runtimeData.runtimeInfo" from-field="runtimeInfo"/>
+        <create-value value-field="runtimeData"/>
+        
+        <!-- Create Job For ProductGroupOrder -->
+        <make-value entity-name="JobSandbox" value-field="jobSandbox"/>
+        <sequenced-id sequence-name="JobSandbox" field="jobSandbox.jobId"/>
+        <set field="jobId" from-field="jobSandbox.jobId"/>
+        <set field="jobSandbox.jobName" value="Check Product GroupOrder Expired"/>
+        <set field="jobSandbox.runTime" from-field="parameters.thruDate"/>
+        <set field="jobSandbox.poolId" value="pool"/>
+        <set field="jobSandbox.statusId" value="SERVICE_PENDING"/>
+        <set field="jobSandbox.serviceName" value="checkProductGroupOrderExpired"/>
+        <set field="jobSandbox.runAsUser" value="system"/>
+        <set field="jobSandbox.runtimeDataId" from-field="runtimeDataId"/>
+        <set field="jobSandbox.maxRecurrenceCount" value="1" type="Long"/>
+        <create-value value-field="jobSandbox"/>
+        
+        <entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder"/>
+        <set field="productGroupOrder.jobId" from-field="jobId"/>
+        <store-value value-field="productGroupOrder"/>
+    </simple-method>
+
+    <simple-method method-name="checkOrderItemForProductGroupOrder" short-description="Check Order Item For ProductGroupOrder">
+        <entity-one value-field="systemUserLogin" entity-name="UserLogin">
+            <field-map field-name="userLoginId" value="system"/>
+        </entity-one>
+        <entity-and entity-name="OrderItem" list="orderItems">
+            <field-map field-name="orderId" from-field="parameters.orderId"/>
+        </entity-and>
+        <iterate entry="orderItem" list="orderItems">
+            <entity-and entity-name="ProductGroupOrder" list="productGroupOrders" filter-by-date="true">
+                <field-map field-name="productId" from-field="orderItem.productId"/>
+            </entity-and>
+            <iterate entry="productGroupOrder" list="productGroupOrders">
+                <if-compare field="productGroupOrder.soldOrderQty" operator="less" value="${productGroupOrder.reqOrderQty}">
+                    <calculate field="productGroupOrder.soldOrderQty">
+                        <calcop field="productGroupOrder.soldOrderQty" operator="add">
+                            <calcop field="orderItem.quantity" operator="get"/>
+                        </calcop>
+                    </calculate>
+                    <store-value value-field="productGroupOrder"/>
+                    
+                    <if-compare field="productGroupOrder.soldOrderQty" operator="equals" value="${productGroupOrder.reqOrderQty}">
+                        <set field="checkProductGroupOrderExpiredMap.userLogin" from-field="systemUserLogin"/>
+                        <set field="checkProductGroupOrderExpiredMap.groupOrderId" from-field="productGroupOrder.groupOrderId"/>
+                        <call-service service-name="checkProductGroupOrderExpired" in-map-name="checkProductGroupOrderExpiredMap"/>
+                        
+                        <set field="cancelScheduledJobMap.userLogin" from-field="systemUserLogin"/>
+                        <set field="cancelScheduledJobMap.jobId" from-field="productGroupOrder.jobId"/>
+                        <call-service service-name="cancelScheduledJob" in-map-name="cancelScheduledJobMap"/>
+                    </if-compare>
+                </if-compare>
+            </iterate>
+        </iterate>
+    </simple-method>
+
+    <simple-method method-name="checkProductGroupOrderExpired" short-description="Check ProductGroupOrder Expired">
+        <entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder"/>
+        <if-compare field="productGroupOrder.soldOrderQty" operator="equals" value="${productGroupOrder.reqOrderQty}">
+            <set field="newItemStatusId" value="ITEM_APPROVED"/>
+        <else>
+            <set field="newItemStatusId" value="ITEM_CANCELLED"/>
+        </else>
+        </if-compare>
+        <entity-condition entity-name="OrderItem" list="orderItems">
+            <condition-list combine="and">
+                <condition-expr field-name="productId" operator="equals" from-field="productGroupOrder.productId"/>
+                <condition-list combine="or">
+                    <condition-expr field-name="statusId" operator="equals" value="ITEM_CREATED"/>
+                    <condition-expr field-name="statusId" operator="equals" value="ITEM_APPROVED"/>
+                </condition-list>
+            </condition-list>
+        </entity-condition>
+        <iterate entry="orderItem" list="orderItems">
+            <entity-one value-field="orderHeader" entity-name="OrderHeader">
+                <field-map field-name="orderId" from-field="orderItem.orderId"/>
+            </entity-one>
+            <if>
+                <condition>
+                    <and>
+                        <if-compare field="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER"/>
+                        <if-compare field="orderHeader.orderDate" operator="greater-equals" value="${productGroupOrder.fromDate}"/>
+                        <if-compare field="orderHeader.orderDate" operator="less" value="${productGroupOrder.thruDate}"/>
+                    </and>
+                </condition>
+                <then>
+                    <set field="changeOrderItemStatusMap.orderId" from-field="orderItem.orderId"/>
+                    <set field="changeOrderItemStatusMap.orderItemSeqId" from-field="orderItem.orderItemSeqId"/>
+                    <set field="changeOrderItemStatusMap.statusId" from-field="newItemStatusId"/>
+                    <call-service service-name="changeOrderItemStatus" in-map-name="changeOrderItemStatusMap"/>
+                </then>
+            </if>
+        </iterate>
+    </simple-method>
 </simple-methods>

Modified: ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml Mon Nov 28 08:04:21 2011
@@ -247,7 +247,9 @@ under the License.
                                     (1) the previous picklist was cancelled, or
                                     (2) the previous picklist was picked or packed, and there is still an OrderItemShipGrpInvRes, which means that some of the order item must not
                                     have shipped yet.  (OrderItemShipGrpInvRes is removed when an order item has been fully shipped.
-                                    We are using entity-condition instead of get-related because we want to exclude some picklists by status -->
+                                    We are using entity-condition instead of get-related because we want to exclude some picklists by status.
+                                    ** Calculate the total pick list items for this order and then subtracting it from the order item quantity 
+                                    which is reserved while placing order results in remaining quantity of that order item which still has to be pick. -->
                                 <entity-condition entity-name="PicklistAndBinAndItem" list="picklistItemList">
                                     <condition-list combine="and">
                                         <condition-expr field-name="orderId" from-field="orderItemShipGrpInvRes.orderId"/>
@@ -259,8 +261,27 @@ under the License.
                                     </condition-list>
                                 </entity-condition>
                                 <log level="info" message="Pick list ITEMS - ${picklistItemList}"/>
-                                <!-- if all picklistItemList are not empty, don't include order as a pick candidate; keep a flag to see -->
-                                <if-empty field="picklistItemList">
+                                
+                                <set field="pickedItemQuantity" value="0" type="BigDecimal"/>
+                                <iterate list="picklistItemList" entry="picklistItem">
+                                    <calculate field="pickedItemQuantity">
+                                        <calcop operator="add" field="pickedItemQuantity">
+                                            <calcop operator="get" field="picklistItem.quantity"/>
+                                        </calcop>
+                                    </calculate>
+                                </iterate>
+                                <calculate field="remainingQuantityToBePicked" type="BigDecimal">
+                                    <calcop operator="subtract">
+                                        <calcop operator="get" field="orderItemShipGrpInvRes.quantity"/>
+                                        <calcop operator="get" field="pickedItemQuantity"/>
+                                    </calcop>
+                                </calculate>
+                                
+                                <!-- if the remaining quantity is greater than ZERO i.e. few quantity of the item is still not picked, then the
+                                     order will get included in the list and only that item will get included which is having some quantity to 
+                                     pick not other items which were already picked -->
+                                <if-compare field="remainingQuantityToBePicked" operator="greater" value="0" type="BigDecimal">
+                                    <set field="orderItemShipGrpInvRes.quantity" from-field="remainingQuantityToBePicked"/>
                                     <log level="info" message="The pick list item list is empty!"/>
                                     <!-- note that this is separate because we can't really use it as a break condition, must check all of them before any useful information is to be had -->
                                     <set value="N" field="allPickStarted"/>
@@ -318,9 +339,10 @@ under the License.
                                             <set from-field="facilityLocation" field="orderItemShipGrpInvResInfo.facilityLocation"/>
                                             <field-to-list field="orderItemShipGrpInvResInfo" list="orderItemShipGrpInvResInfoList"/>
                                             <clear-field field="orderItemShipGrpInvResInfo"/>
+                                            <field-to-list field="orderItemShipGrpInvRes" list="finalOrderItemShipGrpInvResList"/>
                                         </else>
                                     </if>
-                                </if-empty>
+                                </if-compare>
                             </if-compare>
                         </iterate>
 
@@ -357,7 +379,7 @@ under the License.
                                 <set from-field="orderHeader" field="orderHeaderInfo.orderHeader"/>
                                 <set from-field="orderItemShipGroup" field="orderHeaderInfo.orderItemShipGroup"/>
                                 <set from-field="orderItemAndShipGroupAssocList" field="orderHeaderInfo.orderItemAndShipGroupAssocList"/>
-                                <set from-field="orderItemShipGrpInvResList" field="orderHeaderInfo.orderItemShipGrpInvResList"/>
+                                <set from-field="finalOrderItemShipGrpInvResList" field="orderHeaderInfo.orderItemShipGrpInvResList"/>
                                 <set from-field="orderItemShipGrpInvResInfoList" field="orderHeaderInfo.orderItemShipGrpInvResInfoList"/>
 
                                 <!-- pick now, or needs stock move first? -->
@@ -395,6 +417,7 @@ under the License.
 
                         <clear-field field="orderItemAndShipGroupAssocList"/>
                         <clear-field field="orderItemShipGrpInvResInfoList"/>
+                        <clear-field field="finalOrderItemShipGrpInvResList"/>
                     </then>
                     <else>
                         <log level="info" message="Order is not a member of the requested shipment method: ${parameters.shipmentMethodTypeId}"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/servicedef/services.xml Mon Nov 28 08:04:21 2011
@@ -1662,4 +1662,50 @@ under the License.
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
 
+    <!-- Product GroupOrder Services -->
+    <service name="createProductGroupOrder" default-entity-name="ProductGroupOrder" engine="simple"
+        location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="createProductGroupOrder" auth="true">
+        <description>Create ProductGroupOrder</description>
+        <attribute name="productId" mode="IN" type="String" optional="false"/>
+        <attribute name="soldOrderQty" mode="IN" type="BigDecimal" optional="false"/>
+        <attribute name="reqOrderQty" mode="IN" type="BigDecimal" optional="false"/>
+        <attribute name="fromDate" mode="IN" type="Timestamp" optional="false"/>
+        <attribute name="thruDate" mode="IN" type="Timestamp" optional="false"/>
+        <attribute name="groupOrderId" mode="OUT" type="String" optional="true"/>
+    </service>
+
+    <service name="updateProductGroupOrder" default-entity-name="ProductGroupOrder" engine="simple"
+        location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="updateProductGroupOrder" auth="true">
+        <description>Update ProductGroupOrder</description>
+        <attribute name="groupOrderId" mode="IN" type="String" optional="false"/>
+        <attribute name="reqOrderQty" mode="IN" type="BigDecimal" optional="false"/>
+        <attribute name="fromDate" mode="IN" type="Timestamp" optional="false"/>
+        <attribute name="thruDate" mode="IN" type="Timestamp" optional="false"/>
+    </service>
+
+    <service name="deleteProductGroupOrder" default-entity-name="ProductGroupOrder" engine="simple"
+        location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="deleteProductGroupOrder" auth="true">
+        <description>Delete ProductGroupOrder</description>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+    </service>
+
+    <service name="createJobForProductGroupOrder" default-entity-name="ProductGroupOrder" engine="simple"
+        location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="createJobForProductGroupOrder" auth="true">
+        <description>Create Job For ProductGroupOrder</description>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+
+    <service name="checkOrderItemForProductGroupOrder" engine="simple"
+        location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="checkOrderItemForProductGroupOrder" auth="true">
+        <description>Check Order Item For ProductGroupOrder</description>
+        <attribute name="orderId" mode="IN" type="String" optional="false"/>
+    </service>
+
+    <service name="checkProductGroupOrderExpired" engine="simple"
+        location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="checkProductGroupOrderExpired" auth="true">
+        <description>Check ProductGroupOrder Expired</description>
+        <attribute name="groupOrderId" mode="IN" type="String" optional="false"/>
+    </service>
+
 </services>

Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/WEB-INF/controller.xml Mon Nov 28 08:04:21 2011
@@ -2630,68 +2630,6 @@ under the License.
         <response name="error" type="view" value="EditProductCommunicationEvents"/>
     </request-map>
     
-    <!-- Web Analytics Request Mappings -->
-    <request-map uri="WebAnalytics">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="FindWebAnalyticsConfigs"/>
-        <response name="error" type="view" value="FindWebAnalyticsConfigs"/>
-    </request-map>
-    <request-map uri="WebAnalyticsConfigs">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="FindWebAnalyticsConfigs"/>
-        <response name="error" type="view" value="FindWebAnalyticsConfigs"/>
-    </request-map>
-    <request-map uri="FindWebAnalyticsConfigs">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="FindWebAnalyticsConfigs"/>
-        <response name="error" type="view" value="FindWebAnalyticsConfigs"/>
-    </request-map>
-    <request-map uri="EditWebAnalyticsConfig">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditWebAnalyticsConfig"/>
-        <response name="error" type="view" value="EditWebAnalyticsConfig"/>
-    </request-map>
-    <request-map uri="createWebAnalyticsConfig">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createWebAnalyticsConfig"/>
-        <response name="success" type="view" value="EditWebAnalyticsConfig"/>
-        <response name="error" type="view" value="EditWebAnalyticsConfig"/>
-    </request-map>
-    <request-map uri="updateWebAnalyticsConfig">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateWebAnalyticsConfig"/>
-        <response name="success" type="view" value="EditWebAnalyticsConfig"/>
-        <response name="error" type="view" value="EditWebAnalyticsConfig"/>
-    </request-map>
-    
-    <request-map uri="WebAnalyticsTypes">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="FindWebAnalyticsTypes"/>
-        <response name="error" type="view" value="FindWebAnalyticsTypes"/>
-    </request-map>
-    <request-map uri="FindWebAnalyticsTypes">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="FindWebAnalyticsTypes"/>
-        <response name="error" type="view" value="FindWebAnalyticsTypes"/>
-    </request-map>
-    <request-map uri="EditWebAnalyticsType">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="EditWebAnalyticsType"/>
-        <response name="error" type="view" value="EditWebAnalyticsType"/>
-    </request-map>
-    <request-map uri="createWebAnalyticsType">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="createWebAnalyticsType"/>
-        <response name="success" type="view" value="EditWebAnalyticsType"/>
-        <response name="error" type="view" value="EditWebAnalyticsType"/>
-    </request-map>
-    <request-map uri="updateWebAnalyticsType">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updateWebAnalyticsType"/>
-        <response name="success" type="view" value="EditWebAnalyticsType"/>
-        <response name="error" type="view" value="EditWebAnalyticsType"/>
-    </request-map>
-    
     <!-- ================ Image Management Requests ================= -->
     <request-map uri="Imagemanagement"><security https="true" auth="true"/>
         <response name="success" type="view" value="Imagemanagement"/>
@@ -3001,7 +2939,6 @@ under the License.
     <request-map uri="LookupDataResource"><security auth="true" https="true"/><response name="success" type="view" value="LookupDataResource"/></request-map>
     <request-map uri="LookupPerson"><security auth="true" https="true"/><response name="success" type="view" value="LookupPerson"/></request-map>
     <request-map uri="LookupPreferredContactMech"><security https="true" auth="true"/><response name="success" type="view" value="LookupPreferredContactMech"/></request-map>
-    <request-map uri="LookupContactList"><security https="true" auth="true"/><response name="success" type="view" value="LookupContactList"/></request-map>
 
     <!-- ================ Vendor Product Requests ================= -->
     <request-map uri="EditVendorProduct">
@@ -3023,8 +2960,6 @@ under the License.
         <response name="error" type="view" value="EditVendorProduct"/>
     </request-map>
 
-    <!-- end of request mappings -->
-    
     <!-- ================ Product Promo Content Requests ================= -->
     <request-map uri="EditProductPromoContent">
         <security https="true" auth="true"/>
@@ -3054,6 +2989,39 @@ under the License.
         <response name="success" type="view" value="listMiniproduct"/>
     </request-map>
 
+    <!-- ================ Product GroupOrder Requests ================= -->
+    <request-map uri="ViewProductGroupOrder">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ViewProductGroupOrder"/>
+    </request-map>
+
+    <request-map uri="EditProductGroupOrder">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="EditProductGroupOrder"/>
+    </request-map>
+
+    <request-map uri="createProductGroupOrder">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="createProductGroupOrder"/>
+        <response name="success" type="view" value="ViewProductGroupOrder"/>
+        <response name="error" type="view" value="ViewProductGroupOrder"/>
+    </request-map>
+
+    <request-map uri="updateProductGroupOrder">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="updateProductGroupOrder"/>
+        <response name="success" type="view" value="ViewProductGroupOrder"/>
+        <response name="error" type="view" value="EditProductGroupOrder"/>
+    </request-map>
+
+    <request-map uri="deleteProductGroupOrder">
+        <security https="true" auth="true"/>
+        <event type="service" invoke="deleteProductGroupOrder"/>
+        <response name="success" type="view" value="ViewProductGroupOrder"/>
+        <response name="error" type="view" value="ViewProductGroupOrder"/>
+    </request-map>
+    <!-- end of request mappings -->
+
     <!-- View Mappings -->
     <view-map name="main" type="screen" page="component://product/widget/catalog/CommonScreens.xml#main"/>
 
@@ -3208,17 +3176,13 @@ under the License.
     <view-map name="EditProductConfigItemContentContent" type="screen" page="component://product/widget/catalog/ConfigScreens.xml#EditProductConfigItemContentContent"/>
 
     <view-map name="EditProductWorkEfforts" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProductWorkEfforts"/>
+    <view-map name="ViewProductGroupOrder" type="screen" page="component://product/widget/catalog/ProductScreens.xml#ViewProductGroupOrder"/>
+    <view-map name="EditProductGroupOrder" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProductGroupOrder"/>
 
     <view-map name="ListQuantityBreaks" type="screen" page="component://product/widget/catalog/ShippingScreens.xml#ListQuantityBreaks"/>
     <view-map name="ListShipmentMethodTypes" type="screen" page="component://product/widget/catalog/ShippingScreens.xml#ListShipmentMethodTypes"/>
     <view-map name="ListCarrierShipmentMethods" type="screen" page="component://product/widget/catalog/ShippingScreens.xml#ListCarrierShipmentMethods"/>
 
-    <!-- Web Analytics View -->
-    <view-map name="FindWebAnalyticsConfigs" type="screen" page="component://product/widget/catalog/WebAnalyticsScreens.xml#FindWebAnalyticsConfigs"/>
-    <view-map name="EditWebAnalyticsConfig" type="screen" page="component://product/widget/catalog/WebAnalyticsScreens.xml#EditWebAnalyticsConfig"/>
-    <view-map name="FindWebAnalyticsTypes" type="screen" page="component://product/widget/catalog/WebAnalyticsScreens.xml#FindWebAnalyticsTypes"/>
-    <view-map name="EditWebAnalyticsType" type="screen" page="component://product/widget/catalog/WebAnalyticsScreens.xml#EditWebAnalyticsType"/>
-
     <!-- Lookup request mappings -->
     <view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/>
     <view-map name="LookupFixedAsset" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupFixedAsset"/>
@@ -3238,8 +3202,7 @@ under the License.
     <view-map name="LookupDataResource" page="component://content/widget/content/DataResourceScreens.xml#LookupDataResource" type="screen"/>
     <view-map name="LookupPerson" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson" type="screen"/>
     <view-map name="LookupPreferredContactMech" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupPreferredContactMech"/>
-    <view-map name="LookupContactList" type="screen" page="component://party/widget/partymgr/PartyContactListScreens.xml#ListLookupContactList"/>
-    
+
     <!-- Image Management request mappings -->
     <view-map name="Imagemanagement" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#Imagemanagement"/>
     <view-map name="ImageGallery" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageGallery" type="screen"/>

Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogMenus.xml?rev=1207005&r1=1207004&r2=1207005&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogMenus.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CatalogMenus.xml Mon Nov 28 08:04:21 2011
@@ -31,7 +31,6 @@ under the License.
         <menu-item name="configs" title="${uiLabelMap.ProductConfigItems}"><link target="FindProductConfigItems"/></menu-item>
         <menu-item name="Subscription" title="${uiLabelMap.ProductSubscriptions}"><link target="FindSubscription"/></menu-item>
         <menu-item name="shipping" title="${uiLabelMap.ProductShipping}"><link target="ListShipmentMethodTypes"/></menu-item>
-        <menu-item name="WebAnalytics" title="${uiLabelMap.CatalogWebAnalytics}"><link target="WebAnalytics"/></menu-item>
         <menu-item name="Imagemanagement" title="${uiLabelMap.ImageManagement}"><link target="Imagemanagement"/></menu-item>
     </menu>
 
@@ -503,6 +502,11 @@ under the License.
                 <parameter param-name="productId"/>
             </link>
         </menu-item>
+        <menu-item name="ViewProductGroupOrder" title="${uiLabelMap.ProductGroupOrder}">
+            <link target="ViewProductGroupOrder">
+                <parameter param-name="productId"/>
+            </link>
+        </menu-item>
     </menu>
 
     <menu name="ProductSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">
@@ -576,24 +580,6 @@ under the License.
         </menu-item>
     </menu>
     
-    <menu name="WebAnalyticsTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
-        <menu-item name="WebAnalyticsConfigs" title="${uiLabelMap.CatalogWebAnalyticsConfigs}">
-            <link target="WebAnalyticsConfigs"/>
-        </menu-item>
-        <menu-item name="WebAnalyticsTypes" title="${uiLabelMap.CatalogWebAnalyticsTypes}">
-            <link target="WebAnalyticsTypes"/>
-        </menu-item>
-    </menu>
-
-    <menu name="WebAnalyticsConfigButtonBar" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="tabButtonItem2">
-        <menu-item name="FindWebAnalyticsConfigs" title="${uiLabelMap.CommonFind}"><link target="FindWebAnalyticsConfigs"/></menu-item>
-        <menu-item name="EditWebAnalyticsConfig" title="${uiLabelMap.CommonNew}"><link target="EditWebAnalyticsConfig"/></menu-item>
-    </menu>
-
-    <menu name="WebAnalyticsTypeButtonBar" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="tabButtonItem2">
-        <menu-item name="FindWebAnalyticsTypes" title="${uiLabelMap.CommonFind}"><link target="FindWebAnalyticsTypes"/></menu-item>
-        <menu-item name="EditWebAnalyticsType" title="${uiLabelMap.CommonNew}"><link target="EditWebAnalyticsType"/></menu-item>
-    </menu>
 
      <menu name="ImageManagementTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="userTabButtonImage">
         <menu-item name="main" title="${uiLabelMap.CommonMain}">