svn commit: r442000 - in /incubator/ofbiz/trunk: applications/accounting/config
Locked
svn commit: r442000 - in /incubator/ofbiz/trunk: applications/accounting/config
 
|
Author: jleroux
Date: Sun Sep 10 13:27:27 2006 New Revision: 442000 URL: http://svn.apache.org/viewvc?view=rev&rev=442000 Log: An i18n patch from Marco Risalti related to "Searching product with catalog" https://issues.apache.org/jira/browse/OFBIZ-179. The patch search_by_catalog2.patch remains. I deleted the initial patch search_by_catalog.patch.txt. Modified: incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties incubator/ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties incubator/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties incubator/ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml Modified: incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties?view=diff&rev=442000&r1=441999&r2=442000 ============================================================================== --- incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties (original) +++ incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties Sun Sep 10 13:27:27 2006 @@ -59,7 +59,7 @@ AccountingAgreementTypeId=Tipo Contratto AccountingAgreements=Contratti AccountingAmount=Importi -AccountingAmountApplied=Importo da Applicare +AccountingAmountApplied=Importo Applicato AccountingAmountNotApplied=Importo non ancora applicato AccountingAnyInvoiceStatus=Qualsiasi Stato Fattura AccountingAnyPaymentMethod=Qualsiasi Metodo Pagamento Modified: incubator/ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml?view=diff&rev=442000&r1=441999&r2=442000 ============================================================================== --- incubator/ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml (original) +++ incubator/ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml Sun Sep 10 13:27:27 2006 @@ -80,6 +80,7 @@ <section> <actions> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/sidedeepcategory.bsh"/> </actions> <widgets> <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl"/></html></platform-specific> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl?view=diff&rev=442000&r1=441999&r2=442000 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl Sun Sep 10 13:27:27 2006 @@ -19,7 +19,7 @@ <#list searchConstraintStrings as searchConstraintString> <div class="tabletext"> <a href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" class="buttontext">X</a> ${searchConstraintString}</div> </#list> -<div class="tabletext">${uiLabelMap.ProductSortedBy}: ${searchSortOrderString}</div> +<div class="tabletext">${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div> <div class="tabletext"><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(reqeustParameters.SEARCH_CATEGORY_ID)?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductRefineSearch}</a></div> <#if !productIds?has_content> Modified: incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties?view=diff&rev=442000&r1=441999&r2=442000 ============================================================================== --- incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties (original) +++ incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels_it.properties Sun Sep 10 13:27:27 2006 @@ -49,7 +49,7 @@ ProductCategoryType.description.INTERNAL_CATEGORY=Interna ProductCategoryType.description.MATERIALS_CATEGORY=Materiali ProductCategoryType.description.QUICKADD_CATEGORY=Aggiunta Veloce -ProductCategoryType.description.SEARCH_CATEGORY=Ricera +ProductCategoryType.description.SEARCH_CATEGORY=Ricerca ProductCategoryType.description.USAGE_CATEGORY=Uso ProductCategoryType.description.MIXMATCH_CATEGORY=Mescola e Confronta ProductCategoryType.description.CROSS_SELL_CATEGORY=Vendite Trasversali Modified: incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties?view=diff&rev=442000&r1=441999&r2=442000 ============================================================================== --- incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties (original) +++ incubator/ofbiz/trunk/applications/product/config/ProductUiLabels.properties Sun Sep 10 13:27:27 2006 @@ -1,5 +1,4 @@ ##################################################################### -# $Id: ProductUiLabels.properties 7914 2006-06-30 22:17:55Z jacopo $ # # Copyright 2001-2006 The Apache Software Foundation # @@ -18,11 +17,6 @@ #### # OFBiz UiLabel Properties used for the product component -#################################################################################################################################### -# I also took part in this work, in the event of errors or omissions you can join me : [hidden email] -# For more informations (french) : http://www.les7arts.com/assist/infos.html -#################################################################################################################################### - GeneralCatalogPermissionError=You do not have permission to run ${methodShortDescription}. ("CATALOG${securityAction}" or "CATALOG_ADMIN" needed) @@ -267,10 +261,14 @@ ProductAddProductKeyword=Add product keyword ProductAddProductsUsingDefaultQuantities=Add Products in this Category to the Cart using Default Quantities ProductAddPromoRule=Add New Promo Rule +ProductAddResultsTo=Add Results To ProductAddRouteSegmentInfo=Add Route Segment Info ProductAddStorePromo=Add Store Promo (select Store, enter optional From Date) ProductAddStorePromoOptionalDate=Add Store Promo (select Promo, enter optional From Date) ProductAddFeatureToCategory=new features to this category +ProductAddFeature=Add Feature +ProductAddFeatureToResults=Add Feature to Results +ProductAddToCategory=Add to Category ProductAddToPackage=Add to Package ProductAddresses=Addresses ProductAdvancedSearch=Advanced Search @@ -290,6 +288,7 @@ ProductAndApplyFeaturesToProductWithId=And Apply Features to Product with ID ProductAndContainer=AND container ProductAndQuantityOnHand=AND quantity OnHand +ProductAnyCatalog=Any Catalog ProductAnyCategory=Any Category ProductAnyFacility=Any Facility ProductAnyShipmentStatus=Any Shipment Status @@ -517,6 +516,7 @@ ProductExistingVariant=Existing Variant IDs ProductExpireAllProductMembers=Expire All Product Members ProductExpireDate=Expire Date +ProductExpireResultsFrom=Expire Results From ProductExplodeOrderItems=Explode Order Items ProductFacilities=Facilities ProductFacilitiesList=Facilities List @@ -613,6 +613,7 @@ ProductIfNotSpecifiedDefaultsIsProductdetail=If not specified defaults to ProductIncludeFreeshipMessage=Set to N to hide when the cart contains ONLY free shipping items ProductIncFreeship=Inc FreeShip +ProductIncludeAllSubCategories=Include All Sub Categories ProductIncludeFreeship=Include Free Ship Items ProductIncludeGeoMessage=Displays only if ship-to is in this geo ProductIncludeGeo=Include Geo @@ -666,8 +667,11 @@ ProductItemsIssued=Items Issued ProductItemsIssuedReserved=Items Issued or Reserved ProductKeyword=Keyword +ProductKeywordAllWordsMatch=all words match +ProductKeywordAnyWordMatches=any word matches ProductKeywordRelevency=Keyword Relevency ProductKeywords=Keywords +ProductKeywordWhere=where ProductLabel=Label ProductLabels=Labels ProductLargeImage=Large Image @@ -765,6 +769,7 @@ ProductNewProductPromo=New ProductPromo ProductNewProductStore=New Product Store ProductNewPromotionCode=New Promotion Code +ProductNewSearch=New Search ProductNewSegment=New Segment ProductNewShipment=New Shipment ProductNewShipmentEstimate=New Shipment Estimate @@ -821,8 +826,10 @@ ProductNotSalesShipment=but this is NOT a Sales Shipment ProductNotSet=Not Set ProductNotYetAvailable=Not Yet Available +ProductNote=NOTE ProductNoteForContentOptions=NOTE: For content options, use the Content tab. ProductNoteKeywordsAutomaticallyCreated=Keywords are automatically created when product information is changed, but you may manually CREATE or DELETE keywords here as well. +ProductNoteKeywordSearch=The check boxes above are used only to add to and remove from the text box below, they will not limit the other actions for the forms below! ProductNoteUserPromotionEntered=NOTE: Only user entered promos included in drop-down ProductNoteOnItemId=NOTE on Item ID ProductNoteOnPartyId=NOTE on Party ID @@ -1035,12 +1042,16 @@ ProductReceived=Received ProductRecreateAssociation=(You must re-create the association to change this.) ProductRedExplanation=<b style="color: red;">Red</b> date/time entries denote that the current time is before the From Date or after the Thru Date. If the From Date is <b style="color: red;">red</b>, association has not started yet; if Thru Date is <b style="color: red;">red</b>, association has expired (<u>and should probably be deleted</u>). +ProductRefineSearch=Refine Search ProductRegularPrice=Regular Price ProductRejectedReason=Rejected Reason ProductRejectionReason=Rejection Reason ProductRelationship=Relationship ProductRemoveBefore=Product Remove Before ProductRemoveExpiredProductMembers=Remove Expired Product Members +ProductRemoveFeature=Remove Feature +ProductRemoveFeatureFromResults=Remove Feature from Results +ProductRemoveResultsFrom=Remove Results From ProductReorderQuantity=Reorder Quantity ProductReplaceOriginal=Replace Original ProductRequireAmount=Require Amount Modified: incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties?view=diff&rev=442000&r1=441999&r2=442000 ============================================================================== --- incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original) +++ incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Sun Sep 10 13:27:27 2006 @@ -259,10 +259,14 @@ ProductAddProductKeyword=Aggiungi chiave prodotto ProductAddProductsUsingDefaultQuantities=Aggiungi Prodotti in questa Categoria al Carrello usando le Quantit\u00e0 di Default ProductAddPromoRule=Aggiungi Nuova Regola Promozione +ProductAddResultsTo=Aggiungi Risultati A ProductAddRouteSegmentInfo=Aggiungi Informazioni Segmento Percorso ProductAddStorePromo=Aggiungi Promozione Negozio (seleziona Negozio, inserire opzionalmente Da Data) ProductAddStorePromoOptionalDate=Aggiungi Promozione Negozio (seleziona Promozione, inserire opzionalmente Da Data) +ProductAddFeature=Aggiungi Caratteristica ProductAddFeatureToCategory=nuove caratteristiche di questa categoria +ProductAddFeatureToResults=Aggiungi Caratteristica ai Risultati +ProductAddToCategory=Aggiungi alla Categoria ProductAddToPackage=Aggiungi al Pacchetto ProductAddresses=Indirizzi ProductAdvancedSearch=Ricerca Avanzata @@ -282,6 +286,7 @@ ProductAndApplyFeaturesToProductWithId=E Applica Caratteristiche al Prodotto con Codice ProductAndContainer=E recipiente ProductAndQuantityOnHand=E Quantit\u00e0 Disponibile +ProductAnyCatalog=Qualsiasi Catalogo ProductAnyCategory=Qualsiasi Categoria ProductAnyFacility=Qualsiasi Stabilimento ProductAnyShipmentStatus=Qualsiasi Stato Spedizione @@ -508,6 +513,7 @@ ProductExistingVariant=Codici Varianti Esistenti ProductExpireAllProductMembers=Scadenza Membri Tutti Prodotti ProductExpireDate=Data Scadenza +ProductExpireResultsFrom=Risultati Scaduti Da ProductExplodeOrderItems=Esplodi Righe Ordine ProductFacilities=Stabilimenti ProductFacilitiesList=Lista Stabilimenti @@ -604,6 +610,7 @@ ProductIfNotSpecifiedDefaultsIsProductdetail=Se non specificato defaults \u00e8 ProductIncludeFreeshipMessage=Impostato ad N per nascondere il carrrello quando contiene SOLO righe spedizioni gratuite ProductIncFreeship=Inc Sped Grat +ProductIncludeAllSubCategories=Includi Tutte le Sotto-Categorie ProductIncludeFreeship=Includi Righe Spedizione Gratuita ProductIncludeGeoMessage=Visualizzato solo se spedizione destinazione \u00e8 in questa geografia ProductIncludeGeo=Includi Geo @@ -657,8 +664,11 @@ ProductItemsIssued=Righe Prelevate ProductItemsIssuedReserved=Righe Prelevate o Riservate ProductKeyword=Chiave -ProductKeywordRelevency=Pertinenza Chiave +ProductKeywordAllWordsMatch=tutte le parole uguali +ProductKeywordAnyWordMatches=qualsiasi parola uguale +ProductKeywordRelevency=Rilevanza Chiave ProductKeywords=Chiavi +ProductKeywordWhere=dove ProductLabel=Etichetta ProductLabels=Etichette ProductLargeImage=Immagine Grande @@ -753,6 +763,7 @@ ProductNewProductPromo=Nuova Promozione Prodotto ProductNewProductStore=Nuovo Negozio ProductNewPromotionCode=Nuovo Codice Promozione +ProductNewSearch=Nuova Ricerca ProductNewSegment=Nuovo Segmento ProductNewShipment=Nuova Spedizione ProductNewShipmentEstimate=Nuova Stima Spedizione @@ -809,8 +820,10 @@ ProductNotSalesShipment=ma questo NON \u00e8 una Spedizione di una Vendita ProductNotSet=Non Impostato ProductNotYetAvailable=Non Ancora Disponibile +ProductNote=NOTA ProductNoteForContentOptions=NOTA: Per le opzioni contenuto, usare il Tab Contenuto. ProductNoteKeywordsAutomaticallyCreated=Chiavi sono create automaticamente quando le informazioni sul prodotto sono cambiate, ma tu potresti manualmente CREARE o CANCELLARE le chiavi qui. +ProductNoteKeywordSearch=I check boxes sotto sono usati solamente per aggiungere e rimuovere dal text box sotto, questi non limiteranno le altre azioni per le forms sotto! ProductNoteUserPromotionEntered=NOTA: Solo promozioni inserite dall'utente saranno incluse nella lista di scelta ProductNoteOnItemId=NOTA su Numero Riga ProductNoteOnPartyId=NOTA su Codice Soggetto @@ -1020,6 +1033,7 @@ ProductReceiveSelectedShipment=Ricevi Spedizione Selezionata ProductReceived=Ricevuto ProductRecreateAssociation=(Tu devi ri-creare l'associazione per cambiarla a questo.) +ProductRefineSearch=Raffina Ricerca ProductRedExplanation=<b style="color: red;">Rosso</b> voci data/ora denotano che l'ora attuale \u00e8 prima della Data Da o dopo la Data A. Se la Data Da \u00e8 <b style="color: red;">rossa</b>, associazione non \u00e8 stata ancora iniziata; se la Data A \u00e8 <b style="color: red;">rosso</b>, associazione \u00e8 scaduta (<u>e dovrebbe essere probabilmente cancellata</u>). ProductRegularPrice=Prezzo Regolare ProductRejectedReason=Motivo Scarto @@ -1027,6 +1041,9 @@ ProductRelationship=Rapporto ProductRemoveBefore=Rimuovi Prodotto Prima ProductRemoveExpiredProductMembers=Rimuovi Membri Prodotti Scaduti +ProductRemoveFeature=Rimuovi Caratteristica +ProductRemoveFeatureFromResults=Rimuovi Caratteristica dai Risultati +ProductRemoveResultsFrom=Rimuovi i Risultati da ProductReorderQuantity=Quantit\u00e0 Riordinata ProductReplaceOriginal=Sostituisci Originale ProductRequireAmount=Importo Richiesto Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl?view=diff&rev=442000&r1=441999&r2=442000 ============================================================================== --- incubator/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl (original) +++ incubator/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl Sun Sep 10 13:27:27 2006 @@ -91,7 +91,7 @@ <a href="<@ofbizUrl>keywordsearch/~VIEW_INDEX=${viewIndex-1}/~VIEW_SIZE=${viewSize}/~clearSearch=N</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> | </#if> <#if 0 < listSize?int> - <span class="tabletext">${lowIndex+1} - ${highIndex} of ${listSize}</span> + <span class="tabletext">${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span> </#if> <#if highIndex?int < listSize?int> | <a href="<@ofbizUrl>keywordsearch/~VIEW_INDEX=${viewIndex+1}/~VIEW_SIZE=${viewSize}/~clearSearch=N</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a> @@ -102,7 +102,7 @@ </table> <hr class="sepbar"/> -<div class="tabletext"><b>NOTE:</b> The check boxes above are used only to add to and remove from the text box below, they will not limit the other actions for the forms below!</div> +<div class="tabletext"><b>${uiLabelMap.ProductNote}:</b> ${uiLabelMap.ProductNoteKeywordSearch}</div> <hr class="sepbar"/> ${screens.render("component://product/widget/catalog/ProductScreens.xml#CreateVirtualWithVariantsFormInclude")} @@ -111,9 +111,9 @@ <div class="tabletext"> <form method="post" action="<@ofbizUrl>searchRemoveFromCategory</@ofbizUrl>" - <b>Remove Results From </b> ${uiLabelMap.ProductCategory}: + <b>${uiLabelMap.ProductRemoveResultsFrom} </b> ${uiLabelMap.ProductCategory}: <select class="selectBox" name="SE_SEARCH_CATEGORY_ID"> - <option value="">- Any Category -</option> + <option value="">- ${uiLabelMap.ProductAnyCategory} -</option> <#list productCategories as productCategory> <#assign displayDesc = productCategory.description?default("No Description")> <#if 28 < displayDesc?length> @@ -123,7 +123,7 @@ </#list> </select> <input type="hidden" name="clearSearch" value="N"> - <input type="submit" value="Remove" class="smallSubmit"><br/> + <input type="submit" value="${uiLabelMap.CommonRemove}" class="smallSubmit"><br/> </form> </div> @@ -131,9 +131,9 @@ <div class="tabletext"> <form method="post" action="<@ofbizUrl>searchExpireFromCategory</@ofbizUrl>" name="searchExpireFromCategory"> - <b>Expire Results From </b> ${uiLabelMap.ProductCategory}: + <b>${uiLabelMap.ProductExpireResultsFrom} </b> ${uiLabelMap.ProductCategory}: <select class="selectBox" name="SE_SEARCH_CATEGORY_ID"> - <option value="">- Any Category -</option> + <option value="">- ${uiLabelMap.ProductAnyCategory} -</option> <#list productCategories as productCategory> <#assign displayDesc = productCategory.description?default("No Description")> <#if 28 < displayDesc?length> @@ -142,9 +142,9 @@ <option value="${productCategory.productCategoryId}">${displayDesc} [${productCategory.productCategoryId}]</option> </#list> </select> - Thru<input type="text" size="25" name="thruDate" class="inputBox"><a href="javascript:call_cal(document.searchExpireFromCategory.thruDate, null);"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"></a> + ${uiLabelMap.CommonThru}<input type="text" size="25" name="thruDate" class="inputBox"><a href="javascript:call_cal(document.searchExpireFromCategory.thruDate, null);"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"></a> <input type="hidden" name="clearSearch" value="N"> - <input type="submit" value="Expire" class="smallSubmit"><br/> + <input type="submit" value="${uiLabelMap.CommonExpire}" class="smallSubmit"><br/> </form> </div> @@ -152,7 +152,7 @@ <div class="tabletext"> <form method="post" action="<@ofbizUrl>searchAddToCategory</@ofbizUrl>" name="searchAddToCategory"> - <b>Add Results to </b> ${uiLabelMap.ProductCategory}: + <b>${uiLabelMap.ProductAddResultsTo} </b> ${uiLabelMap.ProductCategory}: <select class="selectBox" name="SE_SEARCH_CATEGORY_ID"> <#list productCategories as productCategory> <#assign displayDesc = productCategory.description?default("No Description")> @@ -162,9 +162,9 @@ <option value="${productCategory.productCategoryId}">${displayDesc} [${productCategory.productCategoryId}]</option> </#list> </select> - From<input type="text" size="25" name="fromDate" class="inputBox"><a href="javascript:call_cal(document.searchAddToCategory.fromDate, null);"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"></a> + ${uiLabelMap.CommonFrom}<input type="text" size="25" name="fromDate" class="inputBox"><a href="javascript:call_cal(document.searchAddToCategory.fromDate, null);"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"></a> <input type="hidden" name="clearSearch" value="N"> - <input type="submit" value="Add to Category" class="smallSubmit"><br/> + <input type="submit" value="${uiLabelMap.ProductAddToCategory}" class="smallSubmit"><br/> </form> </div> @@ -172,18 +172,18 @@ <div class="tabletext"> <form method="post" action="<@ofbizUrl>searchAddFeature</@ofbizUrl>" name="searchAddFeature"> - <b>Add Feature to Results:</b><br/> - Feature ID<input type="text" size="10" name="productFeatureId" value="" class="inputBox"> - From<input type="tex"t size="25" name="fromDate" class="inputBox"><a href="javascript:call_cal(document.searchAddFeature.fromDate, null);"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"></a> - Thru<input type="text" size="25" name="thruDate" class="inputBox"><a href="javascript:call_cal(document.searchAddFeature.thruDate, null);"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"></a> + <b>${uiLabelMap.ProductAddFeatureToResults}:</b><br/> + ${uiLabelMap.ProductFeatureId}<input type="text" size="10" name="productFeatureId" value="" class="inputBox"> + ${uiLabelMap.CommonFrom}<input type="tex"t size="25" name="fromDate" class="inputBox"><a href="javascript:call_cal(document.searchAddFeature.fromDate, null);"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"></a> + ${uiLabelMap.CommonThru}<input type="text" size="25" name="thruDate" class="inputBox"><a href="javascript:call_cal(document.searchAddFeature.thruDate, null);"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"></a> <br/> - Amount<input type="text" size="5" name="amount" value="" class="inputBox"> - Sequence<input type="text" size="5" name="sequenceNum" value="" class="inputBox"> - Application Type + ${uiLabelMap.CommonAmount}<input type="text" size="5" name="amount" value="" class="inputBox"> + ${uiLabelMap.CommonSequence}<input type="text" size="5" name="sequenceNum" value="" class="inputBox"> + ${uiLabelMap.ProductFeatureApplicationType} ${uiLabelMap.ProductCategoryId}: <select name='productFeatureApplTypeId' size='1' class='selectBox'> <#list applicationTypes as applicationType> - <#assign displayDesc = applicationType.description?default("No Description")> + <#assign displayDesc = applicationType.get("description", locale)?default("No Description")> <#if 18 < displayDesc?length> <#assign displayDesc = displayDesc[0..15] + "..."> </#if> @@ -191,7 +191,7 @@ </#list> </select> <input type="hidden" name="clearSearch" value="N"> - <input type="submit" value="Add Feature" class="smallSubmit"><br/> + <input type="submit" value="${uiLabelMap.ProductAddFeature}" class="smallSubmit"><br/> </form> </div> @@ -199,10 +199,10 @@ <div class="tabletext"> <form method="post" action="<@ofbizUrl>searchRemoveFeature</@ofbizUrl>" name="searchRemoveFeature"> - <b>Remove Feature from Results:</b><br/> - Feature ID<input type="text" size="10" name="productFeatureId" value="" class="inputBox"> + <b>${uiLabelMap.ProductRemoveFeatureFromResults}:</b><br/> + ${uiLabelMap.ProductFeatureId}<input type="text" size="10" name="productFeatureId" value="" class="inputBox"> <input type="hidden" name="clearSearch" value="N"> - <input type="submit" value="Remove Feature" class="smallSubmit"><br/> + <input type="submit" value="${uiLabelMap.ProductRemoveFeature}" class="smallSubmit"><br/> </form> </div> </#if> Modified: incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties?view=diff&rev=442000&r1=441999&r2=442000 ============================================================================== --- incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties (original) +++ incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties Sun Sep 10 13:27:27 2006 @@ -1067,3 +1067,205 @@ Enumeration.description.PROMO_ORDER_PERCENT=Order Percent Discount Enumeration.description.PROMO_ORDER_AMOUNT=Order Amount Flat Enumeration.description.PROMO_PROD_SPPRC=Product for [Special Promo] Price + +StatusValidChange.transitionName.PAYMENT_NOT_RECEIVED.PAYMENT_RECEIVED=Payment Received +StatusValidChange.transitionName.PAYMENT_NOT_RECEIVED.PAYMENT_CANCELLED=Payment Cancelled +StatusValidChange.transitionName.PAYMENT_NOT_AUTH.PAYMENT_AUTHORIZED=Payment Authorized +StatusValidChange.transitionName.PAYMENT_NOT_AUTH.PAYMENT_CANCELLED=Payment Cancelled +StatusValidChange.transitionName.PAYMENT_AUTHORIZED.PAYMENT_SETTLED=Payment Settled +StatusValidChange.transitionName.PAYMENT_AUTHORIZED.PAYMENT_CANCELLED=Payment Cancelled + +StatusValidChange.transitionName.INVOICE_IN_PROCESS.INVOICE_READY=Mark Ready +StatusValidChange.transitionName.INVOICE_IN_PROCESS.INVOICE_CANCELLED=Cancel +StatusValidChange.transitionName.INVOICE_IN_PROCESS.INVOICE_SENT=Send +StatusValidChange.transitionName.INVOICE_IN_PROCESS.INVOICE_RECEIVED=Receive +StatusValidChange.transitionName.INVOICE_SENT.INVOICE_READY=Mark Ready +StatusValidChange.transitionName.INVOICE_SENT.INVOICE_RECEIVED=Receive +StatusValidChange.transitionName.INVOICE_RECEIVED.INVOICE_READY=Mark Receive +StatusValidChange.transitionName.INVOICE_SENT.INVOICE_CANCELLED=Cancel +StatusValidChange.transitionName.INVOICE_RECEIVED.INVOICE_CANCELLED=Cancel +StatusValidChange.transitionName.INVOICE_SENT.INVOICE_IN_PROCESS=Enable sales invoice update +StatusValidChange.transitionName.INVOICE_RECEIVED.INVOICE_IN_PROCESS=Enable purch.invoice update +StatusValidChange.transitionName.INVOICE_IN_PROCESS.INVOICE_APPROVED=Approve +StatusValidChange.transitionName.INVOICE_APPROVED.INVOICE_SENT=Send +StatusValidChange.transitionName.INVOICE_IN_PROCESS.INVOICE_RECEIVED=Receive +StatusValidChange.transitionName.INVOICE_RECEIVED.INVOICE_APPROVED=Approve +StatusValidChange.transitionName.INVOICE_APPROVED.INVOICE_READY=Mark Ready +StatusValidChange.transitionName.INVOICE_READY.INVOICE_PAID=Pay +StatusValidChange.transitionName.INVOICE_READY.INVOICE_WRITEOFF=Write Off + +StatusValidChange.transitionName.PMNT_NOT_PAID.PMNT_SENT=Payment Send +StatusValidChange.transitionName.PMNT_NOT_PAID.PMNT_RECEIVED=Payment Received +StatusValidChange.transitionName.PMNT_NOT_PAID.PMNT_CANCELLED=Payment Cancelled +StatusValidChange.transitionName.PMNT_SENT.PMNT_CONFIRMED=Payment Confirmed +StatusValidChange.transitionName.PMNT_RECEIVED.PMNT_CONFIRMED=Payment Confirmed + +StatusValidChange.transitionName.CTNT_IN_PROGRESS.CTNT_INITIAL_DRAFT=First draft +StatusValidChange.transitionName.CTNT_IN_PROGRESS.CTNT_PUBLISHED=Publised, not revised +StatusValidChange.transitionName.CTNT_INITIAL_DRAFT.CTNT_REVISED_DRAFT=Draft revised +StatusValidChange.transitionName.CTNT_INITIAL_DRAFT.CTNT_PUBLISHED=Initial draft Publised +StatusValidChange.transitionName.CTNT_REVISED_DRAFT.CTNT_FINAL_DRAFT=Final draft +StatusValidChange.transitionName.CTNT_REVISED_DRAFT.CTNT_PUBLISHED=Revised draft Publised +StatusValidChange.transitionName.CTNT_FINAL_DRAFT.CTNT_PUBLISHED=Final draft Published +StatusValidChange.transitionName.CTNT_PUBLISHED.CTNT_DEACTIVATED=Deactivated + +StatusValidChange.transitionName.CLPT_PENDING.CLPT_ACCEPTED=Accept +StatusValidChange.transitionName.CLPT_PENDING.CLPT_REJECTED=Reject +StatusValidChange.transitionName.CLPT_ACCEPTED.CLPT_REJECTED=Reject +StatusValidChange.transitionName.CLPT_REJECTED.CLPT_ACCEPTED=Accept +StatusValidChange.transitionName.CLPT_REJECTED.CLPT_PENDING=Pending Accept + +StatusValidChange.transitionName.ORDER_CREATED.ORDER_PROCESSING=Process Order +StatusValidChange.transitionName.ORDER_CREATED.ORDER_APPROVED=Approve Order +StatusValidChange.transitionName.ORDER_CREATED.ORDER_REJECTED=Reject Order +StatusValidChange.transitionName.ORDER_CREATED.ORDER_CANCELLED=Cancel Order +StatusValidChange.transitionName.ORDER_PROCESSING.ORDER_APPROVED=Approve Order +StatusValidChange.transitionName.ORDER_PROCESSING.ORDER_REJECTED=Reject Order +StatusValidChange.transitionName.ORDER_PROCESSING.ORDER_CANCELLED=Cancel Order +StatusValidChange.transitionName.ORDER_APPROVED.ORDER_SENT=Send Order +StatusValidChange.transitionName.ORDER_APPROVED.ORDER_PROCESSING=Hold Order +StatusValidChange.transitionName.ORDER_APPROVED.ORDER_COMPLETED=Complete Order +StatusValidChange.transitionName.ORDER_APPROVED.ORDER_CANCELLED=Cancel Order +StatusValidChange.transitionName.ORDER_SENT.ORDER_COMPLETED=Order Completed +StatusValidChange.transitionName.ORDER_SENT.ORDER_CANCELLED=Order Cancelled + +StatusValidChange.transitionName.ITEM_CREATED.ITEM_APPROVED=Approve Item +StatusValidChange.transitionName.ITEM_CREATED.ITEM_REJECTED=Reject Item +StatusValidChange.transitionName.ITEM_CREATED.ITEM_CANCELLED=Cancel Item +StatusValidChange.transitionName.ITEM_APPROVED.ITEM_COMPLETED=Complete Item +StatusValidChange.transitionName.ITEM_APPROVED.ITEM_CANCELLED=Cancel Item + +StatusValidChange.transitionName.ODS_SUBMITTED.ODS_ACCEPTED=Accept Delivery Information +StatusValidChange.transitionName.ODS_ACCEPTED.ODS_APPROVED=Approve Delivery Schedule +StatusValidChange.transitionName.ODS_APPROVED.ODS_ARRANGED=Arrange Delivery +StatusValidChange.transitionName.ODS_SUBMITTED.ODS_CANCELLED=Cancel Delivery +StatusValidChange.transitionName.ODS_ACCEPTED.ODS_CANCELLED=Cancel Delivery +StatusValidChange.transitionName.ODS_APPROVED.ODS_CANCELLED=Cancel Delivery +StatusValidChange.transitionName.ODS_ARRANGED.ODS_CANCELLED=Cancel Delivery + +StatusValidChange.transitionName.RETURN_REQUESTED.RETURN_ACCEPTED=Requested Return Accepted +StatusValidChange.transitionName.RETURN_REQUESTED.RETURN_CANCELLED=Requested Return Cancelled +StatusValidChange.transitionName.RETURN_ACCEPTED.RETURN_RECEIVED=Accepted Return Received +StatusValidChange.transitionName.RETURN_ACCEPTED.RETURN_CANCELLED=Accepted Return Cancelled +StatusValidChange.transitionName.RETURN_RECEIVED.RETURN_COMPLETED=Received Return Completed +StatusValidChange.transitionName.RETURN_RECEIVED.RETURN_CANCELLED=Received Return Cancelled + +StatusValidChange.transitionName.CRQ_SUBMITTED.CRQ_ACCEPTED=Accept Request +StatusValidChange.transitionName.CRQ_SUBMITTED.CRQ_REJECTED=Reject Request +StatusValidChange.transitionName.CRQ_SUBMITTED.CRQ_CANCELLED=Cancel Request +StatusValidChange.transitionName.CRQ_ACCEPTED.CRQ_REVIEWED=Review Request +StatusValidChange.transitionName.CRQ_ACCEPTED.CRQ_CANCELLED=Cancel Request +StatusValidChange.transitionName.CRQ_REVIEWED.CRQ_COMPLETED=Complete Request +StatusValidChange.transitionName.CRQ_REVIEWED.CRQ_CANCELLED=Cancel Request + +StatusValidChange.transitionName.REQ_CREATED.REQ_APPROVED=Accept Requirement +StatusValidChange.transitionName.REQ_CREATED.REQ_REJECTED=Reject Requirement +StatusValidChange.transitionName.REQ_APPROVED.REQ_ORDERED=Order Requirement +StatusValidChange.transitionName.REQ_APPROVED.REQ_REJECTED=Reject Requirement + +StatusValidChange.transitionName.QUO_CREATED.QUO_APPROVED=Accept Quote +StatusValidChange.transitionName.QUO_CREATED.QUO_REJECTED=Reject Quote +StatusValidChange.transitionName.QUO_APPROVED.QUO_ORDERED=Order Quote +StatusValidChange.transitionName.QUO_APPROVED.QUO_REJECTED=Reject Quote + +StatusValidChange.transitionName.PARTY_ENABLED.PARTY_DISABLED=Disable + +StatusValidChange.transitionName.COM_ENTERED.COM_PENDING=Set Pending +StatusValidChange.transitionName.COM_PENDING.COM_READ=Mark Read +StatusValidChange.transitionName.COM_PENDING.COM_IN_PROGRESS=Set In Progress +StatusValidChange.transitionName.COM_READ.COM_IN_PROGRESS=Set In Progress +StatusValidChange.transitionName.COM_READ.COM_COMPLETE=Complete +StatusValidChange.transitionName.COM_IN_PROGRESS.COM_COMPLETE=Complete +StatusValidChange.transitionName.COM_COMPLETE.COM_RESOLVED=Resolve +StatusValidChange.transitionName.COM_COMPLETE.COM_REFERRED=Refer +StatusValidChange.transitionName.COM_UNKNOWN_PARTY.COM_COMPLETE=Complete +StatusValidChange.transitionName.COM_PENDING.COM_COMPLETE=Complete +StatusValidChange.transitionName.COM_ENTERED.COM_CANCELLED=Cancel +StatusValidChange.transitionName.COM_PENDING.COM_CANCELLED=Cancel +StatusValidChange.transitionName.COM_READ.COM_CANCELLED=Cancel +StatusValidChange.transitionName.COM_IN_PROGRESS.COM_CANCELLED=Cancel +StatusValidChange.transitionName.COM_COMPLETE.COM_CANCELLED=Cancel +StatusValidChange.transitionName.COM_RESOLVED.COM_CANCELLED=Cancel +StatusValidChange.transitionName.COM_REFERRED.COM_CANCELLED=Cancel +StatusValidChange.transitionName.COM_UNKNOWN_PARTY.COM_CANCELLED=Cancel + +StatusValidChange.transitionName.INV_ON_ORDER.INV_AVAILABLE=Order Arrived +StatusValidChange.transitionName.INV_AVAILABLE.INV_PROMISED=Promise +StatusValidChange.transitionName.INV_AVAILABLE.INV_DEFECTIVE=Mark As Defective +StatusValidChange.transitionName.INV_AVAILABLE.INV_BEING_TRANSFERED=Being Transfered +StatusValidChange.transitionName.INV_BEING_TRANSFERED.INV_AVAILABLE=Transfer Complete +StatusValidChange.transitionName.INV_PROMISED.INV_AVAILABLE=Cancel Promise +StatusValidChange.transitionName.INV_PROMISED.INV_DELIVERED=Deliver +StatusValidChange.transitionName.INV_PROMISED.INV_DEFECTIVE=Mark As Defective +StatusValidChange.transitionName.INV_PROMISED.INV_BEING_TRANS_PRM=Being Transfered (Promised) +StatusValidChange.transitionName.INV_BEING_TRANS_PRM.INV_PROMISED=Transfer Complete (Promised) +StatusValidChange.transitionName.INV_DELIVERED.INV_AVAILABLE=Return Available +StatusValidChange.transitionName.INV_DELIVERED.INV_RETURNED=Return Status Pending +StatusValidChange.transitionName.INV_RETURNED.INV_AVAILABLE=Make Return Available +StatusValidChange.transitionName.INV_RETURNED.INV_DEFECTIVE=Mark Return Defective + +StatusValidChange.transitionName.IXF_REQUESTED.IXF_SCHEDULED=Inventory Request Scheduled +StatusValidChange.transitionName.IXF_REQUESTED.IXF_EN_ROUTE=Inventory Request In Route +StatusValidChange.transitionName.IXF_REQUESTED.IXF_COMPLETE=Inventory Request Completed +StatusValidChange.transitionName.IXF_REQUESTED.IXF_CANCELLED=Inventory Request Cancelled +StatusValidChange.transitionName.IXF_SCHEDULED.IXF_EN_ROUTE=Scheduled Inventory In Route +StatusValidChange.transitionName.IXF_SCHEDULED.IXF_COMPLETE=Scheduled Inventory Completed +StatusValidChange.transitionName.IXF_SCHEDULED.IXF_CANCELLED=Scheduled Inventory Cancelled +StatusValidChange.transitionName.IXF_EN_ROUTE.IXF_COMPLETE=In Route Transfer Completed + +StatusValidChange.transitionName.PRR_PENDING.PRR_APPROVED=Review Approved +StatusValidChange.transitionName.PRR_PENDING.PRR_DELETED=Review Deleted +StatusValidChange.transitionName.PRR_APPROVED.PRR_DELETED=Review Deleted + +StatusValidChange.transitionName.PURCH_SHIP_CREATED.PURCH_SHIP_RECEIVED=Receive +StatusValidChange.transitionName.PURCH_SHIP_CREATED.PURCH_SHIP_SHIPPED=Ship +StatusValidChange.transitionName.PURCH_SHIP_SHIPPED.PURCH_SHIP_RECEIVED=Receive + +StatusValidChange.transitionName.SHRSCS_NOT_STARTED.SHRSCS_CONFIRMED=Confirm +StatusValidChange.transitionName.SHRSCS_CONFIRMED.SHRSCS_ACCEPTED=Accept +StatusValidChange.transitionName.SHRSCS_CONFIRMED.SHRSCS_VOIDED=Void +StatusValidChange.transitionName.SHRSCS_ACCEPTED.SHRSCS_VOIDED=Void + +StatusValidChange.transitionName.PICKLIST_INPUT.PICKLIST_ASSIGNED=Assign +StatusValidChange.transitionName.PICKLIST_INPUT.PICKLIST_PICKED=Pick +StatusValidChange.transitionName.PICKLIST_INPUT.PICKLIST_CANCELLED=Cancel +StatusValidChange.transitionName.PICKLIST_ASSIGNED.PICKLIST_PICKED=Pick +StatusValidChange.transitionName.PICKLIST_ASSIGNED.PICKLIST_CANCELLED=Cancel + +StatusValidChange.transitionName.CAL_NEEDS_ACTION.CAL_SENT=Send +StatusValidChange.transitionName.CAL_NEEDS_ACTION.CAL_CANCELLED=Cancel +StatusValidChange.transitionName.CAL_SENT.CAL_DECLINED=Decline +StatusValidChange.transitionName.CAL_SENT.CAL_DELEGATED=Delegate +StatusValidChange.transitionName.CAL_SENT.CAL_CANCELLED=Cancel + +StatusValidChange.transitionName.CAL_SENT.CAL_ACCEPTED=Accept +StatusValidChange.transitionName.CAL_ACCEPTED.CAL_COMPLETED=Complete +StatusValidChange.transitionName.CAL_ACCEPTED.CAL_CANCELLED=Cancel +StatusValidChange.transitionName.CAL_ACCEPTED.CAL_DELEGATED=Delegate + +StatusValidChange.transitionName.CAL_NEEDS_ACTION.CAL_TENTATIVE=Tentatively Plan +StatusValidChange.transitionName.CAL_NEEDS_ACTION.CAL_CONFIRMED=Confirm +StatusValidChange.transitionName.CAL_TENTATIVE.CAL_ACCEPTED=Accept +StatusValidChange.transitionName.CAL_TENTATIVE.CAL_DECLINED=Decline +StatusValidChange.transitionName.CAL_TENTATIVE.CAL_DELEGATED=Delegate +StatusValidChange.transitionName.CAL_TENTATIVE.CAL_CANCELLED=Cancel +StatusValidChange.transitionName.CAL_TENTATIVE.CAL_CONFIRMED=Confirm +StatusValidChange.transitionName.CAL_CONFIRMED.CAL_COMPLETED=Complete + +StatusValidChange.transitionName.WF_NOT_STARTED.WF_RUNNING=Start +StatusValidChange.transitionName.WF_RUNNING.WF_SUSPENDED=Suspend +StatusValidChange.transitionName.WF_RUNNING.WF_COMPLETED=Complete +StatusValidChange.transitionName.WF_RUNNING.WF_TERMINATED=Terminate +StatusValidChange.transitionName.WF_RUNNING.WF_ABORTED=Abort +StatusValidChange.transitionName.WF_SUSPENDED.WF_RUNNING=Un-suspend + +StatusValidChange.transitionName.EXST_IN_DESIGN.EXST_DEFINED=Definition Complete +StatusValidChange.transitionName.EXST_DEFINED.EXST_APPROVED=Approve +StatusValidChange.transitionName.EXST_APPROVED.EXST_IMPLEMENTED=Implementation Complete +StatusValidChange.transitionName.EXST_IMPLEMENTED.EXST_TESTED=Testing Complete +StatusValidChange.transitionName.EXST_TESTED.EXST_COMPLETE=Example Completed +StatusValidChange.transitionName.EXST_IN_DESIGN.EXST_CANCELLED=Cancel Example +StatusValidChange.transitionName.EXST_DEFINED.EXST_CANCELLED=Cancel Example +StatusValidChange.transitionName.EXST_APPROVED.EXST_CANCELLED=Cancel Example +StatusValidChange.transitionName.EXST_IMPLEMENTED.EXST_CANCELLED=Cancel Example +StatusValidChange.transitionName.EXST_TESTED.EXST_CANCELLED=Cancel Example Modified: incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties?view=diff&rev=442000&r1=441999&r2=442000 ============================================================================== --- incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties (original) +++ incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties Sun Sep 10 13:27:27 2006 @@ -1067,3 +1067,205 @@ Enumeration.description.PROMO_ORDER_PERCENT=Percentuale Sconto Ordine Enumeration.description.PROMO_ORDER_AMOUNT=Importo Fisso Ordine Enumeration.description.PROMO_PROD_SPPRC=Prodotto per [Promozione Speciale] Prezzo + +StatusValidChange.transitionName.PAYMENT_NOT_RECEIVED.PAYMENT_RECEIVED=Pagamento Ricevuto +StatusValidChange.transitionName.PAYMENT_NOT_RECEIVED.PAYMENT_CANCELLED=Pagamento Cancellato +StatusValidChange.transitionName.PAYMENT_NOT_AUTH.PAYMENT_AUTHORIZED=Pagamento Autorizzato +StatusValidChange.transitionName.PAYMENT_NOT_AUTH.PAYMENT_CANCELLED=Pagamento Cancellato +StatusValidChange.transitionName.PAYMENT_AUTHORIZED.PAYMENT_SETTLED=Pagamento Saldato +StatusValidChange.transitionName.PAYMENT_AUTHORIZED.PAYMENT_CANCELLED=Pagamento Cancellato + +StatusValidChange.transitionName.INVOICE_IN_PROCESS.INVOICE_READY=Marcata Pronta +StatusValidChange.transitionName.INVOICE_IN_PROCESS.INVOICE_CANCELLED=Cancellata +StatusValidChange.transitionName.INVOICE_IN_PROCESS.INVOICE_SENT=Inviata +StatusValidChange.transitionName.INVOICE_IN_PROCESS.INVOICE_RECEIVED=Ricevuta +StatusValidChange.transitionName.INVOICE_SENT.INVOICE_READY=Marcata Pronta +StatusValidChange.transitionName.INVOICE_SENT.INVOICE_RECEIVED=Ricevuta +StatusValidChange.transitionName.INVOICE_RECEIVED.INVOICE_READY=Marcata Ricevuta +StatusValidChange.transitionName.INVOICE_SENT.INVOICE_CANCELLED=Cancellata +StatusValidChange.transitionName.INVOICE_RECEIVED.INVOICE_CANCELLED=Cancellata +StatusValidChange.transitionName.INVOICE_SENT.INVOICE_IN_PROCESS=Abilita aggiornamento fattura di vendita +StatusValidChange.transitionName.INVOICE_RECEIVED.INVOICE_IN_PROCESS=Abilita aggiornamento fattura di acquisto +StatusValidChange.transitionName.INVOICE_IN_PROCESS.INVOICE_APPROVED=Approvata +StatusValidChange.transitionName.INVOICE_APPROVED.INVOICE_SENT=Inviata +StatusValidChange.transitionName.INVOICE_IN_PROCESS.INVOICE_RECEIVED=Ricevuta +StatusValidChange.transitionName.INVOICE_RECEIVED.INVOICE_APPROVED=Approvata +StatusValidChange.transitionName.INVOICE_APPROVED.INVOICE_READY=Marcata Pronta +StatusValidChange.transitionName.INVOICE_READY.INVOICE_PAID=Pagata +StatusValidChange.transitionName.INVOICE_READY.INVOICE_WRITEOFF=Distrutta + +StatusValidChange.transitionName.PMNT_NOT_PAID.PMNT_SENT=Pagamento Inviato +StatusValidChange.transitionName.PMNT_NOT_PAID.PMNT_RECEIVED=Pagamento Ricevuto +StatusValidChange.transitionName.PMNT_NOT_PAID.PMNT_CANCELLED=Pagamento Cancellato +StatusValidChange.transitionName.PMNT_SENT.PMNT_CONFIRMED=Pagamento Confermato +StatusValidChange.transitionName.PMNT_RECEIVED.PMNT_CONFIRMED=Pagamento Confermato + +StatusValidChange.transitionName.CTNT_IN_PROGRESS.CTNT_INITIAL_DRAFT=Prima bozza +StatusValidChange.transitionName.CTNT_IN_PROGRESS.CTNT_PUBLISHED=Pubblicato, non corretta +StatusValidChange.transitionName.CTNT_INITIAL_DRAFT.CTNT_REVISED_DRAFT=Bozza corretta +StatusValidChange.transitionName.CTNT_INITIAL_DRAFT.CTNT_PUBLISHED=Bozza iniziale Pubblicata +StatusValidChange.transitionName.CTNT_REVISED_DRAFT.CTNT_FINAL_DRAFT=Bozza Finale +StatusValidChange.transitionName.CTNT_REVISED_DRAFT.CTNT_PUBLISHED=Bozza corretta Pubblicata +StatusValidChange.transitionName.CTNT_FINAL_DRAFT.CTNT_PUBLISHED=Bozza Finale Pubblicata +StatusValidChange.transitionName.CTNT_PUBLISHED.CTNT_DEACTIVATED=Disattivata + +StatusValidChange.transitionName.CLPT_PENDING.CLPT_ACCEPTED=Accettata +StatusValidChange.transitionName.CLPT_PENDING.CLPT_REJECTED=Rifiutata +StatusValidChange.transitionName.CLPT_ACCEPTED.CLPT_REJECTED=Rifiutata +StatusValidChange.transitionName.CLPT_REJECTED.CLPT_ACCEPTED=Accettata +StatusValidChange.transitionName.CLPT_REJECTED.CLPT_PENDING=In Attesa di Accettazione + +StatusValidChange.transitionName.ORDER_CREATED.ORDER_PROCESSING=Esegui Ordine +StatusValidChange.transitionName.ORDER_CREATED.ORDER_APPROVED=Approva Ordine +StatusValidChange.transitionName.ORDER_CREATED.ORDER_REJECTED=Rifiuta Ordine +StatusValidChange.transitionName.ORDER_CREATED.ORDER_CANCELLED=Cancella Ordine +StatusValidChange.transitionName.ORDER_PROCESSING.ORDER_APPROVED=Approva Ordine +StatusValidChange.transitionName.ORDER_PROCESSING.ORDER_REJECTED=Rifiuta Ordine +StatusValidChange.transitionName.ORDER_PROCESSING.ORDER_CANCELLED=Cancella Ordine +StatusValidChange.transitionName.ORDER_APPROVED.ORDER_SENT=Invia Ordine +StatusValidChange.transitionName.ORDER_APPROVED.ORDER_PROCESSING=Congela Ordine +StatusValidChange.transitionName.ORDER_APPROVED.ORDER_COMPLETED=Completa Ordine +StatusValidChange.transitionName.ORDER_APPROVED.ORDER_CANCELLED=Cancella Ordine +StatusValidChange.transitionName.ORDER_SENT.ORDER_COMPLETED=Ordine Completato +StatusValidChange.transitionName.ORDER_SENT.ORDER_CANCELLED=Ordine Cancellato + +StatusValidChange.transitionName.ITEM_CREATED.ITEM_APPROVED=Approva Riga +StatusValidChange.transitionName.ITEM_CREATED.ITEM_REJECTED=Rifiuta Riga +StatusValidChange.transitionName.ITEM_CREATED.ITEM_CANCELLED=Cancella Riga +StatusValidChange.transitionName.ITEM_APPROVED.ITEM_COMPLETED=Completa Riga +StatusValidChange.transitionName.ITEM_APPROVED.ITEM_CANCELLED=Cancella Riga + +StatusValidChange.transitionName.ODS_SUBMITTED.ODS_ACCEPTED=Accetta Informazioni Consegna +StatusValidChange.transitionName.ODS_ACCEPTED.ODS_APPROVED=Approva Scedulazione Consegna +StatusValidChange.transitionName.ODS_APPROVED.ODS_ARRANGED=Prepara Consegna +StatusValidChange.transitionName.ODS_SUBMITTED.ODS_CANCELLED=Cancella Consegna +StatusValidChange.transitionName.ODS_ACCEPTED.ODS_CANCELLED=Cancella Consegna +StatusValidChange.transitionName.ODS_APPROVED.ODS_CANCELLED=Cancella Consegna +StatusValidChange.transitionName.ODS_ARRANGED.ODS_CANCELLED=Cancella Consegna + +StatusValidChange.transitionName.RETURN_REQUESTED.RETURN_ACCEPTED=Richiesta Reso Accettata +StatusValidChange.transitionName.RETURN_REQUESTED.RETURN_CANCELLED=Richiesta Reso Cancellata +StatusValidChange.transitionName.RETURN_ACCEPTED.RETURN_RECEIVED=Accettata Reso Ricevuto +StatusValidChange.transitionName.RETURN_ACCEPTED.RETURN_CANCELLED=Accettata Reso Cancellato +StatusValidChange.transitionName.RETURN_RECEIVED.RETURN_COMPLETED=Ricevuto Reso Completato +StatusValidChange.transitionName.RETURN_RECEIVED.RETURN_CANCELLED=Ricevuto Reso Cancellato + +StatusValidChange.transitionName.CRQ_SUBMITTED.CRQ_ACCEPTED=Richiesta Accettata +StatusValidChange.transitionName.CRQ_SUBMITTED.CRQ_REJECTED=Richiesta Rifiutata +StatusValidChange.transitionName.CRQ_SUBMITTED.CRQ_CANCELLED=Richiesta Cancellata +StatusValidChange.transitionName.CRQ_ACCEPTED.CRQ_REVIEWED=Richiesta Revisionata +StatusValidChange.transitionName.CRQ_ACCEPTED.CRQ_CANCELLED=Richiesta Cancellata +StatusValidChange.transitionName.CRQ_REVIEWED.CRQ_COMPLETED=Richiesta Completata +StatusValidChange.transitionName.CRQ_REVIEWED.CRQ_CANCELLED=Richiesta Cancellata + +StatusValidChange.transitionName.REQ_CREATED.REQ_APPROVED=Fabbisogno Accettato +StatusValidChange.transitionName.REQ_CREATED.REQ_REJECTED=Fabbisogno Rifiutato +StatusValidChange.transitionName.REQ_APPROVED.REQ_ORDERED=Fabbisogno Ordine +StatusValidChange.transitionName.REQ_APPROVED.REQ_REJECTED=Fabbisogno Rifiutato + +StatusValidChange.transitionName.QUO_CREATED.QUO_APPROVED=Preventivo Accettato +StatusValidChange.transitionName.QUO_CREATED.QUO_REJECTED=Preventivo Rifiutato +StatusValidChange.transitionName.QUO_APPROVED.QUO_ORDERED=Preventivo Ordine +StatusValidChange.transitionName.QUO_APPROVED.QUO_REJECTED=Preventivo Rifiutato + +StatusValidChange.transitionName.PARTY_ENABLED.PARTY_DISABLED=Disable + +StatusValidChange.transitionName.COM_ENTERED.COM_PENDING=Impostato a Sospeso +StatusValidChange.transitionName.COM_PENDING.COM_READ=Marcato Pronto +StatusValidChange.transitionName.COM_PENDING.COM_IN_PROGRESS=Impostato In Corso +StatusValidChange.transitionName.COM_READ.COM_IN_PROGRESS=Impostato In Corso +StatusValidChange.transitionName.COM_READ.COM_COMPLETE=Completato +StatusValidChange.transitionName.COM_IN_PROGRESS.COM_COMPLETE=Completato +StatusValidChange.transitionName.COM_COMPLETE.COM_RESOLVED=Risolto +StatusValidChange.transitionName.COM_COMPLETE.COM_REFERRED=Riferito +StatusValidChange.transitionName.COM_UNKNOWN_PARTY.COM_COMPLETE=Completato +StatusValidChange.transitionName.COM_PENDING.COM_COMPLETE=Completato +StatusValidChange.transitionName.COM_ENTERED.COM_CANCELLED=Cancellato +StatusValidChange.transitionName.COM_PENDING.COM_CANCELLED=Cancellato +StatusValidChange.transitionName.COM_READ.COM_CANCELLED=Cancellato +StatusValidChange.transitionName.COM_IN_PROGRESS.COM_CANCELLED=Cancellato +StatusValidChange.transitionName.COM_COMPLETE.COM_CANCELLED=Cancellato +StatusValidChange.transitionName.COM_RESOLVED.COM_CANCELLED=Cancellato +StatusValidChange.transitionName.COM_REFERRED.COM_CANCELLED=Cancellato +StatusValidChange.transitionName.COM_UNKNOWN_PARTY.COM_CANCELLED=Cancellato + +StatusValidChange.transitionName.INV_ON_ORDER.INV_AVAILABLE=Ordine Arrivato +StatusValidChange.transitionName.INV_AVAILABLE.INV_PROMISED=Promesso +StatusValidChange.transitionName.INV_AVAILABLE.INV_DEFECTIVE=Marcato Come Difettoso +StatusValidChange.transitionName.INV_AVAILABLE.INV_BEING_TRANSFERED=In Trasferimento +StatusValidChange.transitionName.INV_BEING_TRANSFERED.INV_AVAILABLE=Trasferimento Completato +StatusValidChange.transitionName.INV_PROMISED.INV_AVAILABLE=Promessa Cancellata +StatusValidChange.transitionName.INV_PROMISED.INV_DELIVERED=Consegnato +StatusValidChange.transitionName.INV_PROMISED.INV_DEFECTIVE=Marcato Come Difettoso +StatusValidChange.transitionName.INV_PROMISED.INV_BEING_TRANS_PRM=In Trasferimento (Promesso) +StatusValidChange.transitionName.INV_BEING_TRANS_PRM.INV_PROMISED=Trasferimento Completato (Promesso) +StatusValidChange.transitionName.INV_DELIVERED.INV_AVAILABLE=Reso Disponibile +StatusValidChange.transitionName.INV_DELIVERED.INV_RETURNED=Stato Reso Sospeso +StatusValidChange.transitionName.INV_RETURNED.INV_AVAILABLE=Marcato Reso Disponibile +StatusValidChange.transitionName.INV_RETURNED.INV_DEFECTIVE=Marcato Reso Difettoso + +StatusValidChange.transitionName.IXF_REQUESTED.IXF_SCHEDULED=Richiesta Inventario Schedulata +StatusValidChange.transitionName.IXF_REQUESTED.IXF_EN_ROUTE=Richiesta Inventario Nel Percorso +StatusValidChange.transitionName.IXF_REQUESTED.IXF_COMPLETE=Richiesta Inventario Completata +StatusValidChange.transitionName.IXF_REQUESTED.IXF_CANCELLED=Richiesta Inventario Cancellata +StatusValidChange.transitionName.IXF_SCHEDULED.IXF_EN_ROUTE=Richiesta Inventario Nel Percorso +StatusValidChange.transitionName.IXF_SCHEDULED.IXF_COMPLETE=Richiesta Inventario Completata +StatusValidChange.transitionName.IXF_SCHEDULED.IXF_CANCELLED=Richiesta Inventario Cancellata +StatusValidChange.transitionName.IXF_EN_ROUTE.IXF_COMPLETE=Nel Percorso Trasferimento Completato + +StatusValidChange.transitionName.PRR_PENDING.PRR_APPROVED=Recensione Approvata +StatusValidChange.transitionName.PRR_PENDING.PRR_DELETED=Recensione Cancellata +StatusValidChange.transitionName.PRR_APPROVED.PRR_DELETED=Recensione Cancellata + +StatusValidChange.transitionName.PURCH_SHIP_CREATED.PURCH_SHIP_RECEIVED=Ricevuto +StatusValidChange.transitionName.PURCH_SHIP_CREATED.PURCH_SHIP_SHIPPED=Spedita +StatusValidChange.transitionName.PURCH_SHIP_SHIPPED.PURCH_SHIP_RECEIVED=Ricevuto + +StatusValidChange.transitionName.SHRSCS_NOT_STARTED.SHRSCS_CONFIRMED=Confermato +StatusValidChange.transitionName.SHRSCS_CONFIRMED.SHRSCS_ACCEPTED=Accettato +StatusValidChange.transitionName.SHRSCS_CONFIRMED.SHRSCS_VOIDED=Vuoto +StatusValidChange.transitionName.SHRSCS_ACCEPTED.SHRSCS_VOIDED=Vuoto + +StatusValidChange.transitionName.PICKLIST_INPUT.PICKLIST_ASSIGNED=Assegna +StatusValidChange.transitionName.PICKLIST_INPUT.PICKLIST_PICKED=Preleva +StatusValidChange.transitionName.PICKLIST_INPUT.PICKLIST_CANCELLED=Cancella +StatusValidChange.transitionName.PICKLIST_ASSIGNED.PICKLIST_PICKED=Preleva +StatusValidChange.transitionName.PICKLIST_ASSIGNED.PICKLIST_CANCELLED=Cancella + +StatusValidChange.transitionName.CAL_NEEDS_ACTION.CAL_SENT=Invia +StatusValidChange.transitionName.CAL_NEEDS_ACTION.CAL_CANCELLED=Cancella +StatusValidChange.transitionName.CAL_SENT.CAL_DECLINED=Declina +StatusValidChange.transitionName.CAL_SENT.CAL_DELEGATED=Delega +StatusValidChange.transitionName.CAL_SENT.CAL_CANCELLED=Cancella + +StatusValidChange.transitionName.CAL_SENT.CAL_ACCEPTED=Accettato +StatusValidChange.transitionName.CAL_ACCEPTED.CAL_COMPLETED=Completato +StatusValidChange.transitionName.CAL_ACCEPTED.CAL_CANCELLED=Cancellato +StatusValidChange.transitionName.CAL_ACCEPTED.CAL_DELEGATED=Delegato + +StatusValidChange.transitionName.CAL_NEEDS_ACTION.CAL_TENTATIVE=Piano Provvisorio +StatusValidChange.transitionName.CAL_NEEDS_ACTION.CAL_CONFIRMED=Confermato +StatusValidChange.transitionName.CAL_TENTATIVE.CAL_ACCEPTED=Accettato +StatusValidChange.transitionName.CAL_TENTATIVE.CAL_DECLINED=Declina +StatusValidChange.transitionName.CAL_TENTATIVE.CAL_DELEGATED=Delegato +StatusValidChange.transitionName.CAL_TENTATIVE.CAL_CANCELLED=Cancellato +StatusValidChange.transitionName.CAL_TENTATIVE.CAL_CONFIRMED=Confermato +StatusValidChange.transitionName.CAL_CONFIRMED.CAL_COMPLETED=Completato + +StatusValidChange.transitionName.WF_NOT_STARTED.WF_RUNNING=Iniziato +StatusValidChange.transitionName.WF_RUNNING.WF_SUSPENDED=Sospeso +StatusValidChange.transitionName.WF_RUNNING.WF_COMPLETED=Completato +StatusValidChange.transitionName.WF_RUNNING.WF_TERMINATED=Terminato +StatusValidChange.transitionName.WF_RUNNING.WF_ABORTED=Abortire +StatusValidChange.transitionName.WF_SUSPENDED.WF_RUNNING=Riabilita + +StatusValidChange.transitionName.EXST_IN_DESIGN.EXST_DEFINED=Definizione Completata +StatusValidChange.transitionName.EXST_DEFINED.EXST_APPROVED=Approva +StatusValidChange.transitionName.EXST_APPROVED.EXST_IMPLEMENTED=Implementazione Completata +StatusValidChange.transitionName.EXST_IMPLEMENTED.EXST_TESTED=Test Completato +StatusValidChange.transitionName.EXST_TESTED.EXST_COMPLETE=Esempio Completato +StatusValidChange.transitionName.EXST_IN_DESIGN.EXST_CANCELLED=Cancella Esempio +StatusValidChange.transitionName.EXST_DEFINED.EXST_CANCELLED=Cancella Esempio +StatusValidChange.transitionName.EXST_APPROVED.EXST_CANCELLED=Cancella Esempio +StatusValidChange.transitionName.EXST_IMPLEMENTED.EXST_CANCELLED=Cancella Esempio +StatusValidChange.transitionName.EXST_TESTED.EXST_CANCELLED=Cancella Esempio Modified: incubator/ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml?view=diff&rev=442000&r1=441999&r2=442000 ============================================================================== --- incubator/ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml (original) +++ incubator/ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml Sun Sep 10 13:27:27 2006 @@ -116,6 +116,7 @@ </entity> <entity entity-name="ServerHitType" package-name="org.ofbiz.webapp.visit" + default-resource-name="WebappEntityLabels" title="Server Hit Bin Entity"> <field name="hitTypeId" type="id"></field> <field name="description" type="description"></field> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |