svn commit: r424588 - in /incubator/ofbiz/trunk/framework/common/config: CommonEntityLabels.properties CommonEntityLabels_it.properties

[jacopoc]

Author: jacopoc
Date: Sat Jul 22 07:54:49 2006
New Revision: 424588

URL: http://svn.apache.org/viewvc?rev=424588&view=rev
Log:
New entity labels from Marco Risaliti (Apache OFBIZ-78).

Modified:
    incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties
    incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties

Modified: incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties?rev=424588&r1=424587&r2=424588&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties (original)
+++ incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels.properties Sat Jul 22 07:54:49 2006
@@ -50,7 +50,7 @@
 Enumeration.description.AFFIL_SALES_CHANNEL=Affiliate Channel
 Enumeration.description.UNKNWN_SALES_CHANNEL=Unknown Channel
 
-<!-- order and order item status -->
+# order and order item status
 StatusType.description.ORDER_STATUS=Order
 StatusItem.description.ORDER_CREATED=Created
 StatusItem.description.ORDER_PROCESSING=Processing
@@ -67,7 +67,7 @@
 StatusItem.description.ITEM_REJECTED=Rejected
 StatusItem.description.ITEM_CANCELLED=Cancelled
 
-<!-- order payment pref status -->
+# order payment pref status
 StatusType.description.PAYMENT_PREF_STATUS=Payment Preference
 StatusItem.description.PAYMENT_NOT_RECEIVED=Not-Received
 StatusItem.description.PAYMENT_RECEIVED=Received
@@ -77,14 +77,14 @@
 StatusItem.description.PAYMENT_DECLINED=Declined
 StatusItem.description.PAYMENT_CANCELLED=Cancelled
 
-<!-- Quote statuses -->
+# Quote statuses
 StatusType.description.QUOTE_STATUS=Quote Status
 StatusItem.description.QUO_CREATED=Created
 StatusItem.description.QUO_APPROVED=Approved
 StatusItem.description.QUO_ORDERED=Ordered
 StatusItem.description.QUO_REJECTED=Rejected
 
-<!-- inventory item status -->
+# inventory item status
 StatusType.description.INVENTORY_ITEM_STTS=Inventory Item
 StatusType.description.INV_SERIALIZED_STTS=Serialized Inventory Item
 StatusType.description.INV_NON_SER_STTS=Non-Serialized Inventory Item
@@ -97,7 +97,7 @@
 StatusItem.description.INV_RETURNED=Returned
 StatusItem.description.INV_DEFECTIVE=Defective
 
-<!-- Customer Request statuses -->
+# Customer Request statuses
 StatusType.description.CUSTREQ_STTS=Custom Request Status
 StatusItem.description.CRQ_SUBMITTED=Submitted
 StatusItem.description.CRQ_ACCEPTED=Accepted
@@ -106,14 +106,14 @@
 StatusItem.description.CRQ_REJECTED=Rejected
 StatusItem.description.CRQ_CANCELLED=Cancelled
 
-<!-- Requirement statuses -->
+# Requirement statuses
 StatusType.description.REQUIREMENT_STATUS=Requirement Status
 StatusItem.description.REQ_CREATED=Created
 StatusItem.description.REQ_APPROVED=Approved
 StatusItem.description.REQ_ORDERED=Ordered
 StatusItem.description.REQ_REJECTED=Rejected
 
-<!-- order return status -->
+# order return status
 StatusType.description.ORDER_RETURN_STTS=Order Return Status
 StatusItem.description.RETURN_REQUESTED=Requested
 StatusItem.description.RETURN_ACCEPTED=Accepted
@@ -121,7 +121,7 @@
 StatusItem.description.RETURN_COMPLETED=Completed
 StatusItem.description.RETURN_CANCELLED=Cancelled
 
-<!-- Communication events statuses -->
+# Communication events statuses
 StatusType.description.COM_EVENT_STATUS=Communication Event
 StatusItem.description.COM_ENTERED=Entered
 StatusItem.description.COM_PENDING=Pending
@@ -133,7 +133,7 @@
 StatusItem.description.COM_REFERRED=Referred
 StatusItem.description.COM_CANCELLED=Cancelled
 
-<!-- Payment Gateway Transaction Code -->
+# Payment Gateway Transaction Code
 EnumerationType.description.PGT_CODE=Payment Gateway Transaction Code
 Enumeration.description.PGT_AUTHORIZE=Authorize
 Enumeration.description.PGT_CAPTURE=Capture
@@ -141,7 +141,7 @@
 Enumeration.description.PGT_REFUND=Refund
 Enumeration.description.PGT_CREDIT=Credit
 
-<!-- Uom Currency -->
+# Uom Currency
 UomType.description.CURRENCY_MEASURE=Currency
 Uom.description.CRC=Costa Rica Colon
 Uom.description.COP=Colombian Peso
@@ -330,20 +330,20 @@
 Uom.description.ZRZ=Zaire
 Uom.description.ZWD=Zimbabwean Dollar
 
-<!-- Product requirement method -->
+# Product requirement method
 EnumerationType.description.PROD_REQ_METHOD=Product Requirement Method
 Enumeration.description.PRODRQM_NONE=No Requirement Created
 Enumeration.description.PRODRQM_AUTO=Automatic For Every Sales Order
 Enumeration.description.PRODRQM_STOCK=When QOH Reaches Minimum Stock for Product-Facility
 Enumeration.description.PRODRQM_STOCK_ATP=When ATP Reaches Minimum Stock for Product-Facility
 
-<!-- Product Rating -->
+# Product Rating
 EnumerationType.description.PROD_RATING_TYPE=Product Rating Field Type
 Enumeration.description.PRDR_MIN=Min Rating
 Enumeration.description.PRDR_MAX=Max Rating
 Enumeration.description.PRDR_FLAT=Rating Override
 
-<!-- Uom Types -->
+# Uom Types
 UomType.description.CURRENCY_MEASURE=Currency
 UomType.description.DATA_MEASURE=Data Size
 UomType.description.DATASPD_MEASURE=Data Speed
@@ -357,7 +357,7 @@
 UomType.description.TEMP_MEASURE=Temperature
 UomType.description.OTHER_MEASURE=Other
 
-<!-- =============== LENGTH_MEASURE =============== -->
+# =============== LENGTH_MEASURE ===============
 Uom.description.LEN_A=Angstrom
 Uom.description.LEN_cb=Cable
 Uom.description.LEN_cm=Centimeter
@@ -385,7 +385,7 @@
 Uom.description.LEN_rd=Rod
 Uom.description.LEN_yd=Yard
 
-<!-- =============== WEIGHT_MEASURE =============== -->
+# =============== WEIGHT_MEASURE ===============
 Uom.description.WT_dr_avdp=Dram (avdp)
 Uom.description.WT_gr=Grain
 Uom.description.WT_g=Gram
@@ -400,7 +400,7 @@
 Uom.description.WT_mt=Ton (metric)
 Uom.description.WT_sh_t=Ton (short)
 
-<!-- =============== AREA_MEASURE =============== -->
+# =============== AREA_MEASURE ===============
 Uom.description.AREA_A=Acre
 Uom.description.AREA_a=Are
 Uom.description.AREA_ha=Hectare
@@ -414,7 +414,7 @@
 Uom.description.AREA_rd2=Square Rod
 Uom.description.AREA_yd2=Square Yard
 
-<!-- =============== DATA_MEASURE =============== -->
+# =============== DATA_MEASURE ===============
 Uom.description.DATA_b=Bit of Data
 Uom.description.DATA_Kb=Kilobit of Data
 Uom.description.DATA_Mb=Megabit of Data
@@ -427,14 +427,14 @@
 Uom.description.DATA_TB=Terabyte of Data
 Uom.description.DATA_PB=Petabyte of Data
 
-<!-- =============== DATASPD_MEASURE =============== -->
+# =============== DATASPD_MEASURE ===============
 Uom.description.DATASPD_bps=Bit-per-second of Data
 Uom.description.DATASPD_Kbps=Kilobit-per-second of Data
 Uom.description.DATASPD_Mbps=Megabit-per-second of Data
 Uom.description.DATASPD_Gbps=Gigabit-per-second of Data
 Uom.description.DATASPD_Tbps=Terabit-per-second of Data
 
-<!-- =============== TIME_FREQ_MEASURE =============== -->
+# =============== TIME_FREQ_MEASURE ===============
 Uom.description.TF_ms=Time in Milli-Seconds
 Uom.description.TF_s=Time in Seconds
 Uom.description.TF_min=Time in Minutes
@@ -448,7 +448,7 @@
 Uom.description.TF_century=Time in Centuries
 Uom.description.TF_millenium=Time in Millenia
 
-<!-- =============== VOLUME_LIQ_MEASURE =============== -->
+# =============== VOLUME_LIQ_MEASURE ===============
 Uom.description.VLIQ_bbl=Barrel (US)
 Uom.description.VLIQ_cup=Cup
 Uom.description.VLIQ_dr=Dram (US)
@@ -465,7 +465,7 @@
 Uom.description.VLIQ_Tbs=Tablespoon
 Uom.description.VLIQ_tsp=Teaspoon
 
-<!-- =============== VOLUME_DRY_MEASURE =============== -->
+# =============== VOLUME_DRY_MEASURE ===============
 Uom.description.VDRY_cm3=Cubic centimeter
 Uom.description.VDRY_ft3=Cubic foot
 Uom.description.VDRY_in3=Cubic inch
@@ -474,7 +474,7 @@
 Uom.description.VDRY_ST=Stere (cubic meter)
 Uom.description.VDRY_yd3=Cubic yard
 
-<!-- =============== ENERGY_MEASURE =============== -->
+# =============== ENERGY_MEASURE ===============
 Uom.description.EN_Btu=British Thermal Unit
 Uom.description.EN_cal15=Calorie (@15.5c)
 Uom.description.EN_HP=Horsepower (mechanical)
@@ -482,12 +482,12 @@
 Uom.description.EN_Kw=Kilowatt
 Uom.description.EN_w=Watt
 
-<!-- =============== TEMP_MEASURE =============== -->
+# =============== TEMP_MEASURE ===============
 Uom.description.TEMP_K=Kelvin
 Uom.description.TEMP_C=Degrees Celsius
 Uom.description.TEMP_F=Degrees Fahrenheit
 
-<!-- =============== OTHER_MEASURE =============== -->
+# =============== OTHER_MEASURE ===============
 Uom.description.OTH_A=Amphere - Electric current
 Uom.description.OTH_cd=Candela - Luminosity (intensity of light)
 Uom.description.OTH_mol=Mole - Substance (molecule)
@@ -615,7 +615,7 @@
 GeoType.description.SALES_TERRITORY=Sales Territory
 GeoType.description.SERVICE_TERRITORY=Service Territory
 
-<!-- invoice status -->
+# invoice status
 StatusType.description.INVOICE_STATUS=Invoice Status
 StatusItem.description.INVOICE_IN_PROCESS=In-Process
 StatusItem.description.INVOICE_APPROVED=Approved
@@ -626,7 +626,7 @@
 StatusItem.description.INVOICE_WRITEOFF=Write Off
 StatusItem.description.INVOICE_CANCELLED=Cancelled
 
-<!-- payment status -->
+# payment status
 StatusType.description.PMNT_STATUS=Payment Status
 StatusItem.description.PMNT_NOT_PAID=Not Paid
 StatusItem.description.PMNT_SENT=Sent
@@ -666,12 +666,12 @@
 StatusItem.description.FAM_COMPLETED=Completed
 StatusItem.description.FAM_CANCELLED=Cancelled
 
-<!-- Points of Title Transfer -->
+# Points of Title Transfer
 EnumerationType.description.PTSOFTTFR=Points of Title Transfer
 Enumeration.description.POTT_DEST=Desination
 Enumeration.description.POTT_ORIG=Origin
 Enumeration.description.POTT_INTR=In Transit
-<!-- INCOTERM options -->
+# INCOTERM options
 Enumeration.description.POTT_EXW=EX-Works
 Enumeration.description.POTT_FOB=Free On Board
 Enumeration.description.POTT_FCA=Free Carrier
@@ -686,29 +686,29 @@
 Enumeration.description.POTT_DDP=Delivered Duty Paid
 Enumeration.description.POTT_DDQ=Delivered Duty Unpaid
 
-<!-- cost of goods sold methods for accounting preferences -->
+# cost of goods sold methods for accounting preferences
 EnumerationType.description.COGS_METHODS=COGS Methods
 Enumeration.description.COGS_LIFO=LIFO
 Enumeration.description.COGS_FIFO=FIFO
 Enumeration.description.COGS_AVG_COST=Average Cost
 
-<!-- inventory sequencing mode for accounting preferences -->
+# inventory sequencing mode for accounting preferences
 EnumerationType.description.INVOICE_SEQMD=Invoice Sequence Mode
 Enumeration.description.INVSQ_STANDARD=Standard (faster, may have gaps, per system)
 Enumeration.description.INVSQ_ENF_SEQ=Enforced Sequence (no gaps, per organization)
 Enumeration.description.INVSQ_RESTARTYR=Restart on Fiscal Year (no gaps, per org, reset to 1 each year)
 
-<!-- quote sequencing mode for accounting preferences -->
+# quote sequencing mode for accounting preferences
 EnumerationType.description.QUOTE_SEQMD=Quote Sequence Mode
 Enumeration.description.QTESQ_STANDARD=Standard (faster, may have gaps, per system)
 Enumeration.description.QTESQ_ENF_SEQ=Enforced Sequence (no gaps, per organization)
 
-<!-- order sequencing mode for accounting preferences -->
+# order sequencing mode for accounting preferences
 EnumerationType.description.ORDER_SEQMD=Order Sequence Mode
 Enumeration.description.ODRSQ_STANDARD=Standard (faster, may have gaps, per system)
 Enumeration.description.ODRSQ_ENF_SEQ=Enforced Sequence (no gaps, per organization)
 
-<!-- Production Run status -->
+# Production Run status
 StatusType.description.PRODUCTION_RUN=Production Run Status
 StatusItem.description.PRUN_CREATED=Created
 StatusItem.description.PRUN_DOC_PRINTED=Confirmed
@@ -717,10 +717,10 @@
 StatusItem.description.PRUN_CLOSED=Closed
 StatusItem.description.PRUN_CANCELLED=Cancelled
 
-<!-- Task Formulae -->
+# Task Formulae
 CustomMethod.description.6000=Example task formula (qty * estimatedMilliSeconds * 10)
 
-<!-- Bom Formulae -->
+# Bom Formulae
 CustomMethod.description.6001=Example bom formula (qty * k)
 CustomMethod.description.6002=Bom formula for linear components
 
@@ -739,7 +739,7 @@
 StatusItem.description.CAL_TENTATIVE=Tentative
 StatusItem.description.CAL_CONFIRMED=Confirmed
 
-<!-- Production Run status -->
+# Production Run status
 StatusType.description.PRODUCTION_RUN=Production Run Status
 StatusItem.description.PRUN_CREATED=Created
 StatusItem.description.PRUN_DOC_PRINTED=Confirmed
@@ -779,3 +779,11 @@
 StatusItem.description.CTNT_FINAL_DRAFT=Final Draft
 StatusItem.description.CTNT_PUBLISHED=Published
 StatusItem.description.CTNT_DEACTIVATED=Deactivated
+
+# order delivery schedule status
+StatusType.description.ORDER_DEL_SCH=Order Delivery Schedule
+StatusItem.description.ODS_SUBMITTED=Supplier Submitted
+StatusItem.description.ODS_ACCEPTED=Accepted
+StatusItem.description.ODS_APPROVED=Schedule Approved
+StatusItem.description.ODS_ARRANGED=Delivery Arranged
+StatusItem.description.ODS_CANCELLED=Delivery Cancelled

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?rev=424588&r1=424587&r2=424588&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties (original)
+++ incubator/ofbiz/trunk/framework/common/config/CommonEntityLabels_it.properties Sat Jul 22 07:54:49 2006
@@ -779,3 +779,11 @@
 StatusItem.description.CTNT_FINAL_DRAFT=Bozza Finale
 StatusItem.description.CTNT_PUBLISHED=Pubblicato
 StatusItem.description.CTNT_DEACTIVATED=Disattivato
+
+# order delivery schedule status
+StatusType.description.ORDER_DEL_SCH=Schedulazione Consegne Ordini
+StatusItem.description.ODS_SUBMITTED=Sottoposta al Fornitore
+StatusItem.description.ODS_ACCEPTED=Accettato
+StatusItem.description.ODS_APPROVED=Schedulazione Approvata
+StatusItem.description.ODS_ARRANGED=Consegna Preparata
+StatusItem.description.ODS_CANCELLED=Consegna Cancellata