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 2009/12/19 07:30:59 UTC
svn commit: r892439 - in /ofbiz/branches/release09.04: ./
applications/party/config/PartyErrorUiLabels.xml
applications/product/script/org/ofbiz/product/product/ProductServices.xml
Author: jleroux
Date: Sat Dec 19 06:30:59 2009
New Revision: 892439
URL: http://svn.apache.org/viewvc?rev=892439&view=rev
Log:
"Applied fix from trunk for revision: 771477"
------------------------------------------------------------------------
r771477 | lektran | 2009-05-05 00:31:32 +0200 (mar. 05 mai 2009) | 1 ligne
Fix type warning
------------------------------------------------------------------------
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/applications/party/config/PartyErrorUiLabels.xml
ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/product/ProductServices.xml
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 19 06:30:59 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810
814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,771477,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810
809,810814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620
Modified: ofbiz/branches/release09.04/applications/party/config/PartyErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/config/PartyErrorUiLabels.xml?rev=892439&r1=892438&r2=892439&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/party/config/PartyErrorUiLabels.xml (original)
+++ ofbiz/branches/release09.04/applications/party/config/PartyErrorUiLabels.xml Sat Dec 19 06:30:59 2009
@@ -161,7 +161,7 @@
<value xml:lang="de">FEHLER: Kontaktinformationen konnten nicht geändert werden (Lesen Zweck Problem): ${errMessage}.</value>
<value xml:lang="en">ERROR: Could not change contact info (read purpose failure): ${errMessage}.</value>
<value xml:lang="es">Error: No se puede cambiar la información de contacto: ${errMessage}.</value>
- <value xml:lang="fr">ERREUR : Ne peut pas changer l'information de contact (échec à la lecture du but de contact) : $ {errMessage.</value>
+ <value xml:lang="fr">ERREUR : Ne peut pas changer l'information de contact (échec à la lecture du but de contact) : ${errMessage.</value>
<value xml:lang="it">ERRORE: Non è possibile cambiare informazioni contatto (errore di lettura): ${errMessage}.</value>
<value xml:lang="nl">Fout: Could not change contact info (read purpose failure): ${errMessage}.</value>
<value xml:lang="ro">EROARE: Nu este posibila schmbarea de informatii contact (eroare de citire): ${errMessage}.</value>
@@ -457,7 +457,7 @@
<value xml:lang="de">Akteur Rolle kann nicht erstellt werden (Lesefehler): ${errMessage}.</value>
<value xml:lang="en">Could not create party role (read failure): ${errMessage}.</value>
<value xml:lang="es">No se puede crear la relación(error de lectura): ${errMessage}</value>
- <value xml:lang="fr">Impossible de créer le rôle de l'acteur (erreur de lecture) : $ {errMessage}.</value>
+ <value xml:lang="fr">Impossible de créer le rôle de l'acteur (erreur de lecture) : ${errMessage}.</value>
<value xml:lang="it">Non è possibile creare ruolo soggetto (lettura fallita): ${errMessage}.</value>
<value xml:lang="nl">Could not create party role (read failure): ${errMessage}.</value>
<value xml:lang="ro">Nu este posibila crearea rolului Subiect (lectura falita): ${errMessage}.</value>
@@ -469,7 +469,7 @@
<value xml:lang="de">Akteur Beziehung kann nicht erstellt werden (Schreibfehler): ${errMessage}.</value>
<value xml:lang="en">Could not create party relationship (write failure): ${errMessage}.</value>
<value xml:lang="es">No se puede crear la relación(error de escritura): ${errMessage}</value>
- <value xml:lang="fr">Impossible de créer la relation à l'acteur (erreur d'écriture) : $ {errMessage}.</value>
+ <value xml:lang="fr">Impossible de créer la relation à l'acteur (erreur d'écriture) : ${errMessage}.</value>
<value xml:lang="it">Non è possibile creare il rapporto soggetto (scrittura fallita): ${errMessage}.</value>
<value xml:lang="nl">Could not create party relationship (write failure): ${errMessage}.</value>
<value xml:lang="ro">Nu este posibila crearea relationarii Subiect (scriere falita): ${errMessage}.</value>
@@ -493,7 +493,7 @@
<value xml:lang="de">Akteur Beziehung kann nicht aktualisiert werden (Lesefehler): ${errMessage}.</value>
<value xml:lang="en">Could not update party relation (read failure): ${errMessage}.</value>
<value xml:lang="es">No se puede actualizar las relaciones(error de lectura): ${errMessage}</value>
- <value xml:lang="fr">Impossible de mettre à jour la relation de l'acteur (erreur de lecture) : $ {errMessage}.</value>
+ <value xml:lang="fr">Impossible de mettre à jour la relation de l'acteur (erreur de lecture) : ${errMessage}.</value>
<value xml:lang="it">Non è possibile aggiornare il rapporto soggetto (lettura fallita): ${errMessage}.</value>
<value xml:lang="nl">Could not update party relation (read failure): ${errMessage}.</value>
<value xml:lang="ro">Nu este posibila Actualizarea relatiei Subiect (citare falita): ${errMessage}.</value>
@@ -505,7 +505,7 @@
<value xml:lang="de">Akteur Beziehung kann nicht aktualisiert werden (Schreibfehler): ${errMessage}.</value>
<value xml:lang="en">Could not update party relationship (write failure): ${errMessage}.</value>
<value xml:lang="es">No se puede actualizar las relaciones(error de escritura): ${errMessage}</value>
- <value xml:lang="fr">Impossible de mettre à jour la relation de l'acteur (erreur d'écriture) : $ {errMessage}.</value>
+ <value xml:lang="fr">Impossible de mettre à jour la relation de l'acteur (erreur d'écriture) : ${errMessage}.</value>
<value xml:lang="it">Non è possibile aggiornare il rapporto soggetto (scrittura fallita): ${errMessage}.</value>
<value xml:lang="nl">Could not update party relationship (write failure): ${errMessage}.</value>
<value xml:lang="ro">Nu este posibila Actualizarea relatiei Subiect (scriere falita): ${errMessage}.</value>
@@ -668,7 +668,8 @@
<value xml:lang="de">Akteur Entitäten können nicht geholt werden (Lesefehler): ${errMessage}.</value>
<value xml:lang="en">Cannot get party entities (read failure): ${errMessage}.</value>
<value xml:lang="es">No se pudo obtener la entidad participante: ${errMessage}</value>
- <value xml:lang="fr">Ne peut pas obtenir des entités d'acteur (erreur de lecture) : $ {errMessage}.</value>
+ <value xml:lang="fr">Impossible d'obtenir des entités d'acteur (erreur de lecture) : ${errMessage}.</value>
+ <value xml:lang="hi_IN">पारà¥à¤à¥ à¤à¤à¤¾à¤à¤¯à¤¾à¤ नहà¥à¤ मिलॠ(पà¥à¤¨à¥ मà¥à¤ à¤
सफल): ${errMessage}|</value>
<value xml:lang="it">Non possibile leggere l'entità Party (lettura fallita): ${errMessage}.</value>
<value xml:lang="nl">Cannot get party entities (read failure): ${errMessage}.</value>
<value xml:lang="ro">Nu este posibila citirea entitatii party entities (citerea falita): ${errMessage}.</value>
@@ -679,7 +680,7 @@
<property key="partyservices.could_not_add_affiliate_info_write">
<value xml:lang="en">Could not add affiliate info (write failure): ${errMessage}.</value>
<value xml:lang="es">No se pudo agregar información del afiliado: ${errMessage}</value>
- <value xml:lang="fr">Impossible d'ajouter l'information de filiale (erreur d'écriture) : $ {errMessage}.</value>
+ <value xml:lang="fr">Impossible d'ajouter l'information de filiale (erreur d'écriture) : ${errMessage}.</value>
<value xml:lang="it">Non è possibile aggiungere informazione affiliato (scrittura fallita): ${errMessage}.</value>
<value xml:lang="nl">Could not add affiliate info (write failure): ${errMessage}.</value>
<value xml:lang="ro">Nu este posibila adaugarea informatiilor afiliat (scriere falita): ${errMessage}.</value>
@@ -725,7 +726,7 @@
<property key="partyservices.could_not_update_affiliate_information_read">
<value xml:lang="en">Could not update affiliate information (read failure): ${errMessage}.</value>
<value xml:lang="es">No se pudo actualizar la información del afiliado: ${errMessage}</value>
- <value xml:lang="fr">Impossible de mettre à jour l'information de filiale (erreur de lecture) : $ {errMessage}.</value>
+ <value xml:lang="fr">Impossible de mettre à jour l'information de filiale (erreur de lecture) : ${errMessage}.</value>
<value xml:lang="it">Non è possibile aggiornare informazione affiliato (lettura fallita): ${errMessage}.</value>
<value xml:lang="nl">Could not update affiliate information (read failure): ${errMessage}.</value>
<value xml:lang="ro">Nu este posibila Actualizarea informaiilor afiliat (citare falita): ${errMessage}.</value>
@@ -736,7 +737,7 @@
<property key="partyservices.could_not_update_affiliate_information_write">
<value xml:lang="en">Could not update affiliate information (write failure): ${errMessage}.</value>
<value xml:lang="es">No se pudo actualizar la información del afiliado: ${errMessage}</value>
- <value xml:lang="fr">Impossible de mettre à jour l'information de filiale (erreur d'écriture) : $ {errMessage}.</value>
+ <value xml:lang="fr">Impossible de mettre à jour l'information de filiale (erreur d'écriture) : ${errMessage}.</value>
<value xml:lang="it">Non è possibile aggiornare informazione affiliato (scrittura fallita): ${errMessage}.</value>
<value xml:lang="nl">Could not update affiliate information (write failure): ${errMessage}.</value>
<value xml:lang="ro">Nu este posibila Actualizarea informatiilor afiliat (scriere falita): ${errMessage}.</value>
@@ -760,7 +761,7 @@
<value xml:lang="de">Kann Akteur oder Akteurgruppe nicht aktualisieren (Lesefehler): ${errMessage}.</value>
<value xml:lang="en">Could not update party or party group information (read failure): ${errMessage}.</value>
<value xml:lang="es">No se pudo actualizar la información del participante(error de lectura): ${errMessage}</value>
- <value xml:lang="fr">Impossible de mettre à jour l'information d'acteur ou de groupe d'acteur (erreur de lecture) : $ {errMessage}.</value>
+ <value xml:lang="fr">Impossible de mettre à jour l'information d'acteur ou de groupe d'acteur (erreur de lecture) : ${errMessage}.</value>
<value xml:lang="it">Non è possibile aggiornare informazione gruppo soggetto (lettura fallita): ${errMessage}.</value>
<value xml:lang="nl">Could not update party or party group information (read failure): ${errMessage}.</value>
<value xml:lang="ro">Nu este posibila Actualizarea informatiilor grup Subiect (citare falita): ${errMessage}.</value>
@@ -772,7 +773,7 @@
<value xml:lang="de">Kann Akteur oder Akteurgruppe nicht aktualisieren (Schreibfehler): ${errMessage}.</value>
<value xml:lang="en">Could not update party or party group information (write failure): ${errMessage}.</value>
<value xml:lang="es">No se pudo actualizar la información del participante(error de escritura): ${errMessage}</value>
- <value xml:lang="fr">Impossible de mettre à jour l'information d'acteur ou de groupe d'acteur (erreur d'écriture) : $ {errMessage}.</value>
+ <value xml:lang="fr">Impossible de mettre à jour l'information d'acteur ou de groupe d'acteur (erreur d'écriture) : ${errMessage}.</value>
<value xml:lang="it">Non è possibile aggiornare soggetto o informazione gruppo soggetto (scrittura fallita): ${errMessage}.</value>
<value xml:lang="nl">Could not update party or party group information (write failure): ${errMessage}.</value>
<value xml:lang="ro">Nu este posibila Actualizarea Subiectului sau a informatiilor grup Subiect (scriere falita): ${errMessage}.</value>
@@ -784,7 +785,7 @@
<value xml:lang="de">Datenbankfehler beim Hinzufügen der Akteurgruppe: ${errMessage}.</value>
<value xml:lang="en">Data source error occurred while adding party group: ${errMessage}.</value>
<value xml:lang="es">Error al crear grupo de participantes: ${errMessage}</value>
- <value xml:lang="fr">Une erreur de source de données s'est produite en ajoutant le groupe d'acteur : $ {errMessage}.</value>
+ <value xml:lang="fr">Une erreur de source de données s'est produite en ajoutant le groupe d'acteur : ${errMessage}.</value>
<value xml:lang="it">Errore successo sorgente dati durante l'aggiunta del gruppo soggetto: ${errMessage}.</value>
<value xml:lang="nl">Data source error occurred while adding party group: ${errMessage}.</value>
<value xml:lang="ro">EROARE Sursa de Dati in timpul adaugarii grupului Subiect: ${errMessage}.</value>
Modified: ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=892439&r1=892438&r2=892439&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/branches/release09.04/applications/product/script/org/ofbiz/product/product/ProductServices.xml Sat Dec 19 06:30:59 2009
@@ -52,7 +52,7 @@
<set field="newEntity.isVirtual" value="N"/>
</if-empty>
<if-empty field="newEntity.billOfMaterialLevel">
- <set field="newEntity.billOfMaterialLevel" value="0" type="Integer"/>
+ <set field="newEntity.billOfMaterialLevel" value="0" type="Long"/>
</if-empty>
<create-value value-field="newEntity"/>