svn commit: r541859 - in /ofbiz/trunk/applications: ecommerce/config/ ecommerce/data/ product/config/

[jacopoc]

Author: jacopoc
Date: Fri May 25 22:19:00 2007
New Revision: 541859

URL: http://svn.apache.org/viewvc?view=rev&rev=541859
Log:
New labels and seed data for new mkt pkg type from Marco Risaliti (part of OFBIZ-1036).

Modified:
    ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties
    ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml
    ofbiz/trunk/applications/product/config/ProductEntityLabels.properties
    ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties
    ofbiz/trunk/applications/product/config/ProductUiLabels.properties
    ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties

Modified: ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties?view=diff&rev=541859&r1=541858&r2=541859
==============================================================================
--- ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels_it.properties Fri May 25 22:19:00 2007
@@ -406,6 +406,7 @@
 OrderPurchaseOrderNumber=Numero Ordine Acquisto
 OrderQtyCanceled=Qnt Cancellata
 OrderQtyOrdered=Qnt Ordinata
+OrderQtyPicked=Qnt Prelevata
 OrderQtyShipped=Qnt Spedita
 OrderQuote=Preventivo
 OrderReason=Motivazione

Modified: ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml?view=diff&rev=541859&r1=541858&r2=541859
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml (original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml Fri May 25 22:19:00 2007
@@ -257,6 +257,17 @@
     <ProductAssoc productId="GZ-BASKET" productIdTo="GZ-1001" productAssocTypeId="MANUF_COMPONENT" quantity="2" fromDate="2001-05-13 12:00:00.0"/>
     <ProductAssoc productId="GZ-BASKET" productIdTo="GZ-1004" productAssocTypeId="MANUF_COMPONENT" quantity="3" fromDate="2001-05-13 12:00:00.0"/>
     
+    <!-- test for marketing package pick assembly -->
+    <Product productId="GZ-BASKET-PICK" productTypeId="MARKETING_PKG_PICK" productName="Gizmo Basket Assembly Pick" internalName="Assembled Pick Gizmo Basket"
+        description="Assembled Pick Gizmo Basket.  Assembled during picking."
+        longDescription="Assembled Pick Gizmo Basket.  This item will be assembled during picking."
+        taxable="Y" chargeShipping="Y" autoCreateKeywords="Y" isVirtual="N" isVariant="N" />
+    <ProductPrice productId="GZ-BASKET-PICK" productPricePurposeId="PURCHASE" productPriceTypeId="DEFAULT_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" price="150" fromDate="2007-01-01 12:00:00.0"/>
+    <ProductPrice productId="GZ-BASKET-PICK" productPricePurposeId="PURCHASE" productPriceTypeId="LIST_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" price="165" fromDate="2007-01-01 12:00:00.0"/>
+    <ProductAssoc productId="GZ-BASKET-PICK" productIdTo="GZ-1000" productAssocTypeId="PRODUCT_COMPONENT" quantity="1" fromDate="2007-01-01 12:00:00.0"/>
+    <ProductAssoc productId="GZ-BASKET-PICK" productIdTo="GZ-1001" productAssocTypeId="PRODUCT_COMPONENT" quantity="2" fromDate="2007-01-01 12:00:00.0"/>
+    <ProductAssoc productId="GZ-BASKET-PICK" productIdTo="GZ-1004" productAssocTypeId="PRODUCT_COMPONENT" quantity="3" fromDate="2007-01-01 12:00:00.0"/>
+    
     <ProductFeatureCategory productFeatureCategoryId="8000" description="License Features"/>
     <ProductFeatureCategoryAppl productFeatureCategoryId="8000" productCategoryId="CATALOG1_SEARCH" fromDate="2001-05-13 12:00:00.0"/>
 
@@ -359,6 +370,7 @@
     <ProductCategoryMember productCategoryId="100" productId="GZ-DIG" sequenceNum="4" fromDate="2001-05-13 12:00:00.0"/>
     <ProductCategoryMember productCategoryId="100" productId="GZ-NEWS-1MO" sequenceNum="5" fromDate="2001-05-13 12:00:00.0"/>
     <ProductCategoryMember productCategoryId="100" productId="GZ-BASKET" sequenceNum="6" fromDate="2001-05-13 12:00:00.0"/>
+    <ProductCategoryMember productCategoryId="100" productId="GZ-BASKET-PICK" sequenceNum="8" fromDate="2007-01-01 12:00:00.0"/>
     <ProductCategoryMember productCategoryId="100" productId="GZ-1000" sequenceNum="10" fromDate="2001-05-13 12:00:00.0"/>
     <ProductCategoryMember productCategoryId="100" productId="GZ-1001" sequenceNum="11" fromDate="2001-05-13 12:00:00.0"/>
     <ProductCategoryMember productCategoryId="100" productId="GZ-1004" sequenceNum="14" fromDate="2001-05-13 12:00:00.0"/>

Modified: ofbiz/trunk/applications/product/config/ProductEntityLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductEntityLabels.properties?view=diff&rev=541859&r1=541858&r2=541859
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductEntityLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductEntityLabels.properties Fri May 25 22:19:00 2007
@@ -85,6 +85,7 @@
 ProductType.description.AGGREGATED=Configurable Good
 ProductType.description.WIP=Work In Process
 ProductType.description.MARKETING_PKG_AUTO=Marketing Package
+ProductType.description.MARKETING_PKG_PICK=Marketing Package: Pick Assembly
 
 ProductPriceType.description.LIST_PRICE=List Price
 ProductPriceType.description.DEFAULT_PRICE=Default Price
@@ -140,8 +141,6 @@
 ProductAssocType.description.PRODUCT_COMPLEMENT=Complementary or Cross-Sell
 ProductAssocType.description.PRODUCT_INCOMPATABLE=Incompatable
 ProductAssocType.description.PRODUCT_OBSOLESCENCE=New Version, Replacement
-ProductAssocType.description.MARKETING_PACKAGE=Marketing Package Component
-ProductAssocType.description.MARKETING_PKG_AUTO=Marketing Package Auto Explode Component
 ProductAssocType.description.PRODUCT_COMPONENT=Actual Product Component
 ProductAssocType.description.PRODUCT_SUBSTITUTE=Equivalent or Substitute
 ProductAssocType.description.PRODUCT_VARIANT=Product Variant
@@ -153,6 +152,7 @@
 ProductAssocType.description.PRODUCT_ACCESSORY=Accessory
 ProductAssocType.description.PRODUCT_REFURB=Refurbished Equivalent
 ProductAssocType.description.PRODUCT_REPAIR_SRV=Repair Service
+ProductAssocType.description.PRODUCT_AUTORO=Auto Reorder (needs recurrenceInfoId)
 
 CostComponentType.description.MAT_COST=Materials Cost
 CostComponentType.description.ROUTE_COST=Route (fixed asset usage) Cost

Modified: ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties?view=diff&rev=541859&r1=541858&r2=541859
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties Fri May 25 22:19:00 2007
@@ -85,6 +85,7 @@
 ProductType.description.AGGREGATED=Bene Configurabile
 ProductType.description.WIP=Semilavorato
 ProductType.description.MARKETING_PKG_AUTO=Pacco di Vendita
+ProductType.description.MARKETING_PKG_PICK=Pacco di Vendita: Assemblato durante il Prelievo
 
 ProductPriceType.description.LIST_PRICE=Prezzo di Listino
 ProductPriceType.description.DEFAULT_PRICE=Prezzo di Default
@@ -140,8 +141,6 @@
 ProductAssocType.description.PRODUCT_COMPLEMENT=Complementario o Vendita-Trasversale
 ProductAssocType.description.PRODUCT_INCOMPATABLE=Incompatibile
 ProductAssocType.description.PRODUCT_OBSOLESCENCE=Nuova Versione, Sostituzione
-ProductAssocType.description.MARKETING_PACKAGE=Componente Pacco Vendita
-ProductAssocType.description.MARKETING_PKG_AUTO=Componente Pacco Vendita Esploso Automaticamente
 ProductAssocType.description.PRODUCT_COMPONENT=Componente Prodotto Attuale
 ProductAssocType.description.PRODUCT_SUBSTITUTE=Equivalente o Sostituto
 ProductAssocType.description.PRODUCT_VARIANT=Variante Prodotto
@@ -153,6 +152,7 @@
 ProductAssocType.description.PRODUCT_ACCESSORY=Accessori
 ProductAssocType.description.PRODUCT_REFURB=Equivalente Rinnovato
 ProductAssocType.description.PRODUCT_REPAIR_SRV=Servizio Riparazioni
+ProductAssocType.description.PRODUCT_AUTORO=Riordino Automatico
 
 CostComponentType.description.MAT_COST=Costo Materiali
 CostComponentType.description.ROUTE_COST=Costo Itinerario (uso cespiti)

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?view=diff&rev=541859&r1=541858&r2=541859
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.properties Fri May 25 22:19:00 2007
@@ -394,6 +394,7 @@
 ProductCheckExisting=Check Existing
 ProductCheckInventory=Check Inventory
 ProductCheckingForExistingProductInCategory=Checking for Existing Product in Category
+ProductChannel=Channel
 ProductChild=Child
 ProductChildCategoryId=Child Category ID
 ProductChildGroupId=Child Group ID
@@ -464,6 +465,7 @@
 ProductCreateVirtualProduct=Create Virtual Product
 ProductCreatedBy=Created By
 ProductCreatedByUserLogin=Created By User Login
+ProductCreatedModifiedBy=created/modified by
 ProductCreatedDate=Created Date
 ProducrCrossSell=You might be interested in these as well:
 ProductCurrency=Currency
@@ -959,6 +961,7 @@
 ProductPickPackWarnings=Pick Pack Warnings
 ProductPickStarted=Pick started
 ProductPicking=Picking
+ProductPickingDetail=Detail
 ProductPicklistManage=Manage Picklists
 ProductPicklistOptions=Picking Options
 ProductPicksInProgress=Picks in progress
@@ -1069,6 +1072,7 @@
 ProductQuantityAccepted=Quantity Accepted
 ProductQuantityBreaks=Quantity Breaks
 ProductQuantityIncluded=Quantity Included
+ProductQuantityNotAvailable=Quantity Not Available
 ProductQuantityNotSet=Quantity Not Set
 ProductQuantityRequested=Quantity Requested
 ProductQuantityRejected=Quantity Rejected

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?view=diff&rev=541859&r1=541858&r2=541859
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Fri May 25 22:19:00 2007
@@ -393,6 +393,7 @@
 ProductCheckExisting=Controlla Esistenza
 ProductCheckInventory=Controlla Inventario
 ProductCheckingForExistingProductInCategory=Controlla Prodotti Esistenti in una Categoria
+ProductChannel=Canale Vendita
 ProductChild=Figlio
 ProductChildCategoryId=Codice Categoria Figlia
 ProductChildGroupId=Codice Gruppo Figlio
@@ -463,6 +464,7 @@
 ProductCreateVirtualProduct=Creare Prodotto Virtuale
 ProductCreatedBy=Creato Da
 ProductCreatedByUserLogin=Creato Da Utente
+ProductCreatedModifiedBy=creato/modificato da
 ProductCreatedDate=Data Creazione
 ProducrCrossSell=Tu potresti essere interessato anche a questi:
 ProductCurrency=Valuta
@@ -529,6 +531,7 @@
 ProductEstimatedCosts=Costi Standard Stimati
 ProductEstimatedDates=Date Stimate
 ProductEstimatedReadyDate=Data Stimata Disponibilit\u00e0
+ProductEstimateShipCost=Costo Spedizione Stimato
 ProductEstimatedShipCost=Costo Spedizione Stimato
 ProductEstimatedShipCostPackages=Costo Spedizione Stimato per Pacchi
 ProductEstimatedShipCostForShipGroup=Costo Spedizione Stimato per Gruppo Spedizione
@@ -955,6 +958,7 @@
 ProductPickPackWarnings=Avvertimenti Prelievo Pacco
 ProductPickStarted=Prelievo Iniziato
 ProductPicking=Prelievo
+ProductPickingDetail=Dettaglio
 ProductPicklistManage=Gestione Liste di Prelievo
 ProductPicklistOptions=Opzioni Prelievo
 ProductPicksInProgress=Prelievo in corso
@@ -1065,6 +1069,7 @@
 ProductQuantityAccepted=Quantit\u00e0 Accettata
 ProductQuantityBreaks=Intervalli Quantit\u00e0
 ProductQuantityIncluded=Quantit\u00e0 Inclusa
+ProductQuantityNotAvailable=Quantit\u00e0 Non Disponibile
 ProductQuantityNotSet=Quantit\u00e0 Non Impostata
 ProductQuantityRequested=Quantit\u00e0 Richiesta
 ProductQuantityRejected=Quantit\u00e0 Scartata