svn commit: r466018 [1/2] - in /incubator/ofbiz/trunk: applications/accounting/config/ applications/accounting/webapp/accounting/agreement/ applications/accounting/webapp/accounting/fixedasset/ applications/manufacturing/config/ applications/marketing/...

[jacopoc]

Author: jacopoc
Date: Fri Oct 20 00:16:54 2006
New Revision: 466018

URL: http://svn.apache.org/viewvc?view=rev&rev=466018
Log:
Big i18n patch from Marco Risaliti.
OFBIZ-393

Modified:
    incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties
    incubator/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
    incubator/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
    incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties
    incubator/ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml
    incubator/ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml
    incubator/ofbiz/trunk/applications/marketing/widget/ReportForms.xml
    incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties
    incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties
    incubator/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
    incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels.properties
    incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties
    incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
    incubator/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties
    incubator/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels_it.properties
    incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
    incubator/ofbiz/trunk/framework/common/config/CommonUiLabels.properties
    incubator/ofbiz/trunk/framework/common/config/CommonUiLabels_it.properties
    incubator/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties
    incubator/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels_it.properties
    incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/availableservices.bsh
    incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/services.bsh
    incubator/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/threads.bsh
    incubator/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl
    incubator/ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
    incubator/ofbiz/trunk/framework/webtools/webapp/webtools/service/ServiceForms.xml
    incubator/ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl
    incubator/ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl
    incubator/ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceTabBar.ftl
    incubator/ofbiz/trunk/framework/webtools/webapp/webtools/service/services.ftl
    incubator/ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl
    incubator/ofbiz/trunk/framework/webtools/webapp/webtools/service/threads.ftl
    incubator/ofbiz/trunk/framework/webtools/widget/AvailableServicesScreens.xml
    incubator/ofbiz/trunk/framework/webtools/widget/LogScreens.xml
    incubator/ofbiz/trunk/framework/webtools/widget/ServiceScreens.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=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties (original)
+++ incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties Fri Oct 20 00:16:54 2006
@@ -83,11 +83,15 @@
 AccountingBillingAccountPayments=Pagamenti Conto Fatturazione
 AccountingBillingAccounts=Conti Fatturazione
 AccountingBillingAcct=Conti Fatturazione
+AccountingBillingAvailableBalance=Bilancio Disponibile
+AccountingBillingAvailableBalanceMessage=Questo \u00e8 l'importo che pu\u00f2 essere usato per nuovi ordini.
 AccountingBillingAddress=Indirizzo Fatturazione
 AccountingBillingContactMechId=Contatto Fatturazione
 AccountingBillingContactMechIdMessage=Indirizzo Fatturazione; Aggiungi Soggetto/Ruolo per primo, allora seleziona dalla lista
 AccountingBillingInformation=Informazioni Conto Fatturazione
 AccountingBillingMenu=Conti Fatturazione
+AccountingBillingNetBalance=Bilancio Netto
+AccountingBillingNetBalanceMessage=Questo \u00e8 l'importo che attualmente \u00e8 in eccedenza sul conto fatturazione.
 AccountingBillToAddress1=Fattura-All'Indirizzo 1
 AccountingBillToAddress2=Fattura-All'Indirizzo 2
 AccountingBillUpTo=Fatturare A
@@ -152,6 +156,7 @@
 AccountingFiscalMonth12=12-Dic
 AccountingFixedAsset=Cespite
 AccountingFixedAssetCalendar=Calendario
+AccountingFixedAssetChildren=Figli
 AccountingFixedAssetEdit=Crea/Aggiorna Cespite
 AccountingFixedAssetId=Codice Cespite
 AccountingFixedAssetName=Nome Cespite
@@ -423,6 +428,7 @@
 PageTitleListAgreementItems=Lista Righe Contratto
 PageTitleListAgreementTerms=Lista Termini Contratto
 PageTitleListFixedAssets=Lista Cespiti
+PageTitleListFixedAssetChildren=Figli Cespiti
 PageTitleListFixedAssetCalendar=Lista Calendario Cespite
 PageTitleListFixedAssetMaints=Lista Manutenzioni Cespiti
 PageTitleListFixedAssetProducts=Lista Prodotti Cespite

Modified: incubator/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml Fri Oct 20 00:16:54 2006
@@ -354,11 +354,11 @@
         <field name="partyId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${partyId}" target="EditAgreementItemParty?partyId=${partyId}&amp;agreementId=${agreementId}&amp;agreementItemSeqId=${agreementItemSeqId}"/>
         </field>
-        <field name="partyName" entry-name="partyId">
+        <field name="partyName" title="${uiLabelMap.PartyName}" entry-name="partyId">
             <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName} ${firstName} ${lastName}"/>
         </field>
         <field name="deleteLink" title="" widget-style="buttontext">
-            <hyperlink target="removeAgreementItemParty?partyId=${partyId}&amp;agreementId=${agreementId}&amp;agreementItemSeqId=${agreementItemSeqId}" description="[${uiLabelMap.CommonRemove}]" also-hidden="false"/>
+            <hyperlink target="removeAgreementItemParty?partyId=${partyId}&amp;agreementId=${agreementId}&amp;agreementItemSeqId=${agreementItemSeqId}" description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
         </field>
     </form>
     <form name="EditAgreementItemParty" type="single"

Modified: incubator/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml Fri Oct 20 00:16:54 2006
@@ -347,11 +347,11 @@
         <field name="intervalQuantity" title="${uiLabelMap.AccountingFixedAssetMaintIntervalQuantity}"><text size="10"/></field>        
         <field name="intervalUomId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalUom}">
             <drop-down allow-empty="true">
-                <entity-options description="Time: ${description}" entity-name="Uom" key-field-name="uomId">
+                <entity-options description="${uiLabelMap.CommonTime}: ${description}" entity-name="Uom" key-field-name="uomId">
                     <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
-                <entity-options description="Distance: ${description}" entity-name="Uom" key-field-name="uomId">
+                <entity-options description="${uiLabelMap.CommonDistance}: ${description}" entity-name="Uom" key-field-name="uomId">
                     <entity-constraint name="uomTypeId" value="LENGTH_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>

Modified: incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties Fri Oct 20 00:16:54 2006
@@ -19,6 +19,7 @@
 #
 ManufacturingActualCosts=Costi Attuali
 ManufacturingAddExistingRoutingTask=Aggiungi una Operazione esistente
+ManufacturingAddProductionRunFixedAssetAssign=Assegna Cespite
 ManufacturingAddProductionRunProductComponent=Aggiungi Componente Prodotto ad un\u00b4Ordine di Produzione
 ManufacturingAddRoutingTask=Aggiungi una Operazione
 ManufacturingAnyMachineGroup=Qualsiasi Gruppo Macchina
@@ -53,9 +54,11 @@
 ManufacturingCreateCalendar=Creare calendario
 ManufacturingCreateCalendarWeek=Creare Calendario Settimana
 ManufacturingCreateMachineGroup=Creare un gruppo Macchine
+ManufacturingCreatePermissionError=Errore Sicurezza: per eseguire questa operazione tu devi avere i permessi MANUFACTURING_CREATE o MANUFACTURING_ADMIN
 ManufacturingCreateProductionRun=Creare un Ordine di Produzione
 ManufacturingCuttingList=Lista di Montaggio
 ManufacturingCuttingListReport=Stampa Lista di Montaggio
+ManufacturingDeletePermissionError=Errore Sicurezza: per eseguire questa operazione tu devi avere i permessi MANUFACTURING_CREATE o MANUFACTURING_ADMIN
 ManufacturingDeliveryDate=Data Consegna
 ManufacturingDependentWorkEfforts=Dipendenza Ordine di Produzione
 ManufacturingEditCalendarExceptionDayFor=Aggiorna Calendario giorni speciali per
@@ -84,7 +87,11 @@
 ManufacturingFindProductionRun=Ricerca Ordine di Produzione
 ManufacturingFindRoutingTasks=Ricerca Operazioni
 ManufacturingFindRouting=Ricerca Ciclo
-ManufacturingFixedAssetNotExist=Macchina non esiste
+ManufacturingFixedAssetAllocatedCostNotCorrect=Il campo Costo allocato non \u00e8 formattato correttamente
+ManufacturingFixedAssetFromDateMissing=La data inizio \u00e8 mancante
+ManufacturingFixedAssetFromDateNotCorrect=Il campo Data Inizio non \u00e8 formattata correttamente
+ManufacturingFixedAssetNotExist=Cespite non esiste
+ManufacturingFixedAssetThruDateNotCorrect=Il campo Data Fine non \u00e8 formattata correttamente
 ManufacturingFormula=Formula
 ManufacturingImplosion=Implosione
 ManufacturingInstruction=Istruzione
@@ -98,6 +105,7 @@
 ManufacturingListCalendarWeek=Lista delle settimane
 ManufacturingListingBomError=Errore durante la lista delle Distinte Base
 ManufacturingListOfProductionRunComponents=Lista dei Componenti del Ordine di Produzione
+ManufacturingListOfProductionRunFixedAssets=Lista dei Cespiti Ordine di Produzione
 ManufacturingListOfProductionRunRoutingTasks=Lista delle Operazioni del Ordine di Produzione
 ManufacturingListProducts=Prodotti Consegnabili
 ManufacturingListRoutings=Lista Cicli
@@ -140,6 +148,8 @@
 ManufacturingProductionRunCosts=Costi Ordine di Produzione
 ManufacturingProductionRunCreated=Ordine di Produzione ${productionRunId} creata
 ManufacturingProductionRunDeclaration=Dichiarazione Ordine di Produzione
+ManufacturingProductionRunFixedAssetAssign=Assegna Cespite
+ManufacturingProductionRunFixedAssetIdMissing=Cespite \u00e8 mancante
 ManufacturingProductionRunId=Codice Ordine di Produzione
 ManufacturingProductionRunName=Nome Ordine di Produzione
 ManufacturingProductionRunNotUpdated=Aggiornamento Ordine di Produzione fallito, vedere il log per maggiori informazioni
@@ -173,6 +183,7 @@
 ManufacturingRoutingTasks=Operazioni
 ManufacturingRoutingTaskAssocCreateSuccessfully=Operazione associazione creata con successo
 ManufacturingRoutingTaskCopiedSuccessfully=Operazione copiata con successo
+ManufacturingRoutingTaskFixedAssets=Cespiti
 ManufacturingRoutingTaskId=Codice Operazione
 ManufacturingRoutingTaskToMissing=Operazione A \u00e8 Mancante
 ManufacturingRunMrp=Esegui MRP
@@ -197,10 +208,13 @@
 ManufacturingUpdateCalendar=Aggiorna Calendario
 ManufacturingUpdateCalendarWeek=Aggiorna Settimana
 ManufacturingUpdateMachineGroup=Aggiorna Gruppo Macchine
+ManufacturingUpdatePermissionError=Errore Sicurezza: per eseguire questa operazione tu devi avere i permessi MANUFACTURING_UPDATE o MANUFACTURING_ADMIN
 ManufacturingViewPermissionError=Tu non sei autorizzato a vedere questa pagina. (permesso "MANUFACTURING_VIEW" o "MANUFACTURING_ADMIN" necessario)
 ManufacturingVisitType=Algoritmo visita Albero
 ManufacturingWorkEffortNotExist=WorkEffort non esiste
 ManufacturingWorkEffortAssocNotExist=WorkEffortAssoc non esiste
+ManufacturingWorkEffortFixedAssetAsgAlreadyExist=Il cespite selezionato \u00e8 gi\u00e0 associato con questo compito dell'ordine di produzione
+ManufacturingWorkEffortFixedAssetStdAlreadyExist=Il tipo cespite selezionato \u00e8 gi\u00e0 associato con questo compito rotta
 ManufacturingWorkEffortGoodStandardNotExist=Tabella WorkEffortGoodStandard non esiste
 ManufacturingWorkEffortIdFromNotExist=workEffortIdFrom non esiste
 
@@ -256,6 +270,7 @@
 PageTitleEditRoutingProductLink=Aggiorna Link Ciclo-Prodotto
 PageTitleEditRoutingTask=Aggiorna Operazione
 PageTitleEditRoutingTaskAssoc=Aggiorna Associazione Operazione
+PageTitleEditRoutingTaskFixedAsset=Aggiorna Rotta Associazione Compito-Cespite
 PageTitleEditRoutingTaskCosts=Aggiorna Costi Operazione
 PageTitleEditRoutingTaskProduct=Aggiorna Operazione Prodotto
 PageTitleFieldLookup=Campo ricerca

Modified: incubator/ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml (original)
+++ incubator/ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml Fri Oct 20 00:16:54 2006
@@ -34,7 +34,7 @@
             <condition><if-empty field-name="userLogin"/></condition>
             <link target="${checkLoginUrl}"/>
         </menu-item>
-        <menu-item name="Reports" title="${uiLabelMap.Reports}" align-style="col-right" widget-style="headerButtonRight"><link target="MarketingReport"/></menu-item>
+        <menu-item name="Reports" title="${uiLabelMap.MarketingReports}" align-style="col-right" widget-style="headerButtonRight"><link target="MarketingReport"/></menu-item>
 
     </menu>
 </menus>

Modified: incubator/ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml Fri Oct 20 00:16:54 2006
@@ -50,15 +50,15 @@
                 <decorator-screen name="CommonMarketReportDecorator">
                     <decorator-section name="body">
                         <container>
-                            <label style="head1" text="Market Reports"/>
+                            <label style="head1" text="${uiLabelMap.MarketingReports}"/>
                         </container>
                         <container>
-                            <label style="head2" text="Tracking Code Report"/>
+                            <label style="head2" text="${uiLabelMap.MarketingTrackingCodeReportTitle}"/>
                             <include-form name="TrackingCodeReportOptions"
                                           location="component://marketing/widget/ReportForms.xml"/>
                         </container>
                         <container>
-                            <label style="head2" text="Marketing Campaign Report"/>
+                            <label style="head2" text="${uiLabelMap.MarketingCampaignReportTitle}"/>
                             <include-form name="MarketingCampaignOptions"
                                           location="component://marketing/widget/ReportForms.xml"/>
                         </container>
@@ -71,7 +71,7 @@
     <screen name="TrackingCodeReport">
         <section>
             <actions>
-                <set field="title" value="Tracking Code Report"/>
+                <set field="title" value="${uiLabelMap.MarketingTrackingCodeReportTitle}"/>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
                 <script location="component://marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.bsh"/>
@@ -91,7 +91,7 @@
     <screen name="MarketingCampaignReport">
         <section>
             <actions>
-                <set field="title" value="Marketing Campaign Report"/>
+                <set field="title" value="${uiLabelMap.MarketingTrackingCodeReportTitle}"/>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
                 <script location="component://marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.bsh"/>

Modified: incubator/ofbiz/trunk/applications/marketing/widget/ReportForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/widget/ReportForms.xml?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/applications/marketing/widget/ReportForms.xml (original)
+++ incubator/ofbiz/trunk/applications/marketing/widget/ReportForms.xml Fri Oct 20 00:16:54 2006
@@ -20,45 +20,45 @@
        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
 
     <form name="TrackingCodeReportOptions" type="single" target="TrackingCodeReport"
-        title="Tracking Code Report" default-title-style="tableheadtext">
-        <field name="fromDate" title="From Date (Date&gt;=)">
+        title="${uiLabelMap.MarketingTrackingCodeReportTitle}" default-title-style="tableheadtext">
+        <field name="fromDate" title="${uiLabelMap.CommonFromDate} (${uiLabelMap.CommonDate}&gt;=)">
             <date-time type="timestamp"/>
         </field>
-        <field name="thruDate" title="Thru Date (Date&lt;)">
+        <field name="thruDate" title="${uiLabelMap.CommonThruDate} (${uiLabelMap.CommonDate}&lt;)">
             <date-time type="timestamp"/>
         </field>
 
-        <field name="trackingCodeId" title="Tracking Code">
+        <field name="trackingCodeId" title="${uiLabelMap.TrackingCode}">
             <drop-down allow-empty="true">
-                <option key="" description="- Any -"/>
+                <option key="" description="- ${uiLabelMap.CommonAny} -"/>
                 <entity-options entity-name="TrackingCode" description="${trackingCodeId}">
                 </entity-options>
             </drop-down>
         </field>
 
-        <field name="submitButton" title="Run TrackingCode Report" widget-style="smallSubmit">
+        <field name="submitButton" title="${uiLabelMap.CommonRun} ${uiLabelMap.MarketingTrackingCodeReportTitle}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
     </form>
 
     <form name="MarketingCampaignOptions" type="single" target="MarketingCampaignReport"
         title="Marketing Campaign Report" default-title-style="tableheadtext">
-        <field name="fromDate" title="From Date (Date&gt;=)">
+        <field name="fromDate" title="${uiLabelMap.CommonFromDate} (${uiLabelMap.CommonDate}&gt;=)">
             <date-time type="timestamp"/>
         </field>
-        <field name="thruDate" title="Thru Date (Date&lt;)">
+        <field name="thruDate" title="${uiLabelMap.CommonThruDate} (${uiLabelMap.CommonDate}&lt;)">
             <date-time type="timestamp"/>
         </field>
 
-         <field name="marketingCampaignId" title="Marketing Campaign">
+         <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaign}">
             <drop-down allow-empty="true">
-                <option key="" description="- Any -"/>
+                <option key="" description="- ${uiLabelMap.CommonAny} -"/>
                 <entity-options entity-name="MarketingCampaign" description="${campaignName}">
                 </entity-options>
             </drop-down>
         </field>
 
-        <field name="submitButton" title="Run Marketing Campaign Report" widget-style="smallSubmit">
+        <field name="submitButton" title="${uiLabelMap.CommonRun} ${uiLabelMap.MarketingCampaignReportTitle}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
     </form>

Modified: incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties Fri Oct 20 00:16:54 2006
@@ -122,6 +122,10 @@
 FormFieldTitle_visitId=Visit Id
 FormFieldTitle_visitorId=Visitor Id
 FormFieldTitle_webSiteId=Web Site Id
+FormFieldTitle_billToCustomerPartyId=Bill To Customer Party Id
+FormFieldTitle_unassignedRequirements=unassigned Requirements
+FormFieldTitle_requirementByDate=requirement By Date
+FormFieldTitle_internalName=internal Name
 OrderAddCode=Add Code
 OrderAddNote=Add Note
 OrderAddOrderToShoppingList=Add Order Items to Shopping List

Modified: incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties (original)
+++ incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties Fri Oct 20 00:16:54 2006
@@ -40,10 +40,11 @@
 OrderAdjustment = Aggiustamento
 OrderAdjustments = Aggiustamenti
 OrderAgent=Agente Ordine
-OrderAllowSplit = Permessa la Divisione
+OrderAllowSplit=Permessa la Divisione
 OrderAmount=Importo
 OrderApproved=Approvato
-OrderApproveOrder = Approva Ordine(i)
+OrderApproveOrder=Approva Ordine(i)
+OrderApprovedProductRequirements=Approva Fabbisogni Prodotto
 OrderApproveRequirements=Approva Fabbisogni
 OrderAutoCreateQuoteAdjustments=Creazione Automatica Aggiustamenti
 OrderAvs=AVS
@@ -79,6 +80,7 @@
 OrderCreateOrderQuoteWorkEfforts=Creare Preventivo Impegno di Lavoro
 OrderCreateQuoteFromCart=Creare Nuovo Preventivo Dal Carrello
 OrderCreateQuoteFromShoppingList=Creare Nuovo Preventivo
+OrderCreateQuoteWorkEffort=Creare nuovo Preventivo Impegno di Lavoro
 OrderCreateReturn = Creare reso
 OrderCreatedBy = Creato da
 OrderCurrentStatus = Stato Attuale

Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Fri Oct 20 00:16:54 2006
@@ -212,7 +212,7 @@
         <field name="custRequestId"><hidden/></field>
         <field name="custRequestItemSeqId"><hidden/></field>
         <field name="custRequestResolutionId"><hidden/></field>
-        <field use-when="custRequestItem==null" name="statusId" title="Status" widget-style="selectBox">
+        <field use-when="custRequestItem==null" name="statusId" widget-style="selectBox">
             <drop-down allow-empty="false" current="first-in-list">
                 <entity-options entity-name="StatusItem" description="${description}">
                     <entity-constraint name="statusTypeId" value="CUSTREQ_STTS"/>
@@ -220,7 +220,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field use-when="custRequestItem!=null" name="statusId" title="Status" widget-style="selectBox">
+        <field use-when="custRequestItem!=null" name="statusId" widget-style="selectBox">
             <drop-down allow-empty="false" current="first-in-list" current-description="${currentStatus.description}">
                 <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
                     <entity-constraint name="statusId" value="${custRequestItem.statusId}"/>

Modified: incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels.properties?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/product/config/ProductEntityLabels.properties Fri Oct 20 00:16:54 2006
@@ -1,357 +1,3 @@
-
-CostComponentType.description.EST_STD_MAT_COST=Estimated Standard Materials Cost
-CostComponentType.description.EST_STD_ROUTE_COST=Estimated Standard Route (fixed asset usage) Cost
-CostComponentType.description.EST_STD_LABOR_COST=Estimated Standard Labor Cost
-CostComponentType.description.EST_STD_OTHER_COST=Estimated Standard Other Cost
-
-FacilityType.description.BUILDING=Building
-FacilityType.description.FLOOR=Floor
-FacilityType.description.OFFICE=Office
-FacilityType.description.CALL_CENTER=Call Center
-FacilityType.description.PLANT=Plant
-FacilityType.description.ROOM=Room
-FacilityType.description.RETAIL_STORE=Retail Store
-FacilityType.description.WAREHOUSE=Warehouse
-
-FacilityGroupType.description.MGMT_STRUCTURE=Management Structure
-FacilityGroupType.description.PRICING_GROUP=Pricing Group
-
-GoodIdentificationType.description.ISBN=ISBN
-GoodIdentificationType.description.MANUFACTURER_ID_NO=Manufacturer (Model) Number
-GoodIdentificationType.description.MODEL_YEAR=Model Year
-GoodIdentificationType.description.OTHER_ID=Other
-GoodIdentificationType.description.SKU=SKU
-GoodIdentificationType.description.UPCA=UPCA
-GoodIdentificationType.description.UPCE=UPCE
-
-InventoryItemType.description.SERIALIZED_INV_ITEM=Serialized
-InventoryItemType.description.NON_SERIAL_INV_ITEM=Non-Serialized
-
-ProdCatalogCategoryType.description.PCCT_BROWSE_ROOT=Browse Root (One)
-ProdCatalogCategoryType.description.PCCT_SEARCH=Default Search (One)
-ProdCatalogCategoryType.description.PCCT_OTHER_SEARCH=Other Search (Many)
-ProdCatalogCategoryType.description.PCCT_QUICK_ADD=Quick Add (Many)
-ProdCatalogCategoryType.description.PCCT_PROMOTIONS=Promotions (One)
-ProdCatalogCategoryType.description.PCCT_MOST_POPULAR=Most Popular (One)
-ProdCatalogCategoryType.description.PCCT_WHATS_NEW=What's New (One)
-ProdCatalogCategoryType.description.PCCT_VIEW_ALLW=View Allow (One)
-ProdCatalogCategoryType.description.PCCT_PURCH_ALLW=Purchase Allow (One)
-ProdCatalogCategoryType.description.PCCT_ADMIN_ALLW=Admin Allow (One)
-
-ProductAssocType.description.ALSO_BOUGHT=Also Bought
-ProductAssocType.description.PRODUCT_UPGRADE=Upgrade or Up-Sell
-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
-ProductAssocType.description.UNIQUE_ITEM=Unique Item
-ProductAssocType.description.PRODUCT_REVISION=Revision
-ProductAssocType.description.MANUF_COMPONENT=Manufacturing Bill of Materials
-ProductAssocType.description.ENGINEER_COMPONENT=Engineering Bill of Materials
-ProductAssocType.description.PRODUCT_MANUFACTURED=Product Manufactured As
-
-ProductCategoryType.description.CATALOG_CATEGORY=Catalog
-ProductCategoryType.description.INDUSTRY_CATEGORY=Industry
-ProductCategoryType.description.INTERNAL_CATEGORY=Internal
-ProductCategoryType.description.MATERIALS_CATEGORY=Materials
-ProductCategoryType.description.QUICKADD_CATEGORY=Quick Add
-ProductCategoryType.description.SEARCH_CATEGORY=Search
-ProductCategoryType.description.USAGE_CATEGORY=Usage
-ProductCategoryType.description.MIXMATCH_CATEGORY=Mix and Match
-ProductCategoryType.description.CROSS_SELL_CATEGORY=Cross Sell
-ProductCategoryType.description.TAX_CATEGORY=Tax
-
-ProductContentType.description.ONLINE_ACCESS=Online Access
-ProductContentType.description.DIGITAL_DOWNLOAD=Digital Download
-ProductContentType.description.FULFILLMENT_EMAIL=Fulfillment Email
-ProductContentType.description.FULFILLMENT_EXTASYNC=Fulfillment External (Async)
-ProductContentType.description.FULFILLMENT_EXTSYNC=Fulfillment External (Sync)
-ProductContentType.description.PRODUCT_NAME=Product Name
-ProductContentType.description.DESCRIPTION=Description
-ProductContentType.description.LONG_DESCRIPTION=Description - Long
-ProductContentType.description.INGREDIENTS=Ingredients
-ProductContentType.description.UNIQUE_INGREDIENTS=Unique Ingredients
-ProductContentType.description.SPECIALINSTRUCTIONS=Special Instructions
-ProductContentType.description.WARNINGS=Warnings
-ProductContentType.description.DIRECTIONS=Directions
-ProductContentType.description.SMALL_IMAGE_URL=Image - Small
-ProductContentType.description.MEDIUM_IMAGE_URL=Image - Medium
-ProductContentType.description.LARGE_IMAGE_URL=Image - Large
-ProductContentType.description.DETAIL_IMAGE_URL=Image - Detail
-
-ProductFeatureApplType.description.OPTIONAL_FEATURE=Optional
-ProductFeatureApplType.description.REQUIRED_FEATURE=Required
-ProductFeatureApplType.description.SELECTABLE_FEATURE=Selectable
-ProductFeatureApplType.description.STANDARD_FEATURE=Standard
-ProductFeatureApplType.description.DISTINGUISHING_FEAT=Distinguishing
-
-ProductFeatureIactnType.description.FEATURE_IACTN_DEPEND=Dependencies
-ProductFeatureIactnType.description.FEATURE_IACTN_INCOMP=Incompatibility
-
-ProductFeatureType.description.ACCESSORY=Accessory
-ProductFeatureType.description.AMOUNT=Amount
-ProductFeatureType.description.NET_WEIGHT=Net Weight
-ProductFeatureType.description.ARTIST=Artist
-ProductFeatureType.description.BILLING_FEATURE=Billing Feature
-ProductFeatureType.description.BRAND=Brand
-ProductFeatureType.description.CARE=Care
-ProductFeatureType.description.COLOR=Color
-ProductFeatureType.description.DIMENSION=Dimension
-ProductFeatureType.description.EQUIP_CLASS=Equipment Class
-ProductFeatureType.description.FABRIC=Fabric
-ProductFeatureType.description.GENRE=Genre
-ProductFeatureType.description.GIFT_WRAP=Gift Wrap
-ProductFeatureType.description.HARDWARE_FEATURE=Hardware Feature
-ProductFeatureType.description.HAZMAT=Hazmat
-ProductFeatureType.description.LICENSE=License
-ProductFeatureType.description.ORIGIN=Origin
-ProductFeatureType.description.OTHER_FEATURE=Other Feature
-ProductFeatureType.description.PRODUCT_QUALITY=Product Quality
-ProductFeatureType.description.SIZE=Size
-ProductFeatureType.description.SOFTWARE_FEATURE=Software Feature
-ProductFeatureType.description.STYLE=Style
-ProductFeatureType.description.SYMPTOM=Symptom
-ProductFeatureType.description.TOPIC=Topic
-ProductFeatureType.description.TYPE=Type
-ProductFeatureType.description.WARRANTY=Warranty
-ProductFeatureType.description.MODEL_YEAR=Model Year
-ProductFeatureType.description.YEAR_MADE=Year Made
-
-ProductMeterType.description.SPEEDOMETER=Speedometer
-ProductMeterType.description.TACHOMETER=Tachometer
-ProductMeterType.description.DISTANCE=Distance Meter
-ProductMeterType.description.MOTOR_TIME=Motor Time Meter
-ProductMeterType.description.USE_COUNT=Use Count Meter
-ProductMeterType.description.COPY_COUNT=Copy Count Meter
-
-ProductMaintType.description.VEHICLE_MAINT=Vehicle Maintenance
-ProductMaintType.description.OIL_CHANGE=Oil Change
-ProductMaintType.description.SERP_BELT=Serpentine Belt Replacement
-ProductMaintType.description.REFUEL=Re-Fuel
-ProductMaintType.description.REPLACE_BATTERY=Replace Battery
-ProductMaintType.description.WASH=Wash
-
-ProductPriceType.description.LIST_PRICE=List Price
-ProductPriceType.description.DEFAULT_PRICE=Default Price
-ProductPriceType.description.AVERAGE_COST=Average Cost
-ProductPriceType.description.MINIMUM_PRICE=Minimum Price
-ProductPriceType.description.MAXIMUM_PRICE=Maximum Price
-ProductPriceType.description.PROMO_PRICE=Promotional Price
-ProductPriceType.description.COMPETITIVE_PRICE=Competitive Price
-ProductPriceType.description.WHOLESALE_PRICE=Wholesale Price
-
-ProductPricePurpose.description.PURCHASE=Purchase/Initial
-ProductPricePurpose.description.RECURRING_CHARGE=Recurring Charge
-ProductPricePurpose.description.USAGE_CHARGE=Usage Charge
-ProductPricePurpose.description.COMPONENT_PRICE=Component Price
-
-ProductPriceActionType.description.PRICE_POL=Percent Of List Price
-ProductPriceActionType.description.PRICE_POD=Percent Of Default Price
-ProductPriceActionType.description.PRICE_POAC=Percent Of Average Cost
-ProductPriceActionType.description.PRICE_POM=Percent Of Margin
-ProductPriceActionType.description.PRICE_FOL=Flat Amount Modify
-ProductPriceActionType.description.PRICE_FLAT=Flat Amount Override
-ProductPriceActionType.description.PRICE_PFLAT=Promo Amount Override
-ProductPriceActionType.description.PRICE_WFLAT=Wholesale Amount Override
-
-ProductType.description.ASSET_USAGE=Fixed Asset Usage
-ProductType.description.SERVICE=Service
-ProductType.description.GOOD=Good
-ProductType.description.RAW_MATERIAL=Raw Material
-ProductType.description.SUBASSEMBLY=Subassembly
-ProductType.description.FINISHED_GOOD=Finished Good
-ProductType.description.DIGITAL_GOOD=Digital Good
-ProductType.description.FINDIG_GOOD=Finished/Digital Good
-ProductType.description.AGGREGATED=Configurable Good
-ProductType.description.WIP=Work In Process
-
-VarianceReason.description.VAR_LOST=Lost
-VarianceReason.description.VAR_STOLEN=Stolen
-VarianceReason.description.VAR_FOUND=Found
-VarianceReason.description.VAR_DAMAGED=Damaged
-VarianceReason.description.VAR_INTEGR=Integration
-VarianceReason.description.VAR_SAMPLE=Sample (Giveaway)
-
-CostComponentType.description.EST_STD_MAT_COST=Estimated Standard Materials Cost
-CostComponentType.description.EST_STD_ROUTE_COST=Estimated Standard Route (fixed asset usage) Cost
-CostComponentType.description.EST_STD_LABOR_COST=Estimated Standard Labor Cost
-CostComponentType.description.EST_STD_OTHER_COST=Estimated Standard Other Cost
-
-FacilityType.description.BUILDING=Building
-FacilityType.description.FLOOR=Floor
-FacilityType.description.OFFICE=Office
-FacilityType.description.CALL_CENTER=Call Center
-FacilityType.description.PLANT=Plant
-FacilityType.description.ROOM=Room
-FacilityType.description.RETAIL_STORE=Retail Store
-FacilityType.description.WAREHOUSE=Warehouse
-
-FacilityGroupType.description.MGMT_STRUCTURE=Management Structure
-FacilityGroupType.description.PRICING_GROUP=Pricing Group
-
-GoodIdentificationType.description.ISBN=ISBN
-GoodIdentificationType.description.MANUFACTURER_ID_NO=Manufacturer (Model) Number
-GoodIdentificationType.description.MODEL_YEAR=Model Year
-GoodIdentificationType.description.OTHER_ID=Other
-GoodIdentificationType.description.SKU=SKU
-GoodIdentificationType.description.UPCA=UPCA
-GoodIdentificationType.description.UPCE=UPCE
-
-InventoryItemType.description.SERIALIZED_INV_ITEM=Serialized
-InventoryItemType.description.NON_SERIAL_INV_ITEM=Non-Serialized
-
-ProdCatalogCategoryType.description.PCCT_BROWSE_ROOT=Browse Root (One)
-ProdCatalogCategoryType.description.PCCT_SEARCH=Default Search (One)
-ProdCatalogCategoryType.description.PCCT_OTHER_SEARCH=Other Search (Many)
-ProdCatalogCategoryType.description.PCCT_QUICK_ADD=Quick Add (Many)
-ProdCatalogCategoryType.description.PCCT_PROMOTIONS=Promotions (One)
-ProdCatalogCategoryType.description.PCCT_MOST_POPULAR=Most Popular (One)
-ProdCatalogCategoryType.description.PCCT_WHATS_NEW=What's New (One)
-ProdCatalogCategoryType.description.PCCT_VIEW_ALLW=View Allow (One)
-ProdCatalogCategoryType.description.PCCT_PURCH_ALLW=Purchase Allow (One)
-ProdCatalogCategoryType.description.PCCT_ADMIN_ALLW=Admin Allow (One)
-
-ProductAssocType.description.ALSO_BOUGHT=Also Bought
-ProductAssocType.description.PRODUCT_UPGRADE=Upgrade or Up-Sell
-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
-ProductAssocType.description.UNIQUE_ITEM=Unique Item
-ProductAssocType.description.PRODUCT_REVISION=Revision
-ProductAssocType.description.MANUF_COMPONENT=Manufacturing Bill of Materials
-ProductAssocType.description.ENGINEER_COMPONENT=Engineering Bill of Materials
-ProductAssocType.description.PRODUCT_MANUFACTURED=Product Manufactured As
-
-ProductCategoryType.description.CATALOG_CATEGORY=Catalog
-ProductCategoryType.description.INDUSTRY_CATEGORY=Industry
-ProductCategoryType.description.INTERNAL_CATEGORY=Internal
-ProductCategoryType.description.MATERIALS_CATEGORY=Materials
-ProductCategoryType.description.QUICKADD_CATEGORY=Quick Add
-ProductCategoryType.description.SEARCH_CATEGORY=Search
-ProductCategoryType.description.USAGE_CATEGORY=Usage
-ProductCategoryType.description.MIXMATCH_CATEGORY=Mix and Match
-ProductCategoryType.description.CROSS_SELL_CATEGORY=Cross Sell
-ProductCategoryType.description.TAX_CATEGORY=Tax
-
-ProductContentType.description.ONLINE_ACCESS=Online Access
-ProductContentType.description.DIGITAL_DOWNLOAD=Digital Download
-ProductContentType.description.FULFILLMENT_EMAIL=Fulfillment Email
-ProductContentType.description.FULFILLMENT_EXTASYNC=Fulfillment External (Async)
-ProductContentType.description.FULFILLMENT_EXTSYNC=Fulfillment External (Sync)
-ProductContentType.description.PRODUCT_NAME=Product Name
-ProductContentType.description.DESCRIPTION=Description
-ProductContentType.description.LONG_DESCRIPTION=Description - Long
-ProductContentType.description.INGREDIENTS=Ingredients
-ProductContentType.description.UNIQUE_INGREDIENTS=Unique Ingredients
-ProductContentType.description.SPECIALINSTRUCTIONS=Special Instructions
-ProductContentType.description.WARNINGS=Warnings
-ProductContentType.description.DIRECTIONS=Directions
-ProductContentType.description.SMALL_IMAGE_URL=Image - Small
-ProductContentType.description.MEDIUM_IMAGE_URL=Image - Medium
-ProductContentType.description.LARGE_IMAGE_URL=Image - Large
-ProductContentType.description.DETAIL_IMAGE_URL=Image - Detail
-
-ProductFeatureApplType.description.OPTIONAL_FEATURE=Optional
-ProductFeatureApplType.description.REQUIRED_FEATURE=Required
-ProductFeatureApplType.description.SELECTABLE_FEATURE=Selectable
-ProductFeatureApplType.description.STANDARD_FEATURE=Standard
-ProductFeatureApplType.description.DISTINGUISHING_FEAT=Distinguishing
-
-ProductFeatureIactnType.description.FEATURE_IACTN_DEPEND=Dependencies
-ProductFeatureIactnType.description.FEATURE_IACTN_INCOMP=Incompatibility
-
-ProductFeatureType.description.ACCESSORY=Accessory
-ProductFeatureType.description.AMOUNT=Amount
-ProductFeatureType.description.NET_WEIGHT=Net Weight
-ProductFeatureType.description.ARTIST=Artist
-ProductFeatureType.description.BILLING_FEATURE=Billing Feature
-ProductFeatureType.description.BRAND=Brand
-ProductFeatureType.description.CARE=Care
-ProductFeatureType.description.COLOR=Color
-ProductFeatureType.description.DIMENSION=Dimension
-ProductFeatureType.description.EQUIP_CLASS=Equipment Class
-ProductFeatureType.description.FABRIC=Fabric
-ProductFeatureType.description.GENRE=Genre
-ProductFeatureType.description.GIFT_WRAP=Gift Wrap
-ProductFeatureType.description.HARDWARE_FEATURE=Hardware Feature
-ProductFeatureType.description.HAZMAT=Hazmat
-ProductFeatureType.description.LICENSE=License
-ProductFeatureType.description.ORIGIN=Origin
-ProductFeatureType.description.OTHER_FEATURE=Other Feature
-ProductFeatureType.description.PRODUCT_QUALITY=Product Quality
-ProductFeatureType.description.SIZE=Size
-ProductFeatureType.description.SOFTWARE_FEATURE=Software Feature
-ProductFeatureType.description.STYLE=Style
-ProductFeatureType.description.SYMPTOM=Symptom
-ProductFeatureType.description.TOPIC=Topic
-ProductFeatureType.description.TYPE=Type
-ProductFeatureType.description.WARRANTY=Warranty
-ProductFeatureType.description.MODEL_YEAR=Model Year
-ProductFeatureType.description.YEAR_MADE=Year Made
-
-ProductMeterType.description.SPEEDOMETER=Speedometer
-ProductMeterType.description.TACHOMETER=Tachometer
-ProductMeterType.description.DISTANCE=Distance Meter
-ProductMeterType.description.MOTOR_TIME=Motor Time Meter
-ProductMeterType.description.USE_COUNT=Use Count Meter
-ProductMeterType.description.COPY_COUNT=Copy Count Meter
-
-ProductMaintType.description.VEHICLE_MAINT=Vehicle Maintenance
-ProductMaintType.description.OIL_CHANGE=Oil Change
-ProductMaintType.description.SERP_BELT=Serpentine Belt Replacement
-ProductMaintType.description.REFUEL=Re-Fuel
-ProductMaintType.description.REPLACE_BATTERY=Replace Battery
-ProductMaintType.description.WASH=Wash
-
-ProductPriceType.description.LIST_PRICE=List Price
-ProductPriceType.description.DEFAULT_PRICE=Default Price
-ProductPriceType.description.AVERAGE_COST=Average Cost
-ProductPriceType.description.MINIMUM_PRICE=Minimum Price
-ProductPriceType.description.MAXIMUM_PRICE=Maximum Price
-ProductPriceType.description.PROMO_PRICE=Promotional Price
-ProductPriceType.description.COMPETITIVE_PRICE=Competitive Price
-ProductPriceType.description.WHOLESALE_PRICE=Wholesale Price
-
-ProductPricePurpose.description.PURCHASE=Purchase/Initial
-ProductPricePurpose.description.RECURRING_CHARGE=Recurring Charge
-ProductPricePurpose.description.USAGE_CHARGE=Usage Charge
-ProductPricePurpose.description.COMPONENT_PRICE=Component Price
-
-ProductPriceActionType.description.PRICE_POL=Percent Of List Price
-ProductPriceActionType.description.PRICE_POD=Percent Of Default Price
-ProductPriceActionType.description.PRICE_POAC=Percent Of Average Cost
-ProductPriceActionType.description.PRICE_POM=Percent Of Margin
-ProductPriceActionType.description.PRICE_FOL=Flat Amount Modify
-ProductPriceActionType.description.PRICE_FLAT=Flat Amount Override
-ProductPriceActionType.description.PRICE_PFLAT=Promo Amount Override
-ProductPriceActionType.description.PRICE_WFLAT=Wholesale Amount Override
-
-ProductType.description.ASSET_USAGE=Fixed Asset Usage
-ProductType.description.SERVICE=Service
-ProductType.description.GOOD=Good
-ProductType.description.RAW_MATERIAL=Raw Material
-ProductType.description.SUBASSEMBLY=Subassembly
-ProductType.description.FINISHED_GOOD=Finished Good
-ProductType.description.DIGITAL_GOOD=Digital Good
-ProductType.description.FINDIG_GOOD=Finished/Digital Good
-ProductType.description.AGGREGATED=Configurable Good
-ProductType.description.WIP=Work In Process
-
-VarianceReason.description.VAR_LOST=Lost
-VarianceReason.description.VAR_STOLEN=Stolen
-VarianceReason.description.VAR_FOUND=Found
-VarianceReason.description.VAR_DAMAGED=Damaged
-VarianceReason.description.VAR_INTEGR=Integration
-VarianceReason.description.VAR_SAMPLE=Sample (Giveaway)
 #####################################################################
 #
 # Copyright 2001-2006 The Apache Software Foundation

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=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties (original)
+++ incubator/ofbiz/trunk/applications/product/config/ProductUiLabels_it.properties Fri Oct 20 00:16:54 2006
@@ -703,6 +703,9 @@
 ProductMakeTop=Vai all'inizio
 ProductMaintenance=Manutenzione
 ProductManufacturing=Produzione
+ProductMarketingPackageATP=ATP dai Componenti
+ProductMarketingPackageQOH=QOH dai Componenti
+ProductMarkAsAccepted=Marca come Accettato
 ProductMaximum=Massimo
 ProductMaximumPrice=Prezzo Massimo
 ProductMaxSizeMessage=Visualizzato solo se la pi\u00f9 grande ampiezza prodotto \u00e8 uguale/minore di questo valore
@@ -996,8 +999,10 @@
 ProductQoh=Qnt Disponibile
 ProductQtyReceived=Qnt Ricevuta
 ProductQtyRejected=Qnt Scartata
-ProductQtyOffset=QOH meno lo giacenza minima
-ProductQtyOffsetBelow=QOH meno la giacenza minimia sotto la quantit\u00e0 di
+ProductQtyOffsetATP=ATP meno la Giacenza Minima
+ProductQtyOffsetQOH=QOH meno la Giacenza Minima
+ProductQtyOffsetATPBelow=ATP meno la Giacenza Minima &lt;=
+ProductQtyOffsetQOHBelow=QOH meno la Giacenza Minima &lt;=
 ProductQuantity=Quantit\u00e0
 ProductQuantityAccepted=Quantit\u00e0 Accettata
 ProductQuantityIncluded=Quantit\u00e0 Inclusa
@@ -1155,6 +1160,8 @@
 ProductShortDescription=Descrizione Breve
 ProductShowActive=Mostra Attivi
 ProductShowAll=Mostra Tutto
+ProductShowProductsSoldThruTimestamp=Mostra Prodotti Venduti Fino Al
+ProductShowProductsPerPage=Mostra Prodotti Per Pagina
 ProductShowEmptyItems=Mostra Voci Vuote
 ProductShowProductFacilities=Mostra Stabilimento Prodotto
 ProductShowAllFacilities=Mostra tutte le Stabilimento

Modified: incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml Fri Oct 20 00:16:54 2006
@@ -527,7 +527,8 @@
     </entity>
     <entity entity-name="ProdConfItemContentType"
             package-name="org.ofbiz.product.config"
-            title="Product Content Type Entity">
+            title="Product Content Type Entity"
+            default-resource-name="ProductEntityLabels">
         <field name="confItemContentTypeId" type="id-ne"></field>
         <field name="parentTypeId" type="id"></field>
         <field name="hasTable" type="indicator"></field>

Modified: incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Fri Oct 20 00:16:54 2006
@@ -67,7 +67,7 @@
     <form name="ListFacilityInventoryByProduct" type="list"
             target="" title="" list-name="inventoryByProduct" paginate-target="ViewFacilityInventoryByProduct"
             default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
-        <field name="items" widget-style="buttontext">
+        <field name="items" title="${uiLabelMap.ProductProductId}" widget-style="buttontext">
             <hyperlink target="EditFacilityInventoryItems?productId=${productId}&amp;facilityId=${facilityId}" description="${productId}"/>    
         </field>
         <field name="productId" title="${uiLabelMap.CommonDescription}" widget-area-style="tabletext">

Modified: incubator/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels.properties Fri Oct 20 00:16:54 2006
@@ -337,6 +337,7 @@
 FormFieldTitle_estimatedStartDate=Estimated Start Date
 FormFieldTitle_estimatedCompletionDate=Estimated Completion Date
 FormFieldTitle_actualStartDate=Actual Start Date
+FormFieldTitle_actualEndDate=Actual End Date
 FormFieldTitle_actualCompletionDate=Actual Completion Date
 FormFieldTitle_communicationEventId=Communication Event Id
 FormFieldTitle_workEffortParentId=Work Effort Parent Id

Modified: incubator/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels_it.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels_it.properties?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels_it.properties (original)
+++ incubator/ofbiz/trunk/applications/workeffort/config/WorkEffortUiLabels_it.properties Fri Oct 20 00:16:54 2006
@@ -323,6 +323,7 @@
 FormFieldTitle_estimatedStartDate=Data Inizio Stimata
 FormFieldTitle_estimatedCompletionDate=Data Completamento Stimata
 FormFieldTitle_actualStartDate=Data Inizio Attuale
+FormFieldTitle_actualEndDate=Data Fine Attuale
 FormFieldTitle_actualCompletionDate=Data Completamento Attuale
 FormFieldTitle_communicationEventId=Codice Evento Comunicazione
 FormFieldTitle_workEffortParentId=Codice Padre Impegno di Lavoro

Modified: incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ incubator/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Fri Oct 20 00:16:54 2006
@@ -163,15 +163,15 @@
 
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[General] ${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortGeneral}] ${description}">
                     <entity-constraint name="statusTypeId" value="CALENDAR_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[Task] ${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortTask}] ${description}">
                     <entity-constraint name="statusTypeId" value="TASK_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
-                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[Event] ${description}">
+                <entity-options entity-name="StatusItem" key-field-name="statusId" description="[${uiLabelMap.WorkEffortEvent}] ${description}">
                     <entity-constraint name="statusTypeId" value="EVENT_STATUS"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>

Modified: incubator/ofbiz/trunk/framework/common/config/CommonUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/config/CommonUiLabels.properties?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/framework/common/config/CommonUiLabels.properties (original)
+++ incubator/ofbiz/trunk/framework/common/config/CommonUiLabels.properties Fri Oct 20 00:16:54 2006
@@ -110,6 +110,7 @@
 CommonDatabaseProblem=Database Problem
 CommonDate=Date
 CommonDateFilter=Date Filter
+CommonDaily=Daily
 CommonDay=Day
 CommonDays=Days
 CommonDebit=Debit
@@ -121,6 +122,7 @@
 CommonDetail=Detail
 CommonDetails=Details
 CommonDisabled=Disabled
+CommonDistance=Distance
 CommonDuplicate=Duplicate
 CommonEdit=Edit
 CommonElementsFound=Elements Found
@@ -142,6 +144,7 @@
 CommonExpires=Expires
 CommonExport=Export
 CommonExt=ext
+CommonFalse=False
 CommonFebruary=February
 CommonFemale=Female
 CommonFieldsMarkedAreRequired=Fields marked with (*) are required.
@@ -174,6 +177,7 @@
 CommonHeight=Height
 CommonHideFields=Hide Fields
 CommonHour=Hour
+CommonHourly=Hourly
 CommonId=ID
 CommonIdAlreadyExist=Id Already Exist
 CommonIdCode=ID Code
@@ -215,9 +219,11 @@
 CommonMedium=Medium
 CommonMessage=Message
 CommonMethod=Method
+CommonMinutely=Minutely
 CommonModify=Modify
 CommonMonday=Monday
 CommonMonth=Month
+CommonMonthly=Monthly
 CommonMonths=Months
 CommonMore=More
 CommonMyStatus=Mon statut
@@ -314,6 +320,7 @@
 CommonSavings=Savings
 CommonSearch=Search
 CommonSearchResultfor=Search Results for
+CommonSecondly=Secondly
 CommonSecurity=Security
 CommonSelect=Select
 CommonSelectAll=Select All
@@ -382,6 +389,7 @@
 CommonToggle=Toggle
 CommonTotal=Total
 CommonTotalValue=Total Value
+CommonTrue=True
 CommonTuesday=Tuesday
 CommonType=Type
 CommonUnitPrice=Unit Price
@@ -412,6 +420,7 @@
 CommonWebsite=Website
 CommonWednesday=Wednesday
 CommonWeek=Week
+CommonWeekly=Weekly
 CommonWeight=Weight
 CommonWelcome=Welcome
 CommonWhere=Where
@@ -420,6 +429,7 @@
 CommonWorkflowActivityUserRole=Workflow Activities Assigned to User Role
 CommonY=Y
 CommonYear=Year
+CommonYearly=Yearly
 CommonYes=Yes
 CommonYouremail=Your email
 CommonZipPostalCode=Zip/Postal Code

Modified: incubator/ofbiz/trunk/framework/common/config/CommonUiLabels_it.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/config/CommonUiLabels_it.properties?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/framework/common/config/CommonUiLabels_it.properties (original)
+++ incubator/ofbiz/trunk/framework/common/config/CommonUiLabels_it.properties Fri Oct 20 00:16:54 2006
@@ -109,6 +109,7 @@
 CommonDatabaseProblem=Problema Database
 CommonDate=Data
 CommonDateFilter=Filtro Data
+CommonDaily=Giornalmente
 CommonDay=Giorno
 CommonDays=Giorni
 CommonDebit=Debito
@@ -120,6 +121,7 @@
 CommonDetail=Dettaglio
 CommonDetails=Dettagli
 CommonDisabled=Disabilitato
+CommonDistance=Distanza
 CommonDuplicate=Duplica
 CommonEdit=Aggiorna
 CommonElementsFound=Elementi Trovati
@@ -139,7 +141,9 @@
 CommonExpireAll=Scade Tutto
 CommonExpireDate=Data Scadenza
 CommonExpires=Scadere
+CommonExport=Esporta
 CommonExt=est.
+CommonFalse=Falso
 CommonFebruary=Febbraio
 CommonFemale=Femmina
 CommonFieldsMarkedAreRequired=Campi marcati con (*) sono richiesti.
@@ -170,6 +174,7 @@
 CommonHeight=Altezza
 CommonHideFields=Nascondi Campi
 CommonHour=Ora
+CommonHourly=Orario
 CommonId=Codice
 CommonIdAlreadyExist=Codice Gi\u00e0 Esistente
 CommonIdCode=Codice
@@ -211,9 +216,11 @@
 CommonMedium=Medio
 CommonMessage=Messaggio
 CommonMethod=Metodo
+CommonMinutely=Minuto
 CommonModify=Modifica
 CommonMonday=Luned\u00ec
 CommonMonth=Mese
+CommonMonthly=Mensilmente
 CommonMonths=Mesi
 CommonMore=Successivo
 CommonMyStatus=Mio stato
@@ -308,6 +315,7 @@
 CommonSavings=Risparmi
 CommonSearch=Ricerca
 CommonSearchResultfor=Ricerca Risultati per
+CommonSecondly=Secondo
 CommonSecurity=Sicurezza
 CommonSelect=Seleziona
 CommonSelectAll=Seleziona Tutto
@@ -375,6 +383,7 @@
 CommonToggle=Bloccare
 CommonTotal=Totale
 CommonTotalValue=Valore Totale
+CommonTrue=Vero
 CommonTuesday=Marted\u00ec
 CommonType=Tipo
 CommonUnitPrice=Prezzo Unitario
@@ -404,6 +413,7 @@
 CommonVolume=Volume
 CommonWednesday=Mercoled\u00ec
 CommonWeek=Settimana
+CommonWeekly=Settimanale
 CommonWeight=Peso
 CommonWelcome=Benvenuto
 CommonWhere=Dove
@@ -412,6 +422,7 @@
 CommonWorkflowActivityUserRole=Attivit\u00e0 Impegno di Lavoro Assegnate al Ruolo Utente
 CommonY=S
 CommonYear=Anno
+CommonYearly=Annualmente
 CommonYes=Si
 CommonYouremail=La tua email
 CommonZipPostalCode=C.A.P.

Modified: incubator/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties?view=diff&rev=466018&r1=466017&r2=466018
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties (original)
+++ incubator/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties Fri Oct 20 00:16:54 2006
@@ -21,40 +21,90 @@
 WebtoolsCompanySubtitle=Part of the Open For Business Family of Open Source Software
 FrameworkWebTools=Framework Web Tools
 
+PageTitleEntityExport=XML Data Export
 PageTitleEntityExportAll=XML Data Export All
 PageTitleEntityImport=XML Data Import
 PageTitleEntityImportDir=XML Data Import Dir
 PageTitleEntitySyncStatus=Entity Sync Status
 PageTitleEntitySQLProcessor=Entity SQL Processor
 PageTitleLogConfiguration=Debugging Levels
+PageTitleLogView=Log View
+PageTitleJobList=Job List
+PageTitleScheduleJob=Schedule Job
+PageTitleServiceList=Service List
+PageTitleThreadList=Thread List
 
 WebtoolsAbsolutePath=Absolute directory path
+WebtoolsAction=Action
+WebtoolsActions=Actions
 WebtoolsAddLoggerFormDescription=This form allows you to enable a logger for a specific package or class.
+WebtoolsAdjustDebuggingLevels=Adjust Debugging Levels
+WebtoolsAsync=ASYNC
+WebtoolsCachDebugTools=Cache &amp; Debug Tools
+WebtoolsCacheMaintenance=Cache Maintenance
+WebtoolsCancelJob=Cancel Job
+WebtoolsCheckUpdateDatabase=Check/Update Database
+WebtoolsCompareType=Compare type
+WebtoolsConditions=Conditions
+WebtoolsConditionService=Condition service
+WebtoolsCount=Count
 WebtoolsCreateDummyFks=Create "Dummy" FKs
+WebtoolsDataFileTools=Data File Tools
 WebtoolsDebuggingLevelFormDescription=This form allows you to change application debugging levels.
+WebtoolsDefaultEntityName=Default Entity Name
 WebtoolsDeleteFiles=Delete Files Afterwards?
+WebtoolsDispatcherName=Dispatcher Name
+WebtoolsEditCustomTimePeriods=Edit Custom Time Periods
+WebtoolsEngineName=Engine Name
 WebtoolsEntityDataMaintenance=Entity Data Maintenance
+WebtoolsEntityEngine=Entity Engine
+WebtoolsEntityEngineTools=Entity Engine Tools
+WebtoolsEntityName=Entity Name
+WebtoolsEntitySyncStatus=Entity Sync Status
+WebtoolsEntityXMLTools=Entity XML Tools
 WebtoolsErrorLogLevel=Error
 WebtoolsErrorLogLevelTooltip=The Error level designates error events that might still allow the application to continue running.
+WebtoolsEventName=Event name
 WebtoolsExport=Export
+WebtoolsExportable=Exportable
 WebtoolsExportFromDataSource=XML Export from DataSource(s)
 WebtoolsFatalLogLevel=Fatal
 WebtoolsFatalLogLevelTooltip=The Fatal level designates very severe error events that will presumably lead the application to abort.
+WebtoolsFieldName=Field Name
+WebtoolsFormat=Format
+WebtoolsFrequency=Frequency
+WebtoolsImplementedServices=Implemented Services
 WebtoolsImport=Import
 WebtoolsImportantLogLevel=Important
 WebtoolsImportantLogLevelTooltip=The Important level designates informational messages that highlight the progress of the application at coarse-grained level.
 WebtoolsImportFile=Import File
 WebtoolsImportText=Import Text
 WebtoolsImportToDataSource=XML Import to DataSource(s)
+WebtoolsInduceModelXMLFromDatabase=Induce Model XML from Database
 WebtoolsInfoLogLevel=Info
 WebtoolsInfoLogLevelTooltip=The Info level designates informational messages that highlight the progress of the application at coarse-grained level.
+WebtoolsInParameters=In parameters
+WebtoolsInterval=Interv