You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2013/12/23 10:27:00 UTC
svn commit: r1553086 [8/10] - in /ofbiz/branches/jackrabbit20120501: ./
applications/accounting/config/
applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/
applications/commonext/config/ applications/content/config/
applications/cont...
Modified: ofbiz/branches/jackrabbit20120501/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/party/config/PartyUiLabels.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/party/config/PartyUiLabels.xml Mon Dec 23 09:26:58 2013
@@ -3326,7 +3326,6 @@
<value xml:lang="zh_TW">å¹é
</value>
</property>
<property key="PartyAdjustInAccountingComponent">
- <value xml:lang="de"></value>
<value xml:lang="en">Adjust in accounting component</value>
<value xml:lang="fr">Ajuster en comptabilité</value>
<value xml:lang="hi_IN">लà¥à¤à¤¾à¤à¤à¤¨ à¤à¤à¤(accounting component) मà¥à¤ समायà¥à¤à¤¿à¤¤ à¤à¤°à¥à¤</value>
@@ -4611,7 +4610,7 @@
<value xml:lang="hi_IN">समà¥à¤ªà¤°à¥à¤ सà¥à¤à¥</value>
<value xml:lang="it">Liste contatti</value>
<value xml:lang="ja">é£çµ¡ãªã¹ã</value>
- <value xml:lang="nl">Kontactlijsten</value>
+ <value xml:lang="nl">Contactlijsten</value>
<value xml:lang="pt_BR">Lista de contatos</value>
<value xml:lang="ro">Liste Contacte</value>
<value xml:lang="ru">СпиÑок конÑакÑов</value>
@@ -4628,7 +4627,7 @@
<value xml:lang="hi_IN">समà¥à¤ªà¤°à¥à¤ Mech ID नहॠहà¥</value>
<value xml:lang="it">Codice Contatto mancante</value>
<value xml:lang="ja">é£çµ¡æ¹æ³IDãæ£ããããã¾ãã</value>
- <value xml:lang="nl">Kontact Mechanisme ID mist</value>
+ <value xml:lang="nl">Contact Mechanisme ID ontbreekt</value>
<value xml:lang="pt_BR">Id do mecanismo de contato faltando</value>
<value xml:lang="pt_PT">Identificação do Modo de Contacto em Falta</value>
<value xml:lang="ro">Contact Mech Cod lipseste</value>
@@ -4877,7 +4876,7 @@
<value xml:lang="hi_IN">समà¥à¤ªà¤°à¥à¤ नमà¥à¤¬à¤° नहॠहà¥</value>
<value xml:lang="it">Contatto telefonico mancante</value>
<value xml:lang="ja">é£çµ¡é»è©±çªå·ãæ£ããããã¾ãã</value>
- <value xml:lang="nl">Kontact telefoonnummer mist</value>
+ <value xml:lang="nl">Telefoonnummer contact ontbreekt</value>
<value xml:lang="pt_BR">Telefone para contato está faltando</value>
<value xml:lang="pt_PT">Telefone de Contacto em Falta</value>
<value xml:lang="ro">Telefon Contact lipseste </value>
@@ -11844,7 +11843,7 @@
<value xml:lang="hi_IN">à¤à¤°(tax) à¤à¥à¤°à¤®à¤¾à¤à¤</value>
<value xml:lang="it">ID Tasse</value>
<value xml:lang="ja">ç¨åID</value>
- <value xml:lang="nl">BTW nummer</value>
+ <value xml:lang="nl">BTW nr.</value>
<value xml:lang="pt_BR">ID de imposto</value>
<value xml:lang="ro">ID Taxe</value>
<value xml:lang="ru">ÐалоговÑй код</value>
@@ -12253,22 +12252,8 @@
<value xml:lang="zh">æ æ³å®ä½ç®çï¼ä¸è½å é¤</value>
</property>
<property key="PartyURI">
- <value xml:lang="de">URI</value>
<value xml:lang="en">URI</value>
- <value xml:lang="es">URI</value>
- <value xml:lang="fr">URI</value>
<value xml:lang="hi_IN">यà¥à¤à¤°à¤à¤(URI)</value>
- <value xml:lang="it">URI</value>
- <value xml:lang="ja">URI</value>
- <value xml:lang="nl">URI</value>
- <value xml:lang="pt_BR">URI</value>
- <value xml:lang="pt_PT">URI</value>
- <value xml:lang="ro">URI</value>
- <value xml:lang="ru">URI</value>
- <value xml:lang="th">URI</value>
- <value xml:lang="vi">URI</value>
- <value xml:lang="zh">URI</value>
- <value xml:lang="zh_TW">URI</value>
</property>
<property key="PartyUnknown">
<value xml:lang="de">Unbekannt</value>
Modified: ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/profileblocks/FinAccounts.ftl Mon Dec 23 09:26:58 2013
@@ -19,7 +19,7 @@ under the License.
<div style="border-bottom: 1px solid #ccc; margin-bottom: 20px">
<p>
- <b>${uiLabelMap.AccountingAccountNumber}:</b> <a href="/accounting/control/EditFinAccount?finAccountId=${ownedFinAccount.finAccountId}${externalKeyParam}"
+ <b>${uiLabelMap.AccountingAccountNumber}:</b> <a href="/accounting/control/EditFinAccount?finAccountId=${ownedFinAccount.finAccountId}${StringUtil.wrapString(externalKeyParam)}"
class="smallSubmit">${ownedFinAccount.finAccountId}</a>
<b>${uiLabelMap.AccountingAccountType}:</b> ${(ownedFinAccountType.description)?default('N/A')}
<b>${uiLabelMap.FormFieldTitle_finAccountName}:</b> ${ownedFinAccount.finAccountName?if_exists}
Modified: ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/applications/party/webapp/partymgr/party/profileblocks/PaymentMethods.ftl Mon Dec 23 09:26:58 2013
@@ -81,7 +81,7 @@ under the License.
</td>
<td class="button-col">
<#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)>
- <a href="/accounting/control/manualETx?paymentMethodId=${paymentMethod.paymentMethodId}${externalKeyParam}">${uiLabelMap.PartyManualTx}</a>
+ <a href="/accounting/control/manualETx?paymentMethodId=${paymentMethod.paymentMethodId}${StringUtil.wrapString(externalKeyParam)}">${uiLabelMap.PartyManualTx}</a>
</#if>
<#if security.hasEntityPermission("PAY_INFO", "_UPDATE", session) || security.hasEntityPermission("ACCOUNTING", "_UPDATE", session)>
<a href="<@o...@ofbizUrl>">${uiLabelMap.CommonUpdate}</a>
Modified: ofbiz/branches/jackrabbit20120501/applications/product/config/ProductEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/config/ProductEntityLabels.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/product/config/ProductEntityLabels.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/product/config/ProductEntityLabels.xml Mon Dec 23 09:26:58 2013
@@ -371,18 +371,7 @@
<value xml:lang="zh_TW">è°·æç¨æ¶å</value>
</property>
<property key="GoodIdentificationType.description.ISBN">
- <value xml:lang="de">ISBN</value>
<value xml:lang="en">ISBN</value>
- <value xml:lang="es">ISBN</value>
- <value xml:lang="fr">ISBN</value>
- <value xml:lang="it">ISBN</value>
- <value xml:lang="ja">ISBN</value>
- <value xml:lang="ro">ISBN</value>
- <value xml:lang="ru">ISBN</value>
- <value xml:lang="th">ISBN</value>
- <value xml:lang="vi">ISBN</value>
- <value xml:lang="zh">ISBN</value>
- <value xml:lang="zh_TW">ISBN</value>
</property>
<property key="GoodIdentificationType.description.MANUFACTURER_ID_NO">
<value xml:lang="de">Hersteller (Modell) Nummer</value>
@@ -444,29 +433,21 @@
<value xml:lang="de">Barcode UPCA</value>
<value xml:lang="en">UPCA</value>
<value xml:lang="es">Código de barra UPCA</value>
- <value xml:lang="fr">UPCA</value>
+ <value xml:lang="fr">Code barre UPCA</value>
<value xml:lang="it">Codice a barre UPCA</value>
- <value xml:lang="ja">UPCA</value>
<value xml:lang="ro">Cod Bare UPCA</value>
- <value xml:lang="ru">UPCA</value>
- <value xml:lang="th">UPCA</value>
- <value xml:lang="vi">UPCA</value>
<value xml:lang="zh">UPCAæ¡ç </value>
- <value xml:lang="zh_TW">UPCAæ¢ç¢¼</value>
+ <value xml:lang="zh_TW">UPCAæ¢ç¢¼</value>
</property>
<property key="GoodIdentificationType.description.UPCE">
<value xml:lang="de">Barcode UPCE</value>
<value xml:lang="en">UPCE</value>
<value xml:lang="es">Código de barra UPCE</value>
- <value xml:lang="fr">UPCE</value>
+ <value xml:lang="fr">Code barre UPCE</value>
<value xml:lang="it">Codice a barre UPCE</value>
- <value xml:lang="ja">UPCE</value>
<value xml:lang="ro">Cod Bare UPCE</value>
- <value xml:lang="ru">UPCE</value>
- <value xml:lang="th">UPCE</value>
- <value xml:lang="vi">UPCE</value>
<value xml:lang="zh">UPCEæ¡ç </value>
- <value xml:lang="zh_TW">UPCEæ¢ç¢¼</value>
+ <value xml:lang="zh_TW">UPCEæ¢ç¢¼</value>
</property>
<property key="InventoryItemType.description.NON_SERIAL_INV_ITEM">
<value xml:lang="de">ohne Seriennummern</value>
Modified: ofbiz/branches/jackrabbit20120501/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/config/ProductUiLabels.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/product/config/ProductUiLabels.xml Mon Dec 23 09:26:58 2013
@@ -580,10 +580,6 @@
</property>
<property key="FacilityShipmentDhlLabelImageFormatPng">
<value xml:lang="en">PNG</value>
- <value xml:lang="it">PNG</value>
- <value xml:lang="ja">PNG</value>
- <value xml:lang="vi">PNG</value>
- <value xml:lang="zh">PNG</value>
</property>
<property key="FacilityShipmentDhlMultiplePackagesNotSupported">
<value xml:lang="en">Cannot confirm shipment: DHL ShipIT does not currently support more than one package per shipment.</value>
@@ -944,17 +940,9 @@
</property>
<property key="FacilityShipmentFedexLabelImageTypePdf">
<value xml:lang="en">PDF</value>
- <value xml:lang="it">PDF</value>
- <value xml:lang="ja">PDF</value>
- <value xml:lang="vi">PDF</value>
- <value xml:lang="zh">PDF</value>
</property>
<property key="FacilityShipmentFedexLabelImageTypePng">
<value xml:lang="en">PNG</value>
- <value xml:lang="it">PNG</value>
- <value xml:lang="ja">PNG</value>
- <value xml:lang="vi">PNG</value>
- <value xml:lang="zh">PNG</value>
</property>
<property key="FacilityShipmentFedexMeterNumberAlreadyExists">
<value xml:lang="en">MeterNumber already exists: ${meterNumber}</value>
@@ -11439,7 +11427,7 @@
<value xml:lang="zh_TW">æ·»å 總賬賬æ¶</value>
</property>
<property key="ProductAddGroupOrder">
- <value xml:lang="en">Add GroupOrder</value>
+ <value xml:lang="en">Add Group Order</value>
<value xml:lang="ja">ã°ã«ã¼ã注æã追å </value>
<value xml:lang="vi">Thêm Nhóm Äặt hà ng</value>
<value xml:lang="zh">æ·»å 订åç»</value>
@@ -15021,16 +15009,8 @@
<value xml:lang="zh_TW">客æ¶è©ç´</value>
</property>
<property key="ProductDL">
- <value xml:lang="de">DL</value>
<value xml:lang="en">DL</value>
- <value xml:lang="es">DL</value>
<value xml:lang="fr">Eff.</value>
- <value xml:lang="it">DL</value>
- <value xml:lang="ja">DL</value>
- <value xml:lang="ro">DL</value>
- <value xml:lang="ru">DL</value>
- <value xml:lang="th">DL</value>
- <value xml:lang="vi">DL</value>
<value xml:lang="zh">æç</value>
<value xml:lang="zh_TW">æç</value>
</property>
@@ -15647,7 +15627,7 @@
<value xml:lang="zh_TW">ç¹æ§åé¡çç¹æ§ä¿®æ¹</value>
</property>
<property key="ProductEditGroupOrder">
- <value xml:lang="en">Edit GroupOrder</value>
+ <value xml:lang="en">Edit Group Order</value>
<value xml:lang="ja">ã°ã«ã¼ã注æãç·¨é</value>
<value xml:lang="zh">ç¼è¾è®¢åç»</value>
</property>
@@ -17615,7 +17595,8 @@
<value xml:lang="zh_TW">çµæå¡ç¶è·</value>
</property>
<property key="ProductGroupOrder">
- <value xml:lang="en">GroupOrder</value>
+ <value xml:lang="en">Group Order</value>
+ <value xml:lang="fr">Groupe de commandes</value>
<value xml:lang="ja">ã°ã«ã¼ã注æ</value>
<value xml:lang="vi">Nhóm Äặt hà ng</value>
<value xml:lang="zh">订åç»</value>
@@ -21775,7 +21756,6 @@
<value xml:lang="es">NOTA: El flag "Requerir E-mail" está configurado como N (No). Cualquier dirección de e-mail o participantes listados aquà serán ignorados. Para usar alguna de estas direcciones, debe configurar el flag a Y(Si)</value>
<value xml:lang="fr">NOTE: Pour rendre obligatoire et prendre en compte le champ acteur ou courriel, cocher (O), sinon mettre (N)</value>
<value xml:lang="it">NOTA: L'email richiesta o se il flag soggetto è impostato a N (No), così qualsiasi indirizzo email o soggetti listati qui saranno ignorati. Per richiedere un'indirizzo email o il soggetto da queste liste, imposta il flag a Y (Si).</value>
- <value xml:lang="ja"></value>
<value xml:lang="ro">NOTA: Email-ul cerut O daca flag Subiect este setat N (Nu), asa ca orice adresa email sau Subiectii listati aici vor fi ignorati. Pentru a cere o adresa email sau Subiectul din aceste liste, seteaza flag Y (Da).</value>
<value xml:lang="ru">ÐÐ ÐÐÐЧÐÐÐÐ: Флаги ТÑебÑеÑÑÑ Email или УÑаÑÑник ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ Ð² Ð (ÐеÑ), поÑÑÐ¾Ð¼Ñ Ð²Ñе пеÑеÑиÑленнÑе адÑеÑа и ÑÑаÑÑники бÑдÑÑ Ð¿ÑоигноÑиÑованÑ. ÐÑли ÑÑебÑÑÑÑÑ Ð°Ð´ÑеÑа Ñл.поÑÑÑ Ð¸Ð»Ð¸ ÑÑаÑÑники из ÑÑиÑ
ÑпиÑков, ÑÑÑановиÑе Ñлаг в Ð (Ðа).</value>
<value xml:lang="vi">Ghi chú: Há» thá»ng yêu cầu phải có thông tin Äá»a chá» thÆ° Äiá»n tá» của ngÆ°á»i dùng</value>
@@ -26537,11 +26517,8 @@
</property>
<property key="ProductST">
<value xml:lang="en">ST</value>
- <value xml:lang="es">ST</value>
<value xml:lang="fr">Dates</value>
- <value xml:lang="ja">ST</value>
<value xml:lang="vi">Ngà y</value>
- <value xml:lang="it">ST</value>
<value xml:lang="zh">éå®ç»æ¢</value>
</property>
<property key="ProductSaleRule">
@@ -27878,20 +27855,10 @@
<value xml:lang="zh">è±å¯¸</value>
</property>
<property key="ProductShipmentUomAbbreviation_WT_g">
- <value xml:lang="de">g</value>
<value xml:lang="en">g</value>
- <value xml:lang="es">g</value>
- <value xml:lang="fr">g</value>
- <value xml:lang="it">g</value>
- <value xml:lang="ja">g</value>
</property>
<property key="ProductShipmentUomAbbreviation_WT_kg">
- <value xml:lang="de">kg</value>
<value xml:lang="en">kg</value>
- <value xml:lang="es">kg</value>
- <value xml:lang="fr">kg</value>
- <value xml:lang="it">kg</value>
- <value xml:lang="ja">kg</value>
<value xml:lang="ru">кг</value>
<value xml:lang="th">à¸à¸´à¹à¸¥à¸à¸£à¸±à¸¡</value>
<value xml:lang="vi">cân</value>
@@ -27906,8 +27873,6 @@
<value xml:lang="it">libre</value>
<value xml:lang="ja">ãã³ã</value>
<value xml:lang="ru">ÑнÑ</value>
- <value xml:lang="th">lbs</value>
- <value xml:lang="vi">lbs</value>
<value xml:lang="zh">ç£
</value>
<value xml:lang="zh_TW">ç£
</value>
</property>
@@ -29044,10 +29009,7 @@
</property>
<property key="ProductTD">
<value xml:lang="en">TD</value>
- <value xml:lang="es">TD</value>
<value xml:lang="fr">Assoc.</value>
- <value xml:lang="it">TD</value>
- <value xml:lang="ja">TD</value>
<value xml:lang="zh">ç¹å¾ç»ææ¥æ</value>
</property>
<property key="ProductTag">
@@ -29693,9 +29655,6 @@
<property key="ProductUPCA">
<value xml:lang="en">UPCA</value>
<value xml:lang="fr">CUP (UPC-A)</value>
- <value xml:lang="it">UPCA</value>
- <value xml:lang="ja">UPCA</value>
- <value xml:lang="vi">UPCA</value>
<value xml:lang="zh">UPC-Aæ¡ç </value>
</property>
<property key="ProductUnitOfMeasure">
@@ -30345,6 +30304,7 @@
</property>
<property key="ProductVerifyPick">
<value xml:lang="en">Verify Pick</value>
+ <value xml:lang="fr">Vérifier le prélèvement</value>
<value xml:lang="it">Verifica prelievo</value>
<value xml:lang="ja">ãããã³ã°ã確èª</value>
<value xml:lang="vi">Xác minh Xá» lý Äặt hà ng (Pick)</value>
Modified: ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/category/CategoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/category/CategoryServices.java?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/category/CategoryServices.java (original)
+++ ofbiz/branches/jackrabbit20120501/applications/product/src/org/ofbiz/product/category/CategoryServices.java Mon Dec 23 09:26:58 2013
@@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletRes
import javolution.util.FastList;
import javolution.util.FastMap;
-
import net.sf.json.JSONObject;
import org.ofbiz.base.util.Debug;
@@ -504,7 +503,6 @@ public class CategoryServices {
}
}
- @SuppressWarnings("unchecked")
public static void toJsonObjectList(List attrList, HttpServletResponse response){
StringBuilder jsonBuilder = new StringBuilder("[");
for (Object attrMap : attrList) {
Modified: ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl Mon Dec 23 09:26:58 2013
@@ -24,7 +24,7 @@ under the License.
</div>
<div class="screenlet-body">
<#if productId?has_content>
- <a href="/facility/control/EditInventoryItem?productId=${productId}${externalKeyParam}" class="buttontext">${uiLabelMap.ProductCreateNewInventoryItemProduct}</a>
+ <a href="/facility/control/EditInventoryItem?productId=${productId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.ProductCreateNewInventoryItemProduct}</a>
<#if showEmpty>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductHideEmptyItems}</a>
<#else>
@@ -61,7 +61,7 @@ under the License.
<#assign inventoryItemDetailFirst = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(inventoryItem.getRelated("InventoryItemDetail", null, Static["org.ofbiz.base.util.UtilMisc"].toList("effectiveDate"), false))?if_exists>
<#if curInventoryItemType?exists>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
- <td><a href="/facility/control/EditInventoryItem?inventoryItemId=${(inventoryItem.inventoryItemId)?if_exists}${externalKeyParam}" class="buttontext">${(inventoryItem.inventoryItemId)?if_exists}</a></td>
+ <td><a href="/facility/control/EditInventoryItem?inventoryItemId=${(inventoryItem.inventoryItemId)?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${(inventoryItem.inventoryItemId)?if_exists}</a></td>
<td> ${(curInventoryItemType.get("description",locale))?if_exists}</td>
<td>
<div>
@@ -80,13 +80,13 @@ under the License.
<td style="color: red;">${uiLabelMap.ProductErrorFacility} (${inventoryItem.facilityId})
${uiLabelMap.ProductAndContainer} (${inventoryItem.containerId}) ${uiLabelMap.CommonSpecified}</td>
<#elseif inventoryItem.facilityId?exists>
- <td>${uiLabelMap.ProductFacilityLetter}: <a href="/facility/control/EditFacility?facilityId=${inventoryItem.facilityId}${externalKeyParam}" class="linktext">${inventoryItem.facilityId}</a></td>
+ <td>${uiLabelMap.ProductFacilityLetter}: <a href="/facility/control/EditFacility?facilityId=${inventoryItem.facilityId}${StringUtil.wrapString(externalKeyParam)}" class="linktext">${inventoryItem.facilityId}</a></td>
<#elseif (inventoryItem.containerId)?exists>
<td>${uiLabelMap.ProductContainerLetter}: <a href="<@ofbizUrl>EditContainer?containerId=${inventoryItem.containerId }</...@ofbizUrl>" class="linktext">${inventoryItem.containerId}</a></td>
<#else>
<td> </td>
</#if>
- <td><a href="/facility/control/EditFacilityLocation?facilityId=${(inventoryItem.facilityId)?if_exists}&locationSeqId=${(inventoryItem.locationSeqId)?if_exists}${externalKeyParam}" class="linktext"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?has_content> (${facilityLocationTypeEnum.get("description",locale)})</#if> [${(inventoryItem.locationSeqId)?if_exists}]</a></td>
+ <td><a href="/facility/control/EditFacilityLocation?facilityId=${(inventoryItem.facilityId)?if_exists}&locationSeqId=${(inventoryItem.locationSeqId)?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="linktext"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?has_content> (${facilityLocationTypeEnum.get("description",locale)})</#if> [${(inventoryItem.locationSeqId)?if_exists}]</a></td>
<td> ${(inventoryItem.lotId)?if_exists}</td>
<td> ${(inventoryItem.binNumber)?if_exists}</td>
<td align="right"><@ofbizCurrency amount=inventoryItem.unitCost isoCode=inventoryItem.currencyUomId/></td>
Modified: ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/facility/PicklistOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/facility/PicklistOptions.ftl?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/facility/PicklistOptions.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/facility/PicklistOptions.ftl Mon Dec 23 09:26:58 2013
@@ -172,7 +172,7 @@ under the License.
</td>
<td>
<#if orderReadyToPickInfoList?has_content>
- <form method="post" action="<@o...@ofbizUrl>">
+ <form method="post" action="<@o...@ofbizUrl>" target="_blank">
<input type="hidden" name="printGroupName" value="${groupName?if_exists}"/>
<input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
<input type="hidden" name="groupByShippingMethod" value="${requestParameters.groupByShippingMethod?if_exists}"/>
@@ -216,7 +216,7 @@ under the License.
</td>
<td>
<#if (orderReadyToPickInfoListSizeTotal > 0)>
- <form method="post" action="<@o...@ofbizUrl>">
+ <form method="post" action="<@o...@ofbizUrl>" target="_blank">
<input type="hidden" name="facilityId" value="${facilityId?if_exists}"/>
<span class="label">${uiLabelMap.FormFieldTitle_printPickSheetFirst}</span>
<input type="text" size="4" name="maxNumberOfOrdersToPrint" value="20"/>
@@ -273,14 +273,14 @@ under the License.
<#assign orderProduct = oiasga.getRelatedOne("OrderItem", false).getRelatedOne("Product", false)?if_exists>
<#assign product = oiasga.getRelatedOne("InventoryItem", false).getRelatedOne("Product", false)?if_exists>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
- <td><a href="/ordermgr/control/orderview?orderId=${oiasga.orderId}${externalKeyParam}" class="buttontext" target="_blank">${oiasga.orderId}</a></td>
+ <td><a href="/ordermgr/control/orderview?orderId=${oiasga.orderId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${oiasga.orderId}</a></td>
<td>${header.orderDate?string}</td>
<td>${(channel.description)?if_exists}</td>
<td>${oiasga.orderItemSeqId}</td>
<td>
- <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(orderProduct.internalName)?if_exists}</a>
+ <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(orderProduct.internalName)?if_exists}</a>
<#if orderProduct.productId != product.productId>
- [<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>]
+ [<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>]
</#if>
</td>
<td>${oiasga.shipGroupSeqId}</td>
@@ -294,4 +294,4 @@ under the License.
</table>
</div>
</div>
-</#if>
\ No newline at end of file
+</#if>
Modified: ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/inventory/receiveInventory.ftl Mon Dec 23 09:26:58 2013
@@ -403,7 +403,7 @@ under the License.
<td width="45%">
<b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists}
<input type="text" size="12" name="productId_o_${rowCount}"/>
- <a href="/catalog/control/EditProduct?${externalKeyParam}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
+ <a href="/catalog/control/EditProduct?${StringUtil.wrapString(externalKeyParam)}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
</td>
</#if>
<td align="right">${uiLabelMap.ProductLocation}:</td>
Modified: ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/returns/receiveReturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/returns/receiveReturn.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/returns/receiveReturn.ftl Mon Dec 23 09:26:58 2013
@@ -120,7 +120,7 @@ under the License.
<div>
${returnItem.returnItemSeqId}: <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists}
<input type="text" size="12" name="productId_o_${rowCount}" />
- <a href="/catalog/control/EditProduct?${externalKeyParam}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
+ <a href="/catalog/control/EditProduct?${StringUtil.wrapString(externalKeyParam)}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
</div>
</td>
<#else>
Modified: ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/shipment/PackOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/shipment/PackOrder.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/shipment/PackOrder.ftl Mon Dec 23 09:26:58 2013
@@ -58,8 +58,8 @@ under the License.
<ul>
<#list invoiceIds as invoiceId>
<li>
- ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">${invoiceId}</a>
- (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">PDF</a>)
+ ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">${invoiceId}</a>
+ (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">PDF</a>)
</li>
</#list>
</ul>
@@ -295,9 +295,9 @@ under the License.
</#if>
</td>
<td>
- <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(orderProduct.internalName)?if_exists}</a>
+ <a href="/catalog/control/EditProduct?productId=${orderProduct.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(orderProduct.internalName)?if_exists}</a>
<#if orderProduct.productId != product.productId>
- [<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>]
+ [<a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>]
</#if>
</td>
<td align="right">${orderItemQuantity}</td>
@@ -459,7 +459,7 @@ under the License.
<td>${line.getOrderItemSeqId()}</td>
<td>${line.getProductId()?default("N/A")}</td>
<td>
- <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a>
+ <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a>
</td>
<td>${line.getInventoryItemId()}</td>
<td align="right">${line.getQuantity()}</td>
@@ -503,7 +503,7 @@ under the License.
<td>${line.getOrderItemSeqId()}</td>
<td>${line.getProductId()?default("N/A")}</td>
<td>
- <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a>
+ <a href="/catalog/control/EditProduct?productId=${line.getProductId()?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${product.internalName?if_exists?default("[N/A]")}</a>
</td>
<td>${line.getInventoryItemId()}</td>
<td align="right">${line.getQuantity()}</td>
Modified: ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/shipment/VerifyPick.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/shipment/VerifyPick.ftl?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/shipment/VerifyPick.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/shipment/VerifyPick.ftl Mon Dec 23 09:26:58 2013
@@ -39,8 +39,8 @@ under the License.
<ul>
<#list invoiceIds as invoiceId>
<li>
- ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">${invoiceId}</a>
- (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">PDF</a>)
+ ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">${invoiceId}</a>
+ (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">PDF</a>)
</li>
</#list>
</ul>
@@ -234,7 +234,7 @@ under the License.
<td>${orderItemSeqId?if_exists}</td>
<td>${product.productId?default("N/A")}</td>
<td>
- <a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${externalKeyParam}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>
+ <a href="/catalog/control/EditProduct?productId=${product.productId?if_exists}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${(product.internalName)?if_exists}</a>
</td>
<td>
<select name="geo_${rowKey}">
Modified: ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/shipment/WeightPackage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/shipment/WeightPackage.ftl?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/shipment/WeightPackage.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/applications/product/webapp/facility/shipment/WeightPackage.ftl Mon Dec 23 09:26:58 2013
@@ -38,8 +38,8 @@ under the License.
<ul>
<#list invoiceIds as invoiceId>
<li>
- ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">${invoiceId}</a>
- (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">PDF</a>)
+ ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">${invoiceId}</a>
+ (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">PDF</a>)
</li>
</#list>
</ul>
Modified: ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/CatalogMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/CatalogMenus.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/CatalogMenus.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/product/widget/catalog/CatalogMenus.xml Mon Dec 23 09:26:58 2013
@@ -550,7 +550,6 @@ under the License.
<menu-item name="ExpandAll" title="${uiLabelMap.CommonExpandAll}" widget-style="buttontext expand-all">
<condition>
<and>
- <not><if-empty field="product"/></not>
<if-compare operator="equals" value="EditProduct" field="tabButtonItem"/>
</and>
</condition>
@@ -559,7 +558,6 @@ under the License.
<menu-item name="CollapseAll" title="${uiLabelMap.CommonCollapseAll}" widget-style="buttontext collapse-all">
<condition>
<and>
- <not><if-empty field="product"/></not>
<if-compare operator="equals" value="EditProduct" field="tabButtonItem"/>
</and>
</condition>
Modified: ofbiz/branches/jackrabbit20120501/applications/product/widget/facility/InventoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/product/widget/facility/InventoryForms.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/product/widget/facility/InventoryForms.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/product/widget/facility/InventoryForms.xml Mon Dec 23 09:26:58 2013
@@ -34,15 +34,14 @@ under the License.
</entity-one>
</actions>
<alt-target use-when="inventoryItemId==null" target="CreateInventoryItem"/>
- <auto-fields-service service-name="updateInventoryItem" map-name="inventoryItem"/>
+ <auto-fields-service service-name="updateInventoryItem" map-name="inventoryItem"/>
<!-- ignored fields -->
<field name="oldAvailableToPromise"><ignored/></field>
<field name="oldQuantityOnHand"><ignored/></field>
-
+
<!-- custom formatted fields -->
- <field use-when="inventoryItem!=null" name="inventoryItemId" tooltip="${uiLabelMap.ProductNotModificationRecrationInventoryItem}"><display/></field>
- <field use-when="inventoryItem==null" name="inventoryItemId"><text/></field>
+ <field name="inventoryItemId" tooltip="${uiLabelMap.ProductNotModificationRecrationInventoryItem}"><display/></field>
<field name="inventoryItemTypeId" title="${uiLabelMap.ProductInventoryItemTypeId}">
<drop-down allow-empty="false">
<entity-options entity-name="InventoryItemType" description="${description}" key-field-name="inventoryItemTypeId"/>
Modified: ofbiz/branches/jackrabbit20120501/applications/workeffort/config/WorkEffortEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/workeffort/config/WorkEffortEntityLabels.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/workeffort/config/WorkEffortEntityLabels.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/workeffort/config/WorkEffortEntityLabels.xml Mon Dec 23 09:26:58 2013
@@ -24,6 +24,7 @@
<value xml:lang="fr">Taux horaire escompté</value>
<value xml:lang="it">Percentuale oraria scontata</value>
<value xml:lang="ja">å²å¼æé給</value>
+ <value xml:lang="nl">Uurtarief - korting</value>
<value xml:lang="ro">Procent Orar Redus</value>
<value xml:lang="ru">СниженнÑе поÑаÑовÑе ÑÑавки</value>
<value xml:lang="th">à¸à¸±à¸à¸£à¸²à¸¥à¸à¸¥à¸à¸à¸¸à¸ ๠à¸à¸±à¹à¸§à¹à¸¡à¸</value>
@@ -36,6 +37,7 @@
<value xml:lang="fr">Taux horaire des heures supplémentaires</value>
<value xml:lang="it">Percentuale oraria straordinaria</value>
<value xml:lang="ja">æ®æ¥æé給</value>
+ <value xml:lang="nl">Uurtarief - overtime</value>
<value xml:lang="ro">Procent Orar Straordinar</value>
<value xml:lang="ru">ÐоÑаÑовÑе ÑÑавки пÑи пеÑеÑабоÑке</value>
<value xml:lang="th">à¸à¸±à¸à¸£à¸²à¸¥à¹à¸§à¸à¹à¸§à¸¥à¸²à¸à¸¸à¸ ๠à¸à¸±à¹à¸§à¹à¸¡à¸</value>
@@ -48,6 +50,7 @@
<value xml:lang="fr">Taux horaire standard</value>
<value xml:lang="it">Percentuale oraria standard</value>
<value xml:lang="ja">æ¨æºæé給</value>
+ <value xml:lang="nl">Uurtarief - standaard</value>
<value xml:lang="ro">Procent Orar Standard</value>
<value xml:lang="ru">СÑандаÑÑнÑе поÑаÑовÑе ÑÑавки</value>
<value xml:lang="th">à¸à¸±à¸à¸£à¸²à¸¡à¸²à¸à¸£à¸à¸²à¸à¸à¸¸à¸ ๠à¸à¸±à¹à¸§à¹à¸¡à¸</value>
@@ -55,11 +58,16 @@
<value xml:lang="zh">æ åå°æ¶ä»·æ ¼</value>
<value xml:lang="zh_TW">æ¨åå°æå¹æ ¼</value>
</property>
+ <property key="RateType.description.FLC">
+ <value xml:lang="en">Hourly rate - Fully loaded costprice</value>
+ <value xml:lang="nl">Uurtarief - FLC</value>
+ </property>
<property key="WorkEffortAssocType.description.ROUTING_COMPONENT">
<value xml:lang="en">Routing and Routing Task Association</value>
<value xml:lang="fr">Routage et association de tâche de routage</value>
<value xml:lang="it">Associazione rotta e rotta compito</value>
<value xml:lang="ja">ã«ã¼ãã£ã³ã°ã¨ã¿ã¹ã¯é¢é£ä»ãã®ã«ã¼ãã£ã³ã°</value>
+ <value xml:lang="nl">Koppeling schema-taak</value>
<value xml:lang="ru">СвÑзи Ð¼ÐµÐ¶Ð´Ñ Ð¼Ð°ÑÑÑÑÑизаÑией и задаÑами маÑÑÑÑÑизаÑии</value>
<value xml:lang="th">Routing à¹à¸¥à¸° Routing à¸à¸¥à¸¸à¹à¸¡à¸ ารà¸à¸´à¸</value>
<value xml:lang="vi">Quy trình và các Tác vụ - Äầu viá»c của quy trình</value>
@@ -72,6 +80,7 @@
<value xml:lang="fr">Détail/Ventilation</value>
<value xml:lang="it">Interruzione/Dettaglio</value>
<value xml:lang="ja">ãã¬ã¼ã¯ãã¦ã³/詳細</value>
+ <value xml:lang="nl">Break down/detail</value>
<value xml:lang="ro">Intrerupere/Detaliu</value>
<value xml:lang="ru">Ðоломка/ÐодÑобно</value>
<value xml:lang="th">à¸à¸²à¸£à¸§à¸´à¹à¸à¸£à¸²à¸°à¸«à¹/รายละà¹à¸à¸µà¸¢à¸</value>
@@ -85,6 +94,7 @@
<value xml:lang="fr">Simultanéité</value>
<value xml:lang="it">Concorrenza</value>
<value xml:lang="ja">å¤é度</value>
+ <value xml:lang="nl">Gelijktijdig/parallel</value>
<value xml:lang="ro">Concurenta</value>
<value xml:lang="ru">ÐонкÑÑенÑиÑ</value>
<value xml:lang="th">à¸à¸²à¸£à¹à¸à¸´à¸à¸à¸¶à¹à¸à¹à¸à¹à¸§à¸¥à¸²à¹à¸à¸µà¸¢à¸§à¸à¸±à¸</value>
@@ -98,6 +108,7 @@
<value xml:lang="fr">Dépendance</value>
<value xml:lang="it">Dipendenza</value>
<value xml:lang="ja">ä¾å度</value>
+ <value xml:lang="nl">Afhankelijkheid</value>
<value xml:lang="ro">Dependenta</value>
<value xml:lang="ru">ÐавиÑимоÑÑÑ</value>
<value xml:lang="th">สà¹à¸§à¸à¹à¸à¸´à¹à¸¡à¹à¸à¸´à¸¡</value>
@@ -111,6 +122,7 @@
<value xml:lang="fr">Phase</value>
<value xml:lang="it">Fase</value>
<value xml:lang="ja">ãã§ã¼ãº</value>
+ <value xml:lang="nl">Fase</value>
<value xml:lang="th">à¸à¸±à¹à¸à¸à¸à¸</value>
<value xml:lang="vi">Pha</value>
<value xml:lang="zh">é¶æ®µ</value>
@@ -122,6 +134,7 @@
<value xml:lang="fr">Priorité</value>
<value xml:lang="it">Precedenza</value>
<value xml:lang="ja">å
è¡åº¦</value>
+ <value xml:lang="nl">Voorloop</value>
<value xml:lang="ro">Precedenta</value>
<value xml:lang="ru">ÐÑеимÑÑеÑÑво</value>
<value xml:lang="th">Precedency</value>
@@ -135,6 +148,7 @@
<value xml:lang="fr">Tâche</value>
<value xml:lang="it">Compito</value>
<value xml:lang="ja">ã¿ã¹ã¯</value>
+ <value xml:lang="nl">Taak</value>
<value xml:lang="th">ภารà¸à¸´à¸</value>
<value xml:lang="vi">Tác vụ - Äầu viá»c</value>
<value xml:lang="zh">ä»»å¡</value>
@@ -146,6 +160,7 @@
<value xml:lang="it">Template di</value>
<value xml:lang="ja">ãã³ãã¬ã¼ã:</value>
<value xml:lang="ro">Template de</value>
+ <value xml:lang="nl">Template:</value>
<value xml:lang="ru">Шаблон</value>
<value xml:lang="th">à¸à¸à¸à¹à¸à¸¡à¹à¸à¸¥à¸</value>
<value xml:lang="vi">Biá»u mẫu dà nh cho</value>
@@ -157,6 +172,7 @@
<value xml:lang="fr">Assemblage</value>
<value xml:lang="it">Assemblaggio</value>
<value xml:lang="ja">çµç«ä¸</value>
+ <value xml:lang="nl">Assemblage</value>
<value xml:lang="ro">Asamblare</value>
<value xml:lang="ru">ÐонÑаж</value>
<value xml:lang="th">à¸à¸²à¸£à¸£à¸§à¸¡à¸à¸¥à¸¸à¹à¸¡</value>
@@ -169,6 +185,7 @@
<value xml:lang="fr">Fabrication</value>
<value xml:lang="it">Produzione</value>
<value xml:lang="ja">çç£ä¸</value>
+ <value xml:lang="nl">Fabricage</value>
<value xml:lang="ro">Productie</value>
<value xml:lang="ru">ÐÑоизводÑÑво</value>
<value xml:lang="th">à¸à¸²à¸£à¸à¸¥à¸´à¸</value>
@@ -194,6 +211,7 @@
<value xml:lang="fr">Déploiement</value>
<value xml:lang="it">Distribuzione</value>
<value xml:lang="ja">è¨ç½®</value>
+ <value xml:lang="nl">Installatie</value>
<value xml:lang="ro">Distributie</value>
<value xml:lang="ru">РазвеÑÑÑвание</value>
<value xml:lang="th">à¹à¸à¸£à¹à¸à¸£à¸°à¸à¸²à¸¢</value>
@@ -207,6 +225,7 @@
<value xml:lang="fr">Développement</value>
<value xml:lang="it">Sviluppo</value>
<value xml:lang="ja">éçº</value>
+ <value xml:lang="nl">Ontwikkeling</value>
<value xml:lang="ro">Dezvoltare</value>
<value xml:lang="ru">СовеÑÑенÑÑвование</value>
<value xml:lang="th">à¸à¸²à¸£à¸à¸±à¸à¸à¸²</value>
@@ -220,6 +239,7 @@
<value xml:lang="fr">Maintenance</value>
<value xml:lang="it">Manutenzione</value>
<value xml:lang="ja">ä¿å®</value>
+ <value xml:lang="nl">Onderhoud</value>
<value xml:lang="ro">Intretinere</value>
<value xml:lang="ru">ÐбÑлÑживание</value>
<value xml:lang="th">à¸à¸²à¸£à¸à¸³à¸£à¸¸à¸à¸£à¸±à¸à¸©à¸²</value>
@@ -233,6 +253,7 @@
<value xml:lang="fr">Réunion</value>
<value xml:lang="it">Incontro</value>
<value xml:lang="ja">ä¼è°</value>
+ <value xml:lang="nl">Bijeenkomst</value>
<value xml:lang="ro">Intalnire</value>
<value xml:lang="ru">ÐÑÑÑеÑа</value>
<value xml:lang="th">à¸à¸à¸à¸£à¸°à¸ªà¸±à¸à¸ªà¸£à¸£à¸à¹</value>
@@ -246,6 +267,7 @@
<value xml:lang="fr">Phase</value>
<value xml:lang="it">Fase</value>
<value xml:lang="ja">ãã§ã¼ãº</value>
+ <value xml:lang="nl">Fase</value>
<value xml:lang="ro">Faze</value>
<value xml:lang="ru">ÐÑап</value>
<value xml:lang="th">à¸à¸±à¹à¸à¸à¸à¸</value>
@@ -259,6 +281,7 @@
<value xml:lang="fr">Ordre de fabrication</value>
<value xml:lang="it">Ciclo di produzione</value>
<value xml:lang="ja">æ¬çªéç¨</value>
+ <value xml:lang="nl">Productierun</value>
<value xml:lang="ro">Ciclu Productie</value>
<value xml:lang="ru">ÐÑоизводÑÑвеннÑй пÑогон</value>
<value xml:lang="th">à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£à¸à¸¥à¸´à¸</value>
@@ -285,6 +308,7 @@
<value xml:lang="fr">Recherche</value>
<value xml:lang="it">Ricerca</value>
<value xml:lang="ja">ç 究</value>
+ <value xml:lang="nl">Onderzoek</value>
<value xml:lang="ro">Cautare</value>
<value xml:lang="ru">ÐÑÑледование</value>
<value xml:lang="th">à¸à¸²à¸à¸§à¸´à¸à¸±à¸¢</value>
@@ -298,6 +322,7 @@
<value xml:lang="fr">Support</value>
<value xml:lang="it">Supporto</value>
<value xml:lang="ja">ãµãã¼ã</value>
+ <value xml:lang="nl">Support/ondersteuning</value>
<value xml:lang="ro">Suport</value>
<value xml:lang="ru">ÐоддеÑжка</value>
<value xml:lang="th">สà¸à¸±à¸à¸ªà¸à¸¸à¸</value>
@@ -336,6 +361,7 @@
<value xml:lang="fr">Activité</value>
<value xml:lang="it">Attività impegno di lavoro</value>
<value xml:lang="ja">ã¯ã¼ã¯ããã¼ã®æ´»å</value>
+ <value xml:lang="nl">Activiteit</value>
<value xml:lang="ro">Activitati Sarcini de Lucru</value>
<value xml:lang="ru">ÐейÑÑвие Workflow</value>
<value xml:lang="th">à¸à¸±à¹à¸à¸à¸à¸à¸à¸´à¸à¸à¸£à¸£à¸¡</value>
@@ -348,6 +374,7 @@
<value xml:lang="fr">Utilisation d'immobilisation (location)</value>
<value xml:lang="it">Uso cespite (noleggio)</value>
<value xml:lang="ja">åºå®è³ç£ã®ä½¿ç¨(ã¬ã³ã¿ã«)</value>
+ <value xml:lang="nl">Gebruik productiemiddel</value>
<value xml:lang="ro">Folosire Mijloc Fix (inchiriat)</value>
<value xml:lang="ru">ÐÑполÑзование ÐС (аÑенда)</value>
<value xml:lang="th">à¸à¸²à¸£à¹à¸à¹à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸à¸à¸µà¹à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸ (à¸à¸²à¸£à¹à¸à¹à¸²)</value>
@@ -362,6 +389,7 @@
<value xml:lang="fr">Disponible</value>
<value xml:lang="it">Disponibile</value>
<value xml:lang="ja">å¯è½</value>
+ <value xml:lang="nl">Beschikbaar</value>
<value xml:lang="ro">Disponibil</value>
<value xml:lang="ru">ÐоÑÑÑпнÑй</value>
<value xml:lang="th">สามารà¸à¹à¸à¹à¸à¸£à¸°à¹à¸¢à¸à¸à¹à¹à¸à¹</value>
@@ -374,6 +402,7 @@
<value xml:lang="fr">Voyage professionnel</value>
<value xml:lang="it">Viaggio di lavoro</value>
<value xml:lang="ja">æ¥ååºå¼µ</value>
+ <value xml:lang="nl">Dienstreis</value>
<value xml:lang="vi">Du lá»ch thÆ°Æ¡ng mại</value>
<value xml:lang="zh">åå¡æ
è¡</value>
<value xml:lang="zh_TW">ååæ
è¡</value>
@@ -393,6 +422,7 @@
<value xml:lang="fr">Evènement</value>
<value xml:lang="it">Evento</value>
<value xml:lang="ja">ã¤ãã³ã</value>
+ <value xml:lang="nl">Event/gebeurtenis</value>
<value xml:lang="ro">Eveniment</value>
<value xml:lang="ru">СобÑÑие</value>
<value xml:lang="th">à¹à¸«à¸à¸¸à¸à¸²à¸£à¸à¹</value>
@@ -405,6 +435,7 @@
<value xml:lang="fr">Réunion</value>
<value xml:lang="it">Incontri</value>
<value xml:lang="ja">ä¼è°</value>
+ <value xml:lang="nl">Bijeenkomst</value>
<value xml:lang="vi">Cuá»c há»p</value>
<value xml:lang="zh">ä¼è®®</value>
<value xml:lang="zh_TW">æè°</value>
@@ -413,6 +444,7 @@
<value xml:lang="en">Milestone</value>
<value xml:lang="fr">Jalon</value>
<value xml:lang="ja">ãã¤ã«ã¹ãã¼ã³</value>
+ <value xml:lang="nl">Mijlpaal</value>
<value xml:lang="vi">Má»c thá»i gian</value>
<value xml:lang="zh">éç¨ç¢</value>
</property>
@@ -431,6 +463,7 @@
<value xml:lang="fr">Phase de projet</value>
<value xml:lang="it">Fase progetto</value>
<value xml:lang="ja">ããã¸ã§ã¯ããã§ã¼ãº</value>
+ <value xml:lang="nl">Fase</value>
<value xml:lang="ro">Faze Proiect</value>
<value xml:lang="ru">ÐÑап пÑоекÑа</value>
<value xml:lang="th">à¸à¸±à¹à¸à¸à¸à¸</value>
@@ -443,6 +476,7 @@
<value xml:lang="fr">Modèle de phase de projet</value>
<value xml:lang="it">Fase progetto template</value>
<value xml:lang="ja">ããã¸ã§ã¯ããã§ã¼ãºãã³ãã¬ã¼ã</value>
+ <value xml:lang="nl">Fase template</value>
<value xml:lang="vi">Mẫu pha dự án</value>
<value xml:lang="zh">项ç®é¶æ®µæ¨¡æ¿</value>
<value xml:lang="zh_TW">å°æ¡é段ç¯æ¬</value>
@@ -452,6 +486,7 @@
<value xml:lang="fr">En-tête d'ordre de fabrication</value>
<value xml:lang="it">Testata ciclo di produzione</value>
<value xml:lang="ja">æ¬çªéç¨ããã</value>
+ <value xml:lang="nl">Header productierun</value>
<value xml:lang="ro">Antet Cliclu Productie</value>
<value xml:lang="ru">Ðаголовок пÑоизв. пÑогона</value>
<value xml:lang="th">หัวà¸à¹à¸à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£à¸à¸²à¸£à¸à¸¥à¸´à¸</value>
@@ -464,6 +499,7 @@
<value xml:lang="fr">Tâche d'ordre de fabrication</value>
<value xml:lang="it">Compito ciclo di produzione</value>
<value xml:lang="ja">æ¬çªéç¨ã¿ã¹ã¯</value>
+ <value xml:lang="nl">Taak productierun</value>
<value xml:lang="ro">Tema Ciclu Productie</value>
<value xml:lang="ru">ÐадаÑа пÑоизв. пÑогона</value>
<value xml:lang="th">à¸à¸²à¸à¸à¸³à¹à¸à¸´à¸à¸à¸²à¸£à¸à¸²à¸£à¸à¸¥à¸´à¸</value>
@@ -477,6 +513,7 @@
<value xml:lang="fr">Programme</value>
<value xml:lang="it">Programma</value>
<value xml:lang="ja">ããã°ã©ã </value>
+ <value xml:lang="nl">Programma</value>
<value xml:lang="ro">Program</value>
<value xml:lang="ru">ÐÑогÑамма</value>
<value xml:lang="th">à¹à¸à¸£à¹à¸à¸£à¸¡</value>
@@ -520,6 +557,7 @@
<value xml:lang="fr">Routage</value>
<value xml:lang="it">Rotta</value>
<value xml:lang="ja">ã«ã¼ãã£ã³ã°</value>
+ <value xml:lang="nl">Schema (productie)</value>
<value xml:lang="ro">Ruta</value>
<value xml:lang="ru">ÐаÑÑÑÑÑизаÑиÑ</value>
<value xml:lang="th">Routing</value>
@@ -532,6 +570,7 @@
<value xml:lang="fr">Tâche de routage</value>
<value xml:lang="it">Compito rotta</value>
<value xml:lang="ja">ã¿ã¹ã¯ã®ã«ã¼ãã£ã³ã°</value>
+ <value xml:lang="nl">Taak (productie)</value>
<value xml:lang="ro">Tema Ruta</value>
<value xml:lang="ru">ÐадаÑа маÑÑÑÑÑизаÑии</value>
<value xml:lang="th">à¸à¸²à¸ Routing </value>
@@ -545,6 +584,7 @@
<value xml:lang="fr">Tâche</value>
<value xml:lang="it">Compito</value>
<value xml:lang="ja">ã¿ã¹ã¯</value>
+ <value xml:lang="nl">Taak</value>
<value xml:lang="ro">Tema</value>
<value xml:lang="ru">ÐадаÑа</value>
<value xml:lang="th">à¸à¸²à¸</value>
@@ -557,6 +597,7 @@
<value xml:lang="fr">Modèle de tâche de projet</value>
<value xml:lang="it">Compito progetto template</value>
<value xml:lang="ja">ããã¸ã§ã¯ãã¿ã¹ã¯ãã³ãã¬ã¼ã</value>
+ <value xml:lang="nl">Taak template</value>
<value xml:lang="vi">Biá»u mẫu công viá»c dá»± án</value>
<value xml:lang="zh">项ç®ä»»å¡æ¨¡æ¿</value>
<value xml:lang="zh_TW">å°æ¡ä»»åç¯æ¬</value>
@@ -597,6 +638,7 @@
<value xml:lang="fr">Humain</value>
<value xml:lang="it">Umano</value>
<value xml:lang="ja">人</value>
+ <value xml:lang="nl">Mens</value>
<value xml:lang="th">à¹à¸à¸µà¹à¸¢à¸§à¸à¸±à¸à¸à¸</value>
<value xml:lang="vi">NGƯá»I</value>
<value xml:lang="zh">人</value>
@@ -608,6 +650,7 @@
<value xml:lang="fr">Unité d'organisation</value>
<value xml:lang="it">Unità organizzativa</value>
<value xml:lang="ja">çµç¹ã®åä½</value>
+ <value xml:lang="nl">OU (organisatie-eenheid)</value>
<value xml:lang="th">à¹à¸à¸µà¹à¸¢à¸§à¸à¸±à¸à¸à¸à¸à¹à¸à¸£</value>
<value xml:lang="vi">ÄÆ¡n vá» tá» chức</value>
<value xml:lang="zh">ç»ç»æºæåä½</value>
@@ -619,6 +662,7 @@
<value xml:lang="fr">Ressource</value>
<value xml:lang="it">Risorsa</value>
<value xml:lang="ja">ãªã½ã¼ã¹</value>
+ <value xml:lang="nl">Resource</value>
<value xml:lang="th">à¹à¸«à¸¥à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥</value>
<value xml:lang="vi">TÃI NGUYÃN</value>
<value xml:lang="zh">èµæº</value>
@@ -641,6 +685,7 @@
<value xml:lang="fr">Rôle</value>
<value xml:lang="it">Ruolo</value>
<value xml:lang="ja">ãã¼ã«</value>
+ <value xml:lang="nl">Rol</value>
<value xml:lang="th">สà¸à¸²à¸à¸°</value>
<value xml:lang="vi">VAI TRÃ</value>
<value xml:lang="zh">è§è²</value>
Modified: ofbiz/branches/jackrabbit20120501/applications/workeffort/config/WorkEffortUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/applications/workeffort/config/WorkEffortUiLabels.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/applications/workeffort/config/WorkEffortUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20120501/applications/workeffort/config/WorkEffortUiLabels.xml Mon Dec 23 09:26:58 2013
@@ -368,7 +368,6 @@
<value xml:lang="fr">Code article</value>
<value xml:lang="it">Codice prodotto</value>
<value xml:lang="ja">製åID</value>
- <value xml:lang="nl">Produkt Id</value>
<value xml:lang="ro">Cod Produs</value>
<value xml:lang="th">รหัสสิà¸à¸à¹à¸²</value>
<value xml:lang="vi">Sản phẩm</value>
@@ -2819,10 +2818,7 @@
<value xml:lang="zh_TW">æåè¦ç¯</value>
</property>
<property key="WorkEffortICalendar">
- <value xml:lang="de">iCalendar</value>
<value xml:lang="en">iCalendar</value>
- <value xml:lang="it">iCalendar</value>
- <value xml:lang="ja">iCalendar</value>
<value xml:lang="vi">iCalendar (Xuất bản URL .ics)</value>
</property>
<property key="WorkEffortICalendarAdd">
@@ -2910,9 +2906,7 @@
<value xml:lang="zh_TW">è¡äºæææè
</value>
</property>
<property key="WorkEffortICalendarUrl">
- <value xml:lang="de">iCalendar Url</value>
<value xml:lang="en">iCalendar Url</value>
- <value xml:lang="ja">iCalendar URL</value>
<value xml:lang="vi">Liên kết URL iCalendar</value>
<value xml:lang="zh">iCalendarç½å</value>
<value xml:lang="zh_TW">iCal網å</value>
Modified: ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ContainerLoader.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ContainerLoader.java?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ContainerLoader.java (original)
+++ ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/container/ContainerLoader.java Mon Dec 23 09:26:58 2013
@@ -27,9 +27,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
import org.apache.log4j.Appender;
-
+import org.apache.log4j.Logger;
import org.ofbiz.base.component.ComponentConfig;
import org.ofbiz.base.start.Config;
import org.ofbiz.base.start.StartupException;
@@ -58,6 +57,7 @@ public class ContainerLoader implements
/**
* @see org.ofbiz.base.start.StartupLoader#load(Config, String[])
*/
+ @Override
public synchronized void load(Config config, String args[]) throws StartupException {
if (this.loaded || this.unloading) {
return;
@@ -223,6 +223,7 @@ public class ContainerLoader implements
/**
* @see org.ofbiz.base.start.StartupLoader#start()
*/
+ @Override
public synchronized void start() throws StartupException {
if (!this.loaded || this.unloading) {
throw new IllegalStateException("start() called on unloaded containers");
@@ -248,6 +249,7 @@ public class ContainerLoader implements
/**
* @see org.ofbiz.base.start.StartupLoader#unload()
*/
+ @Override
public void unload() throws StartupException {
if (!this.unloading) {
this.unloading = true;
@@ -268,6 +270,7 @@ public class ContainerLoader implements
Debug.logInfo("Stopped container " + container.getName(), module);
}
}
+ @SuppressWarnings("unchecked")
Enumeration<Appender> en = Logger.getRootLogger().getAllAppenders();
while (en.hasMoreElements()) {
Appender appender = en.nextElement();
Modified: ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/util/test/AssertTests.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/util/test/AssertTests.java?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/util/test/AssertTests.java (original)
+++ ofbiz/branches/jackrabbit20120501/framework/base/src/org/ofbiz/base/util/test/AssertTests.java Mon Dec 23 09:26:58 2013
@@ -35,7 +35,6 @@ public class AssertTests extends TestCas
super(name);
}
- @SuppressWarnings("unchecked")
public void testAssert(){
Object testObject = new Object();
Modified: ofbiz/branches/jackrabbit20120501/framework/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/build.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/framework/build.xml (original)
+++ ofbiz/branches/jackrabbit20120501/framework/build.xml Mon Dec 23 09:26:58 2013
@@ -19,12 +19,10 @@ under the License.
-->
<project name="OFBiz Framework Build" default="build" basedir=".">
- <import file="../macros.xml"/>
-
- <filelist id="framework-builds" dir="."
+ <filelist id="framework-builds" dir="framework"
files="start/build.xml,base/build.xml,sql/build.xml,
entity/build.xml,geronimo/build.xml,
- catalina/build.xml,jetty/build.xml,
+ catalina/build.xml,
security/build.xml,service/build.xml,entityext/build.xml,
bi/build.xml,minilang/build.xml,
webapp/build.xml,widget/build.xml,
@@ -32,154 +30,5 @@ under the License.
testtools/build.xml,
appserver/build.xml,webtools/build.xml,jcr/build.xml"/>
- <filelist id="test-builds" dir="." files="base/build.xml,sql/build.xml,entity/build.xml"/>
-
- <property name="memory.max.param" value="-Xmx384M"/>
-
- <!-- ================================================================== -->
- <!-- Initialization of all property settings -->
- <!-- ================================================================== -->
-
- <target name="ofbiz-init">
- <property environment="env"/>
- </target>
-
- <target name="dir-init" depends="ofbiz-init">
- <mkdir dir="../runtime"/>
- <mkdir dir="../runtime/output"/>
- <mkdir dir="../runtime/logs"/>
- <mkdir dir="../runtime/logs/test-results"/>
- <mkdir dir="../runtime/data"/>
- <mkdir dir="../runtime/data/derby"/>
-
- <condition property="isMac">
- <os family="mac"/>
- </condition>
- <antcall target="copy-derby-props" inheritall="true"/>
- </target>
-
- <target name="copy-derby-props" if="isMac">
- <copy file="../runtime/data/derby.properties" todir="../runtime/data/derby"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Removes all created files and directories -->
- <!-- ================================================================== -->
-
- <target name="refresh">
- <antcall target="clean-all"/>
- <antcall target="build"/>
- </target>
-
- <target name="clean-all">
- <antcall target="clean-data"/>
- <antcall target="clean-logs"/>
- <antcall target="clean-output"/>
- <antcall target="clean-xtra"/>
- <antcall target="clean-catalina"/>
- <antcall target="clean"/>
- </target>
-
- <target name="clean-data">
- <delete includeemptydirs="true" dir="../runtime/data/derby"/>
- <delete includeemptydirs="true" dir="../runtime/data/hsql"/>
- <delete verbose="on" includeemptydirs="true">
- <fileset dir="../runtime/data" includes="**/*">
- <exclude name="README"/>
- <exclude name="derby.properties"/>
- </fileset>
- </delete>
- </target>
-
- <target name="clean-logs">
- <delete verbose="on" dir="../runtime/logs/test-results"/>
- <delete dir="../runtime/logs/cobertura-report"/>
- <delete verbose="on">
- <fileset dir="../runtime/logs" includes="*">
- <exclude name="README"/>
- </fileset>
- </delete>
- </target>
-
- <target name="clean-output">
- <delete verbose="on">
- <fileset dir="." includes="../runtime/output/*"/>
- </delete>
- </target>
-
- <target name="clean-xtra">
- <delete verbose="on">
- <fileset dir="." includes="**/.nbattrs,**/*~,**/.#*,**/.DS_Store,**/*.rej,**/*.orig"/>
- </delete>
- </target>
-
- <target name="clean-catalina">
- <delete dir="../runtime/catalina/work"/>
- </target>
-
- <target name="clean-tempfiles">
- <delete verbose="on">
- <fileset dir="../runtime" includes="tempfiles/**/*"/>
- </delete>
- </target>
-
- <target name="tests">
- <subant target="tests">
- <filelist refid="test-builds"/>
- </subant>
- </target>
-
- <target name="clean">
- <iterate target="clean" filelist="framework-builds"/>
- <echo message="[clean] ========== Done Cleaning Framework =========="/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Build Components -->
- <!-- ================================================================== -->
-
- <target name="build" depends="dir-init">
- <echo message="[build] ========== Start Building Framework (Compile) =========="/>
-
- <!-- make sure the data and logs directories exist (they should exist, because they are in svn) -->
- <mkdir dir="../runtime/data"/>
- <mkdir dir="../runtime/logs"/>
-
- <iterate inheritall="false" filelist="framework-builds"/>
-
- <echo message="[build] ========== Done Building Framework (Compile) =========="/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Build JavaDocs -->
- <!-- ================================================================== -->
-
- <target name="docs">
- <echo message="[docs] ========== Start Building Framework (JavaDoc) =========="/>
-
- <iterate target="docs" filelist="framework-builds"/>
-
- <echo message="[docs] ========== Done Building Framework (JavaDocs) =========="/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Contrib Targets -->
- <!-- ================================================================== -->
-
- <target name="copy-contrib">
- <copy todir="${basedir}" overwrite="true" verbose="true">
- <fileset dir="${basedir}/contrib" excludes="contrib/**,**/*.class"/>
- </copy>
- </target>
-
- <target name="build-contrib" depends="copy-contrib,refresh"/>
-
- <!-- ================================================================== -->
- <!-- Script Targets -->
- <!-- ================================================================== -->
-
- <target name="scriptfix">
- <fixcrlf srcdir="${basedir}" eol="lf" eof="remove" includes="**/*.sh"/>
- <fixcrlf srcdir="${basedir}" eol="crlf" includes="**/*.bat"/>
- </target>
+ <filelist id="test-builds" dir="framework" files="base/build.xml,sql/build.xml,entity/build.xml"/>
</project>
Modified: ofbiz/branches/jackrabbit20120501/framework/common/config/CommonEntityLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/common/config/CommonEntityLabels.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/branches/jackrabbit20120501/framework/common/config/CommonEntityLabels.xml Mon Dec 23 09:26:58 2013
@@ -1129,17 +1129,12 @@
<value xml:lang="zh_TW">çµå°ç¶²å</value>
</property>
<property key="Enumeration.description.KOTT_OFBURL">
- <value xml:lang="de">OFBiz URL</value>
<value xml:lang="en">OFBiz URL</value>
<value xml:lang="es">URL OFBiz</value>
<value xml:lang="fr">URL (lien internet) au sein d'OFBiz</value>
<value xml:lang="it">URL OFBiz</value>
- <value xml:lang="ja">OFBiz URL</value>
<value xml:lang="pt">URL OFBiz</value>
<value xml:lang="ro">URL OFBiz</value>
- <value xml:lang="ru">OFBiz URL</value>
- <value xml:lang="th">OFBiz URL</value>
- <value xml:lang="vi">OFBiz URL</value>
<value xml:lang="zh">OFBizç½å</value>
<value xml:lang="zh_TW">OFBiz網å</value>
</property>