svn commit: r965505 [2/3] - in /ofbiz/branches/jquery: ./ applications/accounting/servicedef/ applications/order/servicedef/ applications/order/webapp/ordermgr/entry/ applications/party/config/ applications/party/entitydef/ applications/party/webapp/pa...

Modified: ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml Mon Jul 19 14:39:07 2010
@@ -288,7 +288,7 @@
     </property>
     <property key="FormFieldTitle_deleteEmail">
         <value xml:lang="en">Delete email</value>
-        <value xml:lang="fr">Supprimer le courriel</value>
+        <value xml:lang="fr">Supprimer mél</value>
         <value xml:lang="hi_IN">ईमेल मिटायें</value>
         <value xml:lang="it">Cancella email</value>
         <value xml:lang="pt_BR">Excluir e-mail</value>
@@ -334,7 +334,7 @@
         <value xml:lang="de">E-Mail Adresse</value>
         <value xml:lang="en">Email Address</value>
         <value xml:lang="es">Correo electrónico</value>
-        <value xml:lang="fr">Adresse courriel</value>
+        <value xml:lang="fr">Mél</value>
         <value xml:lang="hi_IN">ईमेल पता</value>
         <value xml:lang="it">Indirizzo Email</value>
         <value xml:lang="nl">Emailadres</value>    
@@ -4363,7 +4363,7 @@
     <property key="PartyCreateAddEmail">
         <value xml:lang="en">Create/Add Email to Party</value>
         <value xml:lang="es">Crear/añadir correo electrónico para participante</value>
-        <value xml:lang="fr">Créer/AjouterCreate une adresse courriel  Ã  un acteur</value>
+        <value xml:lang="fr">Associer le mél à l'acteur</value>
         <value xml:lang="hi_IN">पार्टी का ईमेल बनाएँ/जोड़ें</value>
         <value xml:lang="it">Creare/Aggiungere email ad un soggetto</value>
         <value xml:lang="pt_BR">Criar/adicionar e-mail ao participante</value>
@@ -4873,7 +4873,7 @@
         <value xml:lang="de">E-Mail löschen</value>
         <value xml:lang="en">Delete Email</value>
         <value xml:lang="es">Borrar correo electrónico</value>
-        <value xml:lang="fr">Supprimer un(e adresse?) courriel</value>
+        <value xml:lang="fr">Supprimer le mél</value>
         <value xml:lang="hi_IN">ईमेल हटाएँ</value>
         <value xml:lang="it">Cancella email</value>
         <value xml:lang="nl">E-mail verwijderen</value>
@@ -4966,6 +4966,7 @@
     </property>
     <property key="PartyDraftEmails">
         <value xml:lang="en">Draft Emails</value>
+        <value xml:lang="fr">Mél Brouillon</value>
         <value xml:lang="hi_IN">ईमेल मसौदा(Draft)</value>
         <value xml:lang="it">Bozze emails</value>
         <value xml:lang="pt_BR">Rascunhos de e-mails</value>
@@ -5135,7 +5136,7 @@
         <value xml:lang="de">E-Mail Adresse</value>
         <value xml:lang="en">E-Mail Address</value>
         <value xml:lang="es">Dirección de E-Mail</value>
-        <value xml:lang="fr">Adresse courriel</value>
+        <value xml:lang="fr">Mél</value>
         <value xml:lang="hi_IN">ई-मेल पता</value>
         <value xml:lang="it">Indirizzo email</value>
         <value xml:lang="nl">Emailadres</value>
@@ -5149,7 +5150,7 @@
         <value xml:lang="de">E-Mail Adresse fehlt</value>
         <value xml:lang="en">Email Address is missing</value>
         <value xml:lang="es">Falta dirección e-mail</value>
-        <value xml:lang="fr">Adresse E-mail manquante</value>
+        <value xml:lang="fr">Mél manquant</value>
         <value xml:lang="hi_IN">ईमेल पता नही है</value>
         <value xml:lang="it">Indirizzo Email mancante</value>
         <value xml:lang="nl">E-mailadres ontbreekt</value>
@@ -5165,7 +5166,7 @@
         <value xml:lang="de">E-Mail Adresse fehlt</value>
         <value xml:lang="en">E-mail address is missing</value>
         <value xml:lang="es">Falta dirección de E-mail</value>
-        <value xml:lang="fr">Adresse courriel absente</value>
+        <value xml:lang="fr">Mél absent</value>
         <value xml:lang="hi_IN">ईमेल पता नही है</value>
         <value xml:lang="it">Indirizzo E-mail mancante</value>
         <value xml:lang="ja">E-mail address is missing</value>
@@ -5181,7 +5182,7 @@
         <value xml:lang="de">Die E-Mail Adresse kann nicht überprüft werden. Die E-Mail Adresse existiert nicht.</value>
         <value xml:lang="en">The Email Address cannot be verified.  This Email Address does not exists.</value>
         <value xml:lang="es">La dirección de correo electrónico no se puede verificar. Esta dirección no existe.</value>
-        <value xml:lang="fr">L'adresse courriel ne peut pas être vérifiée. Cette adresse courriel n'existe pas</value>
+        <value xml:lang="fr">L'adresse électronique ne peut pas être vérifiée. Cette adresse n'existe pas</value>
         <value xml:lang="hi_IN">ईमेल पता सत्यापित नहीं किया जा सकता है| यह ईमेल पता मौजूद नहीं है|</value>
         <value xml:lang="it">L'indirizzo email non può essere verificato. Questo indirizzo email non esiste.</value>
         <value xml:lang="nl">Verificatie e-mailadres mislukt. Dit e-mailadres bestaat niet.</value>
@@ -5194,7 +5195,7 @@
         <value xml:lang="de">E-Mail Adresse ist nicht im richtigen Format, sie muss dem folgenden Muster entsprechen: name@domain</value>
         <value xml:lang="en">E-mail address not formatted correctly, must be like: name@domain</value>
         <value xml:lang="es">Formato de E-mail incorrecto, ponga como: name@domain</value>
-        <value xml:lang="fr">Format de l'adresse courriel non correct, il doit être similaire à nom@domaine</value>
+        <value xml:lang="fr">Format de l'adresse électronique non correct, il doit être similaire à nom@domaine</value>
         <value xml:lang="hi_IN">ईमेल पता सही नही है, ऐसा होना चाहिये : नाम@डोमेन</value>
         <value xml:lang="it">Indirizzo e-mail non valido (formato: nome@dominio)</value>
         <value xml:lang="ja">E-mail address not formatted correctly, must be like: name@domain</value>
@@ -5210,7 +5211,7 @@
         <value xml:lang="de">E-Mail Adresse erfolgreich erstellt.</value>
         <value xml:lang="en">Email Address successfully created.</value>
         <value xml:lang="es">La dirección de correo electrónico se ha creado con éxito.</value>
-        <value xml:lang="fr">Adresse courriel créée.</value>
+        <value xml:lang="fr">Mél créé</value>
         <value xml:lang="hi_IN">ईमेल पता सफलतापूर्वक बनाया गया है|</value>
         <value xml:lang="it">Indirizzo email creato con successo.</value>
         <value xml:lang="nl">E-mailadres succesvol aangemaakt.</value>
@@ -5223,7 +5224,7 @@
         <value xml:lang="de">E-Mail Adresse erfolgreich aktualisiert.</value>
         <value xml:lang="en">Email Address successfully updated.</value>
         <value xml:lang="es">La dirección de correo electrónico se ha actualizado con éxito.</value>
-        <value xml:lang="fr">Adresse courriel mise à jour.</value>
+        <value xml:lang="fr">Mél mis à jour.</value>
         <value xml:lang="hi_IN">ईमेल पता सफलतापूर्वक नवीनीकृत हो गया है|</value>
         <value xml:lang="it">Indirizzo email aggiornato con successo.</value>
         <value xml:lang="nl">E-mailadres succesvol aangepast.</value>
@@ -5236,7 +5237,7 @@
         <value xml:lang="de">Die E-Mail Adresse Verifikation ist abgelaufen.</value>
         <value xml:lang="en">The Email Address Verification has been expired.</value>
         <value xml:lang="es">La validación de la dirección de correo electrónico ha caducado.</value>
-        <value xml:lang="fr">La vérification de cette adresse courriel a expirée</value>
+        <value xml:lang="fr">La vérification de l'adresse électronique a expirée</value>
         <value xml:lang="hi_IN">ईमेल पता सत्यापन की समय सीमा समाप्त हो गई है|</value>
         <value xml:lang="it">La verifica dell'indirizzo email è scaduta.</value>
         <value xml:lang="nl">De verificatie van het e-mailadres is verlopen.</value>
@@ -5249,7 +5250,7 @@
         <value xml:lang="de">E-Mail Adressen</value>
         <value xml:lang="en">Email Addresses</value>
         <value xml:lang="es">Direcciones de Email</value>
-        <value xml:lang="fr">Adresses courriel</value>
+        <value xml:lang="fr">Mél</value>
         <value xml:lang="hi_IN">ईमेल पता</value>
         <value xml:lang="it">Indirizzi email</value>
         <value xml:lang="ja">Email Addresses</value>
@@ -5274,6 +5275,7 @@
     </property>
     <property key="PartyEmailMessage">
         <value xml:lang="en">Allocate this message to a existing or new party and add an email address</value>
+        <value xml:lang="fr">Associer ce message a un acteur présent ou nouveau puis lui ajouter l'adresse électronique</value>
         <value xml:lang="hi_IN">इस संदेश को एक मौजूदा या नई पार्टी को आवंटित करे और एक ईमेल पता जोड़ें|</value>
         <value xml:lang="it">Allocare questo messagio ad un soggetto esistente o nuovo e aggiungere un indirizzo email</value>
         <value xml:lang="pt_BR">Alocar esta mensagem a um participante já existente ou crie um novo e adicione um endereço de e-mail</value>
@@ -5281,7 +5283,7 @@
     </property>
     <property key="PartyEmailTo">
         <value xml:lang="en">Email to</value>
-        <value xml:lang="fr">Courriel dest.</value>
+        <value xml:lang="fr">Mél dest.</value>
         <value xml:lang="hi_IN">ईमेल करे</value>
         <value xml:lang="it">Email a</value>
         <value xml:lang="pt_BR">Destinatário do e-mail</value>
@@ -5289,7 +5291,7 @@
     </property>
     <property key="PartyEmailsFromUnknownOrigin">
         <value xml:lang="en">Emails from UN-known origin</value>
-        <value xml:lang="fr">Courriel issue d'une origine inconnue</value>
+        <value xml:lang="fr">Mél issu d'une origine inconnue</value>
         <value xml:lang="hi_IN">अज्ञात मूल से ईमेल</value>
         <value xml:lang="it">Emails da origini conosciuta</value>
         <value xml:lang="pt_BR">E-mails com remetente desconhecido</value>
@@ -5617,7 +5619,7 @@
         <value xml:lang="de">Von E-Mail Adresse</value>
         <value xml:lang="en">From Email Address</value>
         <value xml:lang="es">De (e-mail)</value>
-        <value xml:lang="fr">Depuis adresse courriel</value>
+        <value xml:lang="fr">Depuis mél</value>
         <value xml:lang="hi_IN">ईमेल पते से</value>
         <value xml:lang="it">Da Indirizzo Email</value>
         <value xml:lang="nl">Van e-mailadres</value>
@@ -6258,6 +6260,9 @@
         <value xml:lang="th">เชื่อมโยงกลุ่มผู้ใช้</value>
         <value xml:lang="zh">链接会员</value>
     </property>
+    <property key="PartyLinkExplanation">
+        <value xml:lang="en">This will set the status of 'partyId' to disabled however will link it to 'partyTo' in the party Attributes</value>
+    </property>
     <property key="PartyLinkMessage1">
         <value xml:lang="de">WARNUNG: Dies kann nicht rückgängig gemacht werden. Bestätigen Sie bitte, dass Sie die beiden unten aufgeführten Akteure verknüpfen möchten. </value>
         <value xml:lang="en">WARNING: This cannot be un-done, confirm you wish to link the two party records listed below.</value>
@@ -7715,6 +7720,7 @@
     </property>
     <property key="PartyNotificationMailVerification">
         <value xml:lang="en">Email Address Verification</value>
+        <value xml:lang="fr"> Verification Mél</value>
         <value xml:lang="hi_IN">ईमेल पता सत्यापन</value>
         <value xml:lang="it">Verifica indirizzo Email</value>
         <value xml:lang="pt_BR">Verificação de endereço de e-mail</value>
@@ -7817,6 +7823,7 @@
     </property>
     <property key="PartyOriginEmailNotKnown">
         <value xml:lang="en">Origin Email address not known!</value>
+        <value xml:lang="fr">Origine du mél inconnue</value>
         <value xml:lang="hi_IN">उत्पत्ति ईमेल पता अज्ञात!</value>
         <value xml:lang="it">Indirizzo origine email address not conosciuto!</value>
         <value xml:lang="pt_BR">Endereço do e-mail de origem desconhecido</value>
@@ -8936,7 +8943,7 @@
         <value xml:lang="de">Sie werden ein Passwort per email erhalten, wenn Ihr neues Konto freigegeben wird</value>
         <value xml:lang="en">You will receive a password by email when your new account is approved</value>
         <value xml:lang="es">Recibirá la contraseña por email cuando la nueva cuenta sea aprobada</value>
-        <value xml:lang="fr">Vous recevrez votre mot de passe par courriel quand votre compte sera validé</value>
+        <value xml:lang="fr">Vous recevrez votre mot de passe par mél quand votre compte sera validé</value>
         <value xml:lang="hi_IN">जान्च के बाद आपको नया पासकोड ईमेल से दिया जाएगा</value>
         <value xml:lang="it">Riceverai una password per email quando la tua nuova utenza sarà approvata</value>
         <value xml:lang="ja">You will receive a password by email when your new account is approved</value>
@@ -10217,7 +10224,7 @@
         <value xml:lang="de">Zur E-Mail Adresse</value>
         <value xml:lang="en">To Email Address</value>
         <value xml:lang="es">Para (e-mail)</value>
-        <value xml:lang="fr">A l'adresse courriel</value>
+        <value xml:lang="fr">Vers mél</value>
         <value xml:lang="hi_IN">ईमेल पते को</value>
         <value xml:lang="it">A Indirizzo Email</value>
         <value xml:lang="nl">Naar e-mailadres</value>

Modified: ofbiz/branches/jquery/applications/party/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/entitydef/entitymodel.xml?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/jquery/applications/party/entitydef/entitymodel.xml Mon Jul 19 14:39:07 2010
@@ -2344,6 +2344,7 @@ under the License.
       <alias entity-alias="PTY" name="partyId"/>
       <alias entity-alias="PTY" name="partyTypeId"/>
       <alias entity-alias="PTY" name="description"/>
+      <alias entity-alias="PTY" name="statusId"/>
       <alias entity-alias="PER" name="firstName"/>
       <alias entity-alias="PER" name="middleName"/>
       <alias entity-alias="PER" name="lastName"/>

Modified: ofbiz/branches/jquery/applications/party/webapp/partymgr/party/findparty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/webapp/partymgr/party/findparty.ftl?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/webapp/partymgr/party/findparty.ftl (original)
+++ ofbiz/branches/jquery/applications/party/webapp/partymgr/party/findparty.ftl Mon Jul 19 14:39:07 2010
@@ -29,38 +29,38 @@ under the License.
 </#if>
 <h1>${uiLabelMap.PartyFindParties}</h1>
 <#if (parameters.firstName?has_content || parameters.lastName?has_content)>
-    <#assign createUrl = "editperson?create_new=Y&amp;lastName=${parameters.lastName?if_exists}&amp;firstName=${parameters.firstName?if_exists}"/>
+  <#assign createUrl = "editperson?create_new=Y&amp;lastName=${parameters.lastName?if_exists}&amp;firstName=${parameters.firstName?if_exists}"/>
 <#elseif (parameters.groupName?has_content)>
-    <#assign createUrl = "editpartygroup?create_new=Y&amp;groupName=${parameters.groupName?if_exists}"/>
+  <#assign createUrl = "editpartygroup?create_new=Y&amp;groupName=${parameters.groupName?if_exists}"/>
 <#else>
-    <#assign createUrl = "createnew"/>
+  <#assign createUrl = "createnew"/>
 </#if>
 <div class="button-bar"><a href="<@ofbizUrl>${createUrl}</@ofbizUrl>" class="buttontext create">${uiLabelMap.CommonCreateNew}</a></div>
 <div class="screenlet">
   <div class="screenlet-title-bar">
-    <#if partyList?has_content>
-      <ul>
-        <#if hideFields == "Y">
-          <li class="collapsed"><a href="<@ofbizUrl>findparty?hideFields=N${paramList}</@ofbizUrl>" title="${uiLabelMap.CommonShowLookupFields}">&nbsp;</a></li>
-        <#else>
-          <li class="expanded"><a href="<@ofbizUrl>findparty?hideFields=Y${paramList}</@ofbizUrl>" title="${uiLabelMap.CommonHideFields}">&nbsp;</a></li>
-        </#if>
-        <#if (partyListSize > 0)>
-          <#if (partyListSize > highIndex)>
-            <li><a class="nav-next" href="<@ofbizUrl>findparty?VIEW_SIZE=${viewSize}&amp;VIEW_INDEX=${viewIndex+1}&amp;hideFields=${hideFields}${paramList}</@ofbizUrl>">${uiLabelMap.CommonNext}</a></li>
-          <#else>
-            <li class="disabled">${uiLabelMap.CommonNext}</li>
-          </#if>
-          <li>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${partyListSize}</li>
-          <#if (viewIndex > 0)>
-            <li><a class="nav-previous" href="<@ofbizUrl>findparty?VIEW_SIZE=${viewSize}&amp;VIEW_INDEX=${viewIndex-1}&amp;hideFields=${hideFields}${paramList}</@ofbizUrl>">${uiLabelMap.CommonPrevious}</a></li>
-          <#else>
-            <li class="disabled">${uiLabelMap.CommonPrevious}</li>
-          </#if>
-        </#if>
-      </ul>
-      <br class="clear"/>
+<#if partyList?has_content>
+    <ul>
+  <#if hideFields == "Y">
+      <li class="collapsed"><a href="<@ofbizUrl>findparty?hideFields=N${paramList}</@ofbizUrl>" title="${uiLabelMap.CommonShowLookupFields}">&nbsp;</a></li>
+  <#else>
+      <li class="expanded"><a href="<@ofbizUrl>findparty?hideFields=Y${paramList}</@ofbizUrl>" title="${uiLabelMap.CommonHideFields}">&nbsp;</a></li>
+  </#if>
+  <#if (partyListSize > 0)>
+    <#if (partyListSize > highIndex)>
+      <li><a class="nav-next" href="<@ofbizUrl>findparty?VIEW_SIZE=${viewSize}&amp;VIEW_INDEX=${viewIndex+1}&amp;hideFields=${hideFields}${paramList}</@ofbizUrl>">${uiLabelMap.CommonNext}</a></li>
+    <#else>
+      <li class="disabled">${uiLabelMap.CommonNext}</li>
+    </#if>
+      <li>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${partyListSize}</li>
+    <#if (viewIndex > 0)>
+      <li><a class="nav-previous" href="<@ofbizUrl>findparty?VIEW_SIZE=${viewSize}&amp;VIEW_INDEX=${viewIndex-1}&amp;hideFields=${hideFields}${paramList}</@ofbizUrl>">${uiLabelMap.CommonPrevious}</a></li>
+    <#else>
+      <li class="disabled">${uiLabelMap.CommonPrevious}</li>
     </#if>
+  </#if>
+    </ul>
+    <br class="clear"/>
+</#if>
   </div>
   <div class="screenlet-body">
     <div id="findPartyParameters" <#if hideFields != "N"> style="display:none" </#if> >
@@ -107,14 +107,14 @@ under the License.
             <td class="label">${uiLabelMap.PartyRoleType}</td>
             <td>
               <select name="roleTypeId">
-                <#if currentRole?has_content>
-                  <option value="${currentRole.roleTypeId}">${currentRole.get("description",locale)}</option>
-                  <option value="${currentRole.roleTypeId}">---</option>
-                </#if>
+<#if currentRole?has_content>
+                <option value="${currentRole.roleTypeId}">${currentRole.get("description",locale)}</option>
+                <option value="${currentRole.roleTypeId}">---</option>
+</#if>
                 <option value="ANY">${uiLabelMap.CommonAnyRoleType}</option>
-                <#list roleTypes as roleType>
-                  <option value="${roleType.roleTypeId}">${roleType.get("description",locale)}</option>
-                </#list>
+<#list roleTypes as roleType>
+                <option value="${roleType.roleTypeId}">${roleType.get("description",locale)}</option>
+</#list>
               </select>
             </td>
           </tr>
@@ -122,14 +122,14 @@ under the License.
             <td class="label">${uiLabelMap.PartyType}</td>
             <td>
               <select name="partyTypeId">
-               <#if currentPartyType?has_content>
-                  <option value="${currentPartyType.partyTypeId}">${currentPartyType.get("description",locale)}</option>
-                  <option value="${currentPartyType.partyTypeId}">---</option>
-                </#if>
+<#if currentPartyType?has_content>
+                <option value="${currentPartyType.partyTypeId}">${currentPartyType.get("description",locale)}</option>
+                <option value="${currentPartyType.partyTypeId}">---</option>
+</#if>
                 <option value="ANY">${uiLabelMap.CommonAny}</option>
-                <#list partyTypes as partyType>
-                  <option value="${partyType.partyTypeId}">${partyType.get("description",locale)}</option>
-                </#list>
+<#list partyTypes as partyType>
+                <option value="${partyType.partyTypeId}">${partyType.get("description",locale)}</option>
+</#list>
               </select>
             </td>
           </tr>
@@ -145,60 +145,60 @@ under the License.
             <td class="label">${uiLabelMap.ProductSoftIdentifier}</td>
             <td><input type="text" name="softIdentifier" value="${parameters.softIdentifier?if_exists}"/></td>
           </tr>
-          <#if extInfo == "P">
-            <tr><td colspan="3"><hr /></td></tr>
-            <tr>
-              <td class="label">${uiLabelMap.CommonAddress1}</td>
-              <td><input type="text" name="address1" value="${parameters.address1?if_exists}"/></td>
-            </tr>
-            <tr>
-              <td class="label">${uiLabelMap.CommonAddress2}</td>
-              <td><input type="text" name="address2" value="${parameters.address2?if_exists}"/></td>
-            </tr>
-            <tr>
-              <td class="label">${uiLabelMap.CommonCity}</td>
-              <td><input type="text" name="city" value="${parameters.city?if_exists}"/></td>
-            </tr>
-            <tr>
-              <td class="label">${uiLabelMap.CommonStateProvince}</td>
-              <td>
-                <select name="stateProvinceGeoId">
-                  <#if currentStateGeo?has_content>
-                    <option value="${currentStateGeo.geoId}">${currentStateGeo.geoName?default(currentStateGeo.geoId)}</option>
-                    <option value="${currentStateGeo.geoId}">---</option>
-                  </#if>
-                  <option value="ANY">${uiLabelMap.CommonAnyStateProvince}</option>
-                  ${screens.render("component://common/widget/CommonScreens.xml#states")}
-                </select>
-              </td>
-            </tr>
-            <tr>
-              <td class="label">${uiLabelMap.PartyPostalCode}</td>
-              <td><input type="text" name="postalCode" value="${parameters.postalCode?if_exists}"/></td>
-            </tr>
-          </#if>
-          <#if extInfo == "T">
-            <tr><td colspan="3"><hr /></td></tr>
-            <tr>
-              <td class="label">${uiLabelMap.PartyCountryCode}</td>
-              <td><input type="text" name="countryCode" value="${parameters.countryCode?if_exists}"/></td>
-            </tr>
-            <tr>
-              <td class="label">${uiLabelMap.PartyAreaCode}</td>
-              <td><input type="text" name="areaCode" value="${parameters.areaCode?if_exists}"/></td>
-            </tr>
-            <tr>
-              <td class="label">${uiLabelMap.PartyContactNumber}</td>
-              <td><input type="text" name="contactNumber" value="${parameters.contactNumber?if_exists}"/></td>
-            </tr>
-          </#if>
-          <#if extInfo == "O">
-            <tr><td colspan="3"><hr /></td></tr>
-            <tr>
-              <td class="label">${uiLabelMap.PartyContactInformation}</td>
-              <td><input type="text" name="infoString" value="${parameters.infoString?if_exists}"/></td>
-            </tr>
-          </#if>
+<#if extInfo == "P">
+          <tr><td colspan="3"><hr /></td></tr>
+          <tr>
+            <td class="label">${uiLabelMap.CommonAddress1}</td>
+            <td><input type="text" name="address1" value="${parameters.address1?if_exists}"/></td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.CommonAddress2}</td>
+            <td><input type="text" name="address2" value="${parameters.address2?if_exists}"/></td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.CommonCity}</td>
+            <td><input type="text" name="city" value="${parameters.city?if_exists}"/></td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.CommonStateProvince}</td>
+            <td>
+              <select name="stateProvinceGeoId">
+  <#if currentStateGeo?has_content>
+                <option value="${currentStateGeo.geoId}">${currentStateGeo.geoName?default(currentStateGeo.geoId)}</option>
+                <option value="${currentStateGeo.geoId}">---</option>
+  </#if>
+                <option value="ANY">${uiLabelMap.CommonAnyStateProvince}</option>
+                ${screens.render("component://common/widget/CommonScreens.xml#states")}
+              </select>
+            </td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.PartyPostalCode}</td>
+            <td><input type="text" name="postalCode" value="${parameters.postalCode?if_exists}"/></td>
+          </tr>
+</#if>
+<#if extInfo == "T">
+          <tr><td colspan="3"><hr /></td></tr>
+          <tr>
+            <td class="label">${uiLabelMap.PartyCountryCode}</td>
+            <td><input type="text" name="countryCode" value="${parameters.countryCode?if_exists}"/></td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.PartyAreaCode}</td>
+            <td><input type="text" name="areaCode" value="${parameters.areaCode?if_exists}"/></td>
+          </tr>
+          <tr>
+            <td class="label">${uiLabelMap.PartyContactNumber}</td>
+            <td><input type="text" name="contactNumber" value="${parameters.contactNumber?if_exists}"/></td>
+          </tr>
+</#if>
+<#if extInfo == "O">
+          <tr><td colspan="3"><hr /></td></tr>
+          <tr>
+            <td class="label">${uiLabelMap.PartyContactInformation}</td>
+            <td><input type="text" name="infoString" value="${parameters.infoString?if_exists}"/></td>
+          </tr>
+</#if>
           <tr>
             <td>&nbsp;</td>
             <td>
@@ -212,151 +212,151 @@ under the License.
       document.lookupparty.partyId.focus();
     </script>
 
-  <#if partyList?exists>
-    <#if hideFields != "Y">
-      <hr />
-    </#if>
+<#if partyList?exists>
+  <#if hideFields != "Y">
+    <hr />
+  </#if>
     <div id="findPartyResults">
       <h2>${uiLabelMap.CommonSearchResults}</h2>
     </div>
-    <#if partyList?has_content>
-      <table class="basic-table hover-bar" cellspacing="0">
-        <tr class="header-row-2">
-          <td>${uiLabelMap.PartyPartyId}</td>
-          <td>${uiLabelMap.PartyUserLogin}</td>
-          <td>${uiLabelMap.PartyName}</td>
-          <#if extInfo?default("") == "P" >
-            <td>${uiLabelMap.PartyCity}</td>
-          </#if>
-          <#if extInfo?default("") == "P">
-            <td>${uiLabelMap.PartyPostalCode}</td>
-          </#if>
-          <#if extInfo?default("") == "T">
-            <td>${uiLabelMap.PartyAreaCode}</td>
-          </#if>
-          <#if inventoryItemId?default("") != "">
-            <td>${uiLabelMap.ProductInventoryItemId}</td>
-          </#if>
-          <#if serialNumber?default("") != "">
-            <td>${uiLabelMap.ProductSerialNumber}</td>
-          </#if>
-          <#if softIdentifier?default("") != "">
-            <td>${uiLabelMap.ProductSoftIdentifier}</td>
+  <#if partyList?has_content>
+    <table class="basic-table hover-bar" cellspacing="0">
+      <tr class="header-row-2">
+        <td>${uiLabelMap.PartyPartyId}</td>
+        <td>${uiLabelMap.PartyUserLogin}</td>
+        <td>${uiLabelMap.PartyName}</td>
+    <#if extInfo?default("") == "P" >
+        <td>${uiLabelMap.PartyCity}</td>
+    </#if>
+    <#if extInfo?default("") == "P">
+        <td>${uiLabelMap.PartyPostalCode}</td>
+    </#if>
+    <#if extInfo?default("") == "T">
+        <td>${uiLabelMap.PartyAreaCode}</td>
+    </#if>
+    <#if inventoryItemId?default("") != "">
+        <td>${uiLabelMap.ProductInventoryItemId}</td>
+    </#if>
+    <#if serialNumber?default("") != "">
+        <td>${uiLabelMap.ProductSerialNumber}</td>
+    </#if>
+    <#if softIdentifier?default("") != "">
+        <td>${uiLabelMap.ProductSoftIdentifier}</td>
+    </#if>
+        <td>${uiLabelMap.PartyRelatedCompany}</td>
+        <td>${uiLabelMap.PartyType}</td>
+        <td>${uiLabelMap.PartyMainRole}</td>
+        <td>&nbsp;</td>
+      </tr>
+    <#assign alt_row = false>
+    <#assign rowCount = 0>
+    <#list partyList as partyRow>
+      <#assign partyType = partyRow.getRelatedOne("PartyType")?if_exists>
+      <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
+        <td><a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyRow.partyId}</a></td>
+        <td>
+      <#if partyRow.containsKey("userLoginId")>
+          ${partyRow.userLoginId?default("N/A")}
+      <#else>
+        <#assign userLogins = partyRow.getRelated("UserLogin")>
+        <#if (userLogins.size() > 0)>
+          <#if (userLogins.size() > 1)>
+          (${uiLabelMap.CommonMany})
+          <#else>
+            <#assign userLogin = userLogins.get(0)>
+          ${userLogin.userLoginId}
           </#if>
-          <td>${uiLabelMap.PartyRelatedCompany}</td>
-          <td>${uiLabelMap.PartyType}</td>
-          <td>${uiLabelMap.PartyMainRole}</td>
-          <td>&nbsp;</td>
-        </tr>
-        <#assign alt_row = false>
-        <#assign rowCount = 0>
-        <#list partyList as partyRow>
-          <#assign partyType = partyRow.getRelatedOne("PartyType")?if_exists>
-          <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
-            <td><a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyRow.partyId}</a></td>
-            <td>
-              <#if partyRow.containsKey("userLoginId")>
-                ${partyRow.userLoginId?default("N/A")}
-              <#else>
-                <#assign userLogins = partyRow.getRelated("UserLogin")>
-                <#if (userLogins.size() > 0)>
-                  <#if (userLogins.size() > 1)>
-                    (${uiLabelMap.CommonMany})
-                  <#else>
-                  <#assign userLogin = userLogins.get(0)>
-                    ${userLogin.userLoginId}
-                  </#if>
-                <#else>
-                  (${uiLabelMap.CommonNone})
-                </#if>
-              </#if>
-            </td>
-            <td>
-              <#if partyRow.getModelEntity().isField("lastName") && lastName?has_content>
-                ${partyRow.lastName}<#if partyRow.firstName?has_content>, ${partyRow.firstName}</#if>
-              <#elseif partyRow.getModelEntity().isField("groupName") && partyRow.groupName?has_content>
-                ${partyRow.groupName}
-              <#else>
-                <#assign partyName = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(partyRow, true)>
-                <#if partyName?has_content>
-                  ${partyName}
-                <#else>
-                  (${uiLabelMap.PartyNoNameFound})
-                </#if>
+        <#else>
+          (${uiLabelMap.CommonNone})
+        </#if>
+      </#if>
+        </td>
+        <td>
+      <#if partyRow.getModelEntity().isField("lastName") && lastName?has_content>
+          ${partyRow.lastName}<#if partyRow.firstName?has_content>, ${partyRow.firstName}</#if>
+      <#elseif partyRow.getModelEntity().isField("groupName") && partyRow.groupName?has_content>
+          ${partyRow.groupName}
+      <#else>
+        <#assign partyName = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(partyRow, true)>
+        <#if partyName?has_content>
+          ${partyName}
+        <#else>
+          (${uiLabelMap.PartyNoNameFound})
+        </#if>
+      </#if>
+        </td>
+      <#if extInfo?default("") == "T">
+        <td>${partyRow.areaCode?if_exists}</td>
+      </#if>
+      <#if extInfo?default("") == "P" >
+        <td>${partyRow.city?if_exists}, ${partyRow.stateProvinceGeoId?if_exists}</td>
+      </#if>
+      <#if extInfo?default("") == "P">
+        <td>${partyRow.postalCode?if_exists}</td>
+      </#if>
+      <#if inventoryItemId?default("") != "">
+        <td>${partyRow.inventoryItemId?if_exists}</td>
+      </#if>
+      <#if serialNumber?default("") != "">
+        <td>${partyRow.serialNumber?if_exists}</td>
+      </#if>
+      <#if softIdentifier?default("") != "">
+        <td>${partyRow.softIdentifier?if_exists}</td>
+      </#if>
+      <#if partyType?exists>
+        <td>
+        <#if partyType.partyTypeId?has_content && partyType.partyTypeId=="PERSON">
+          <#assign partyRelateCom = delegator.findByAnd("PartyRelationship", {"partyIdTo", partyRow.partyId,"roleTypeIdFrom","ACCOUNT","roleTypeIdTo","CONTACT"})>
+          <#if partyRelateCom?has_content>
+            <#list partyRelateCom as partyRelationship>
+              <#if partyRelationship.partyIdFrom?has_content>
+                <#assign companyName=Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, partyRelationship.partyIdFrom, true)>
+          ${companyName?if_exists}
               </#if>
-            </td>
-            <#if extInfo?default("") == "T">
-              <td>${partyRow.areaCode?if_exists}</td>
-            </#if>
-            <#if extInfo?default("") == "P" >
-               <td>${partyRow.city?if_exists}, ${partyRow.stateProvinceGeoId?if_exists}</td>
-            </#if>
-            <#if extInfo?default("") == "P">
-              <td>${partyRow.postalCode?if_exists}</td>
-            </#if>
-            <#if inventoryItemId?default("") != "">
-              <td>${partyRow.inventoryItemId?if_exists}</td>
-            </#if>
-            <#if serialNumber?default("") != "">
-              <td>${partyRow.serialNumber?if_exists}</td>
-            </#if>
-            <#if softIdentifier?default("") != "">
-              <td>${partyRow.softIdentifier?if_exists}</td>
-            </#if>
-            <#if partyType?exists>  
-              <td>
-                  <#if partyType.partyTypeId?has_content && partyType.partyTypeId=="PERSON">
-                       <#assign partyRelateCom = delegator.findByAnd("PartyRelationship", {"partyIdTo", partyRow.partyId,"roleTypeIdFrom","ACCOUNT","roleTypeIdTo","CONTACT"})>
-                       <#if partyRelateCom?has_content>
-                          <#list partyRelateCom as partyRelationship>
-                              <#if partyRelationship.partyIdFrom?has_content>
-                                  <#assign companyName=Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, partyRelationship.partyIdFrom, true)>
-                                  ${companyName?if_exists}
-                              </#if>
-                          </#list>
-                       </#if>
-                  </#if>
-              </td>
-              <td><#if partyType.description?exists>${partyType.get("description", locale)}<#else>???</#if></td>
-           <#else>
-            <td></td><td></td>
-           </#if>
-            <td>
-              <#assign mainRole = dispatcher.runSync("getPartyMainRole", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", partyRow.partyId, "userLogin", userLogin))/>
+            </#list>
+          </#if>
+        </#if>
+        </td>
+        <td><#if partyType.description?exists>${partyType.get("description", locale)}<#else>???</#if></td>
+      <#else>
+        <td></td><td></td>
+      </#if>
+        <td>
+      <#assign mainRole = dispatcher.runSync("getPartyMainRole", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", partyRow.partyId, "userLogin", userLogin))/>
               ${mainRole.description?if_exists}
-            </td>
-            <td class="button-col align-float">
-              <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${uiLabelMap.CommonDetails}</a>
-              <#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session)>
-                  <form name= "searchorders_o_${rowCount}" method= "post" action= "/ordermgr/control/searchorders">
-                    <input type= "hidden" name= "lookupFlag" value= "Y" />
-                    <input type= "hidden" name= "hideFields" value= "Y" />
-                    <input type= "hidden" name= "partyId" value= "${partyRow.partyId}" />
-                    <input type= "hidden" name= "viewIndex" value= "1" />
-                    <input type= "hidden" name= "viewSize" value= "20" />
-                    <a href="javascript:document.searchorders_o_${rowCount}.submit()">${uiLabelMap.OrderOrders}</a>
-                </form>
-                <a href="/ordermgr/control/FindQuote?partyId=${partyRow.partyId + externalKeyParam}">${uiLabelMap.OrderOrderQuotes}</a>
-              </#if>
-              <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)>
-                <a href="/ordermgr/control/checkinits?partyId=${partyRow.partyId + externalKeyParam}">${uiLabelMap.OrderNewOrder}</a>
-                <a href="/ordermgr/control/EditQuote?partyId=${partyRow.partyId + externalKeyParam}">${uiLabelMap.OrderNewQuote}</a>
-              </#if>
-            </td>
-          </tr>
-          <#assign rowCount = rowCount + 1>
-          <#-- toggle the row color -->
-          <#assign alt_row = !alt_row>
-        </#list>
-      </table>
-    <#else>
-      <div id="findPartyResults_2">
-        <h3>${uiLabelMap.PartyNoPartiesFound}</h3>
-      </div>
-    </#if>
-    <#if lookupErrorMessage?exists>
-      <h3>${lookupErrorMessage}</h3>
-    </#if>
+        </td>
+        <td class="button-col align-float">
+          <a href="<@ofbizUrl>viewprofile?partyId=${partyRow.partyId}</@ofbizUrl>">${uiLabelMap.CommonDetails}</a>
+      <#if security.hasRolePermission("ORDERMGR", "_VIEW", "", "", session)>
+          <form name= "searchorders_o_${rowCount}" method= "post" action= "/ordermgr/control/searchorders">
+            <input type= "hidden" name= "lookupFlag" value= "Y" />
+            <input type= "hidden" name= "hideFields" value= "Y" />
+            <input type= "hidden" name= "partyId" value= "${partyRow.partyId}" />
+            <input type= "hidden" name= "viewIndex" value= "1" />
+            <input type= "hidden" name= "viewSize" value= "20" />
+            <a href="javascript:document.searchorders_o_${rowCount}.submit()">${uiLabelMap.OrderOrders}</a>
+          </form>
+          <a href="/ordermgr/control/FindQuote?partyId=${partyRow.partyId + externalKeyParam}">${uiLabelMap.OrderOrderQuotes}</a>
+      </#if>
+      <#if security.hasEntityPermission("ORDERMGR", "_CREATE", session)>
+          <a href="/ordermgr/control/checkinits?partyId=${partyRow.partyId + externalKeyParam}">${uiLabelMap.OrderNewOrder}</a>
+          <a href="/ordermgr/control/EditQuote?partyId=${partyRow.partyId + externalKeyParam}">${uiLabelMap.OrderNewQuote}</a>
+      </#if>
+        </td>
+      </tr>
+      <#assign rowCount = rowCount + 1>
+      <#-- toggle the row color -->
+      <#assign alt_row = !alt_row>
+    </#list>
+    </table>
+  <#else>
+    <div id="findPartyResults_2">
+      <h3>${uiLabelMap.PartyNoPartiesFound}</h3>
+    </div>
+  </#if>
+  <#if lookupErrorMessage?exists>
+    <h3>${lookupErrorMessage}</h3>
+  </#if>
   </div>
 </#if>
 </div>

Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml Mon Jul 19 14:39:07 2010
@@ -218,6 +218,13 @@ under the License.
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
 
+    <form name="PartyLink" type="single" target="setPartyLink"
+        focus-field-name="partyId" header-row-style="header-row" default-table-style="basic-table">
+        <field position="1" name="partyId"><lookup target-form-name="LookupPartyName"/></field>
+        <field position="2" name="partyIdTo"><lookup target-form-name="LookupPartyName"/></field>
+      <field name="submitButton" title="${uiLabelMap.PartyLink}"><submit button-type="button" request-confirmation="true" confirmation-message="${uiLabelMap.PartyLinkMessage1}"/></field>
+    </form>
+
     <!-- PartyRelationship -->
     <form name="AddPartyRelationshipType" type="single" target="createPartyRelationshipType"
         header-row-style="header-row" default-table-style="basic-table">

Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml Mon Jul 19 14:39:07 2010
@@ -206,15 +206,24 @@ under the License.
                 <set field="titleProperty" value="PartyLink"/>
                 <set field="headerItem" value="link"/>
                 <set field="tabButtonItem" value="linkparty"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.groovy"/>
-                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/LinkParty.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://party/webapp/partymgr/party/linkparty.ftl"/></html>
-                        </platform-specific>
+                        <section>
+                            <condition>
+                                <if-has-permission permission="PARTYMGR" action="_UPDATE"/>
+                            </condition>
+                            <widgets>
+                                <screenlet title="${uiLabelMap.PartyLink}">
+                                    <label text="${uiLabelMap.PartyLinkExplanation}"></label>
+                                    <include-form name="PartyLink" location="component://party/widget/partymgr/PartyForms.xml"/>
+                                </screenlet>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3" text="${uiLabelMap.PartyPermissionError}"/>
+                            </fail-widgets>
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml Mon Jul 19 14:39:07 2010
@@ -8349,7 +8349,7 @@
     <property key="ProductCatalogManager">
         <value xml:lang="de">Katalogverwaltung Anwendung</value>
         <value xml:lang="en">Catalog Manager</value>
-        <value xml:lang="es">Adplicación de Administración de Catálogos</value>
+        <value xml:lang="es">Aplicación de Administración de Catálogos</value>
         <value xml:lang="fr">Application de gestion des articles</value>
         <value xml:lang="it">Gestione cataloghi</value>
         <value xml:lang="nl">Catalogus Manager</value>
@@ -8361,7 +8361,7 @@
     <property key="ProductCatalogManagerApplication">
         <value xml:lang="de">Katalogverwaltung Anwendung</value>
         <value xml:lang="en">Catalog Manager Application</value>
-        <value xml:lang="es">Adplicación de Administración de Catálogos</value>
+        <value xml:lang="es">Aplicación de Administración de Catálogos</value>
         <value xml:lang="fr">Application de gestion des articles</value>
         <value xml:lang="it">Applicazione Gestione Cataloghi</value>
         <value xml:lang="nl">Catalogus Manager</value>    

Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original)
+++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Mon Jul 19 14:39:07 2010
@@ -843,7 +843,7 @@ under the License.
 
     <!-- To help dynamically populate a products dropdown given a product category id from a change in another dropdown, possibly sorted on sequenceNum -->    
     <simple-method method-name="getAssociatedProductsList" short-description="Set the product options for selected product category" login-required="false">
-        <set field="parameters.categoryId" from-field="parameters.productCategoryId"/>
+        <set field="parameters.categoryId" from-field="parameters.mainId"/>
         <set-service-fields service-name="getProductCategoryMembers" map="parameters" to-map="getProductCategoryMembersMap"/>        
         <call-service service-name="getProductCategoryMembers" in-map-name="getProductCategoryMembersMap">
             <result-to-field result-name="categoryMembers" field="productsList"/>
@@ -856,13 +856,13 @@ under the License.
                 <field-map field-name="productId" from-field="productMember.productId"/>
             </entity-one>
             <set field="productName" value="${product.internalName}: ${product.productId}"/>
-            <field-to-list list="products" field="productName"/>
+            <field-to-list list="valuesList" field="productName"/>
         </iterate>
-        <if-empty field="products">
+        <if-empty field="valuesList">
             <property-to-field resource="ProductUiLabels" property="ProductNoProducts" field="noOption"/>
-            <field-to-list list="products" field="noOption"/>
+            <field-to-list list="valuesList" field="noOption"/>
         </if-empty>
-        <field-to-result field="products"/>
+        <field-to-result field="valuesList"/>
     </simple-method>
     
 </simple-methods>

Modified: ofbiz/branches/jquery/applications/product/servicedef/secas_olap.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/servicedef/secas_olap.xml?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/servicedef/secas_olap.xml (original)
+++ ofbiz/branches/jquery/applications/product/servicedef/secas_olap.xml Mon Jul 19 14:39:07 2010
@@ -23,9 +23,9 @@ under the License.
 
     <!-- dimension entities -->
     <eca service="createProduct" event="commit">
-        <action service="loadType1ProductInProductDimension" mode="sync"/>
+        <action service="loadType1ProductInProductDimension" mode="async"/>
     </eca>
     <eca service="updateProduct" event="commit">
-        <action service="loadType2ProductInProductDimension" mode="sync"/>
+        <action service="loadType2ProductInProductDimension" mode="async"/>
     </eca>
 </service-eca>

Modified: ofbiz/branches/jquery/applications/product/servicedef/services_view.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/servicedef/services_view.xml?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/servicedef/services_view.xml (original)
+++ ofbiz/branches/jquery/applications/product/servicedef/services_view.xml Mon Jul 19 14:39:07 2010
@@ -119,8 +119,8 @@ under the License.
     
     <service name="getAssociatedProductsList" engine="simple" auth="false"
         location="component://product/script/org/ofbiz/product/category/CategoryServices.xml" invoke="getAssociatedProductsList">
-        <attribute name="productCategoryId" mode="IN" type="String" optional="false"/>
-        <attribute name="products" mode="OUT" type="java.util.List"/>
+        <attribute name="mainId" mode="IN" type="String" optional="false"/>
+        <attribute name="valuesList" mode="OUT" type="java.util.List"/>
     </service>
     
     <service name="getPreviousNextProducts" engine="java"

Modified: ofbiz/branches/jquery/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/catalog/StoreScreens.xml?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/branches/jquery/applications/product/widget/catalog/StoreScreens.xml Mon Jul 19 14:39:07 2010
@@ -353,7 +353,7 @@ under the License.
                         <screenlet title="${uiLabelMap.PageTitleEditProductStorePaySetup}">
                             <section>
                                 <condition>
-                                    <if-has-permission permission="CATALOG" action="CREATE"/>
+                                    <if-has-permission permission="CATALOG" action="_CREATE"/>
                                 </condition>
                                 <widgets>
                                     <include-form name="EditProductStorePaymentSetting" location="component://product/widget/catalog/ProductStoreForms.xml"/>

Modified: ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original)
+++ ofbiz/branches/jquery/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Mon Jul 19 14:39:07 2010
@@ -185,12 +185,12 @@ under the License.
                                 <if-not-empty field="partyRates">
                                     <first-from-list entry="partyRate" list="partyRates"/>
                                     <if-not-empty field="partyRate.percentageUsed">
-                                        <calculate field="timeEntry.hours" type="BigDecimal">
+                                        <calculate field="timeEntry.hours" type="Double">
                                             <calcop operator="multiply" field="timeEntry.hours">
                                                 <calcop operator="get" field="partyRate.percentageUsed"/>
                                             </calcop>
                                         </calculate>
-                                        <calculate field="timeEntry.hours" type="BigDecimal">
+                                        <calculate field="timeEntry.hours" type="Double">
                                             <calcop operator="divide" field="timeEntry.hours">
                                                 <number value="100"/>
                                             </calcop>
@@ -315,17 +315,42 @@ under the License.
     </simple-method>
     <simple-method method-name="updateTimeEntry" short-description="Update TimeEntry">
         <entity-one entity-name="TimeEntry" value-field="lookedUpValue"/>
-        <!-- allow update of invoiceId and seqId if not yet filled, else check status -->
+        <call-simple-method method-name="checkTimesheetStatus"/>
+        
+        <!-- update all fields except invoiceId,invoiceItemSeqId and only those if they are not yet set -->
+        <map-to-map map="parameters" to-map="fieldsToCopy"/>
+        <clear-field field="fieldsToCopy.invoiceId"/>
+        <clear-field field="fieldsToCopy.invoiceItemSeqId"/>
+        
+        <!-- if dates are updated and no hours value is specified, calc it here -->
+        <if>
+            <condition>
+                <and>
+                    <if-empty field="fieldsToCopy.hours"/>
+                    <or>
+                        <not><if-empty field="fieldsToCopy.fromDate"/></not>
+                        <not><if-empty field="fieldsToCopy.thruDate"/></not>
+                    </or>
+                    <or>
+                        <if-compare-field field="fieldsToCopy.fromDate" operator="not-equals" to-field="lookedUpValue.fromDate"/>
+                        <if-compare-field field="fieldsToCopy.thruDate" operator="not-equals" to-field="lookedUpValue.thruDate"/>
+                    </or>
+                </and>
+            </condition>
+            <then>
+                <set field="fieldsToCopy.hours" value="${groovy:org.ofbiz.base.util.UtilDateTime.getInterval((fieldsToCopy.fromDate ? fieldsToCopy.fromDate : lookedUpValue.fromDate), (fieldsToCopy.thruDate ? fieldsToCopy.thruDate : lookedUpValue.thruDate))/3600000}" type="Double"/>
+            </then>
+        </if>
+        
+        <set-nonpk-fields map="fieldsToCopy" value-field="lookedUpValue"/>
+        
         <if-not-empty field="parameters.invoiceId">
             <if-empty field="lookedUpValue.invoiceId">
-            <set field="lookedUpValue.invoiceId" from-field="parameters.invoiceId"/>
-            <set field="lookedUpValue.invoiceItemSeqId" from-field="parameters.invoiceItemSeqId"/>
-            <else>
-                <call-simple-method method-name="checkTimesheetStatus"/>
-                <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-            </else>
+                <set field="lookedUpValue.invoiceId" from-field="parameters.invoiceId"/>
+                <set field="lookedUpValue.invoiceItemSeqId" from-field="parameters.invoiceItemSeqId"/>
             </if-empty>
         </if-not-empty>
+        
         <store-value value-field="lookedUpValue"/>
     </simple-method>
     <simple-method method-name="deleteTimeEntry" short-description="Delete TimeEntry">

Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilDateTime.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilDateTime.java?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilDateTime.java (original)
+++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilDateTime.java Mon Jul 19 14:39:07 2010
@@ -132,10 +132,10 @@ public class UtilDateTime {
 
         StringBuilder sb = new StringBuilder();
         for (int i = parts.size() - 1; i >= 0 && count > 0; i--) {
-            if (sb.length() > 0) sb.append(", ");
             Double D = parts.get(i);
             double d = D.doubleValue();
             if (d < 1) continue;
+            if (sb.length() > 0) sb.append(", ");
             count--;
             sb.append(count == 0 ? df.format(d) : Integer.toString(D.intValue()));
             sb.append(' ');

Modified: ofbiz/branches/jquery/framework/birt/lib/chartengineapi.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/lib/chartengineapi.jar?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/jquery/framework/birt/lib/chartitemapi.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/lib/chartitemapi.jar?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/jquery/framework/birt/lib/coreapi.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/lib/coreapi.jar?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/jquery/framework/birt/lib/crosstabcoreapi.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/lib/crosstabcoreapi.jar?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/jquery/framework/birt/lib/dataadapterapi.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/lib/dataadapterapi.jar?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/jquery/framework/birt/lib/dataaggregationapi.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/lib/dataaggregationapi.jar?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/jquery/framework/birt/lib/dataextraction.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/lib/dataextraction.jar?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/jquery/framework/birt/lib/dteapi.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/lib/dteapi.jar?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/jquery/framework/birt/lib/emitterconfig.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/lib/emitterconfig.jar?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/jquery/framework/birt/lib/engineapi.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/lib/engineapi.jar?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/jquery/framework/birt/lib/modelapi.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/lib/modelapi.jar?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/jquery/framework/birt/lib/modelodaapi.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/lib/modelodaapi.jar?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/jquery/framework/birt/lib/odadesignapi.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/lib/odadesignapi.jar?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/jquery/framework/birt/lib/scriptapi.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/lib/scriptapi.jar?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/jquery/framework/birt/lib/viewservlets.jar
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/lib/viewservlets.jar?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
Binary files - no diff available.

Modified: ofbiz/branches/jquery/framework/birt/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/birt/ofbiz-component.xml?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/birt/ofbiz-component.xml (original)
+++ ofbiz/branches/jquery/framework/birt/ofbiz-component.xml Mon Jul 19 14:39:07 2010
@@ -27,7 +27,7 @@ under the License.
     <classpath type="jar" location="lib/platform/plugins/org.eclipse.emf.ecore_2.5.0.v200906151043.jar"/>
     <classpath type="jar" location="lib/platform/plugins/org.eclipse.emf.ecore.xmi_2.5.0.v200906151043.jar"/>
     <classpath type="jar" location="lib/platform/plugins/org.w3c.css.sac_1.3.0.v200805290154.jar"/>
-    <classpath type="jar" location="lib/platform/plugins/org.mozilla.rhino_1.7.1.v20090521/lib/js.jar"/>
+    <classpath type="jar" location="lib/platform/plugins/org.mozilla.rhino_1.7.1.v20090608/lib/js.jar"/>
     <classpath type="jar" location="lib/platform/plugins/org.w3c.sac_1.3.0.v20070710/lib/flute.jar"/>
     <classpath type="jar" location="build/lib/*"/>
     <classpath type="dir" location="config"/>

Modified: ofbiz/branches/jquery/framework/common/data/UnitData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/data/UnitData.xml?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/data/UnitData.xml (original)
+++ ofbiz/branches/jquery/framework/common/data/UnitData.xml Mon Jul 19 14:39:07 2010
@@ -267,6 +267,7 @@ under the License.
     <UomConversion uomId="WT_kg" uomIdTo="WT_lb" conversionFactor="2.2"/>
     <UomConversion uomId="WT_g" uomIdTo="WT_mg" conversionFactor="1000"/>
     <UomConversion uomId="WT_g" uomIdTo="WT_oz" conversionFactor="0.03527"/>
+    <UomConversion uomId="WT_g" uomIdTo="WT_lb" conversionFactor="0.00220462247604"/>
     <UomConversion uomId="WT_oz" uomIdTo="WT_lb" conversionFactor="0.0625"/>
     <UomConversion uomId="WT_oz" uomIdTo="WT_g" conversionFactor="28"/>
     <UomConversion uomId="WT_oz_tr" uomIdTo="WT_g" conversionFactor="30"/>

Modified: ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy (original)
+++ ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/actions/includes/FindAutocompleteOptions.groovy Mon Jul 19 14:39:07 2010
@@ -18,6 +18,7 @@
  */
 
 import org.ofbiz.base.util.StringUtil;
+import org.ofbiz.base.util.Debug;
 import org.ofbiz.entity.util.EntityFindOptions;
 import org.ofbiz.entity.condition.EntityCondition;
 import org.ofbiz.entity.condition.EntityConditionList;
@@ -26,13 +27,13 @@ import org.ofbiz.entity.condition.Entity
 import org.ofbiz.entity.condition.EntityFunction;
 import org.ofbiz.entity.condition.EntityOperator;
 
-andExprs = [];
-entityName = context.entityName;
-searchFields = context.searchFields;
-displayFields = context.displayFields ?: searchFields;
-searchValueFieldName = parameters.searchValueField;
+def andExprs = [];
+def entityName = context.entityName;
+def searchFields = context.searchFields;
+def displayFields = context.displayFields ?: searchFields;
+def searchValueFieldName = parameters.searchValueField;
 if (searchValueFieldName) fieldValue = parameters.get(searchValueFieldName);
-searchType = context.searchType;
+def searchType = context.searchType;
 
 if (searchFields && fieldValue) {
     searchFieldsList = StringUtil.toList(searchFields);
@@ -58,6 +59,18 @@ if (searchFields && fieldValue) {
     }
 }
 
+/* the following is part of an attempt to handle additional parameters that are passed in from other form fields at run-time,
+ * but that is not supported by the scrip.aculo.us Ajax.Autocompleter, but this is still useful to pass parameters from the
+ * lookup screen definition:
+ */
+def conditionFields = context.conditionFields;
+if (conditionFields) {
+    // these fields are for additonal conditions, this is a Map of name/value pairs
+    for (conditionFieldEntry in conditionFields.entrySet()) {
+        andExprs.add(EntityCondition.makeCondition(EntityFieldValue.makeFieldValue(conditionFieldEntry.getKey()), EntityOperator.EQUALS, conditionFieldEntry.getValue()));    
+    }
+}
+
 if (andExprs && entityName && displayFieldsSet) {
     entityConditionList = EntityCondition.makeCondition(andExprs, EntityOperator.OR);
 

Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java (original)
+++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java Mon Jul 19 14:39:07 2010
@@ -123,6 +123,8 @@ public abstract class JdbcValueHandler {
         result.put("CHAR VARYING", Types.VARCHAR);
         result.put("CHARACTER VARYING", Types.VARCHAR);
         // DB2, MS SQL Data Types
+        // Note: Do NOT map the DATETIME SQL data type, the
+        // java-type will be used to select the correct data type
         result.put("LONGVARCHAR", Types.LONGVARCHAR);
         result.put("LONG VARCHAR", Types.LONGVARCHAR);
         result.put("BIGINT", Types.BIGINT);
@@ -132,8 +134,8 @@ public abstract class JdbcValueHandler {
         result.put("VARBINARY", Types.VARBINARY);
         result.put("LONGVARBINARY", Types.LONGVARBINARY);
         result.put("LONG VARBINARY", Types.LONGVARBINARY);
-        // Note: Do NOT map the DATETIME SQL data type, the
-        // java-type will be used to select the correct data type
+        // PostgreSQL SQL Data Types
+        result.put("BYTEA", Types.BINARY);
         return result;
     }
 

Modified: ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/web.xml?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/web.xml (original)
+++ ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/web.xml Mon Jul 19 14:39:07 2010
@@ -41,11 +41,11 @@ under the License.
         <param-value>component://example/widget/example/CommonScreens.xml</param-value>
         <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
     </context-param>
-    <context-param>
+    <!-- context-param>
         <param-name>widgetVerbose</param-name>
         <param-value>false</param-value>
-        <description>Enable widget boundary comments. See org.ofbiz.widget.ModelWidget.widgetBoundaryCommentsEnabled().</description>
-    </context-param>
+        <description>Enable/disable widget boundary comments. will override widget.properties See org.ofbiz.widget.ModelWidget.widgetBoundaryCommentsEnabled().</description>
+    </context-param-->
     <context-param>
         <param-name>compressHTML</param-name>
         <param-value>false</param-value>

Modified: ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/calendar_date_select.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/calendar_date_select.js?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/calendar_date_select.js (original)
+++ ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/calendar_date_select.js Mon Jul 19 14:39:07 2010
@@ -22,7 +22,7 @@ Element.buildAndAppend = function(type,
 nil = null;
 
 Date.one_day = 24*60*60*1000;
-Date.weekdays = $w("Sa M T W T F Su");
+Date.weekdays = $w("Su M T W T F Sa");
 Date.first_day_of_week = 0;
 Date.months = $w("January February March April May June July August September October November December" );
 Date.padded2 = function(hour) { var padded2 = parseInt(hour, 10); if (hour < 10) padded2 = "0" + padded2; return padded2; }

Modified: ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/locale/en.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/locale/en.js?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/locale/en.js (original)
+++ ofbiz/branches/jquery/framework/images/webapp/images/calendarDateSelect/locale/en.js Mon Jul 19 14:39:07 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-Date.weekdays = $w("Sa M T W T F Su");
+Date.weekdays = $w("Su M T W T F Sa");
 Date.months = $w("January February March April May June July August September October November December" );
 
 Date.first_day_of_week = 0;

Modified: ofbiz/branches/jquery/framework/webapp/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webapp/entitydef/entitymodel.xml?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webapp/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/jquery/framework/webapp/entitydef/entitymodel.xml Mon Jul 19 14:39:07 2010
@@ -175,7 +175,7 @@ under the License.
         <field name="initialReferrer" type="url"></field>
         <field name="initialUserAgent" type="long-varchar"></field>
         <field name="userAgentId" type="id"></field>
-        <field name="clientIpAddress" type="id"></field>
+        <field name="clientIpAddress" type="short-varchar"></field>
         <field name="clientHostName" type="long-varchar"></field>
         <field name="clientUser" type="short-varchar"></field>
         <field name="clientIpIspName" type="short-varchar"></field>

Modified: ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original)
+++ ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Mon Jul 19 14:39:07 2010
@@ -173,9 +173,9 @@ public class RequestHandler {
 
             // Check to make sure we are allowed to access this request directly. (Also checks if this request is defined.)
             // If the request cannot be called, or is not defined, check and see if there is a default-request we can process
-            String defaultRequest = controllerConfig.getDefaultRequest();
-            if (!requestMap.securityDirectRequest && defaultRequest != null) {
-                if (!requestMapMap.get(defaultRequest).securityDirectRequest) {
+            if (!requestMap.securityDirectRequest) {
+                String defaultRequest = controllerConfig.getDefaultRequest();
+                if (defaultRequest == null || !requestMapMap.get(defaultRequest).securityDirectRequest) {
                     // use the same message as if it was missing for security reasons, ie so can't tell if it is missing or direct request is not allowed
                     throw new RequestHandlerException(requestMissingErrorMessage);
                 } else {

Modified: ofbiz/branches/jquery/framework/widget/config/widget.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/config/widget.properties?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/config/widget.properties (original)
+++ ofbiz/branches/jquery/framework/widget/config/widget.properties Mon Jul 19 14:39:07 2010
@@ -21,6 +21,7 @@
 #compress.HTML=true
 
 # Enable screen widget boundary comments
+# 'false' can be overwritten by a 'widgetVerbose' parameter in the web.xml file see web.xml in the example component how to do this
 widget.verbose=true
 
 # Default number of items to be displayed per page in a list form

Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/ModelWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/ModelWidget.java?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/ModelWidget.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/ModelWidget.java Mon Jul 19 14:39:07 2010
@@ -21,6 +21,7 @@ package org.ofbiz.widget;
 import java.io.Serializable;
 import java.util.Map;
 import org.w3c.dom.Element;
+import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilGenerics;
 import org.ofbiz.base.util.UtilProperties;
 
@@ -110,7 +111,7 @@ public class ModelWidget implements Seri
      */
     public static boolean widgetBoundaryCommentsEnabled(Map<String, ? extends Object> context) {
         boolean result = "true".equals(UtilProperties.getPropertyValue("widget", "widget.verbose"));
-        if (context != null) {
+        if (result == false && context != null) {
             String str = (String) context.get(enableBoundaryCommentsParam);
             if (str != null) {
                 result = "true".equals(str);

Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Mon Jul 19 14:39:07 2010
@@ -1297,7 +1297,7 @@ public class MacroFormRenderer implement
     }
 
     public void renderMultiFormClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException {
-        //FIXME copy from HtmlFormRenderer.java
+        //FIXME copy from HtmlFormRenderer.java (except for the closing form tag itself, that is now converted)
         Iterator<ModelFormField> submitFields = modelForm.getMultiSubmitFields().iterator();
         while (submitFields.hasNext()) {
             ModelFormField submitField = submitFields.next();
@@ -1321,8 +1321,9 @@ public class MacroFormRenderer implement
 
             }
         }
-        writer.append("</form>");
-        appendWhitespace(writer);
+        StringWriter sr = new StringWriter();
+        sr.append("<@renderMultiFormClose />");
+        executeMacro(writer, sr.toString());
 
         // see if there is anything that needs to be added outside of the multi-form
         Map<String, Object> wholeFormContext = UtilGenerics.checkMap(context.get("wholeFormContext"));
@@ -1969,7 +1970,7 @@ public class MacroFormRenderer implement
 
         boolean ajaxEnabled = updateAreas != null && this.javaScriptEnabled;
         String autocomplete = "";
-        if (!lookupField.getClientAutocompleteField() || ajaxEnabled) {
+        if (!lookupField.getClientAutocompleteField() || !ajaxEnabled) {
             autocomplete = "off";
         }
 

Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Mon Jul 19 14:39:07 2010
@@ -46,7 +46,6 @@ import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.collections.FlexibleMapAccessor;
 import org.ofbiz.base.util.collections.MapStack;
 import org.ofbiz.base.util.string.FlexibleStringExpander;
-import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.model.ModelEntity;
 import org.ofbiz.entity.model.ModelField;
@@ -54,7 +53,6 @@ import org.ofbiz.entity.model.ModelReade
 import org.ofbiz.entity.util.EntityListIterator;
 import org.ofbiz.service.DispatchContext;
 import org.ofbiz.service.GenericServiceException;
-import org.ofbiz.service.LocalDispatcher;
 import org.ofbiz.service.ModelParam;
 import org.ofbiz.service.ModelService;
 import org.ofbiz.webapp.control.ConfigXMLReader;

Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ScreenFopViewHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ScreenFopViewHandler.java?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ScreenFopViewHandler.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ScreenFopViewHandler.java Mon Jul 19 14:39:07 2010
@@ -80,7 +80,7 @@ public class ScreenFopViewHandler extend
             screens.getContext().put("simpleEncoder", StringUtil.getEncoder(UtilProperties.getPropertyValue("widget", getName() + ".encoder")));
             screens.render(page);
         } catch (Exception e) {
-            renderError("Problems with the response writer/output stream", e, request, response);
+            renderError("Problems with the response writer/output stream", e, "[Not Yet Rendered]", request, response);
             return;
         }
 
@@ -101,7 +101,7 @@ public class ScreenFopViewHandler extend
             Fop fop = ApacheFopWorker.createFopInstance(out, contentType);
             ApacheFopWorker.transform(src, null, fop);
         } catch (Exception e) {
-            renderError("Unable to transform FO file", e, request, response);
+            renderError("Unable to transform FO file", e, screenOutString, request, response);
             return;
         }
         // set the content type and length
@@ -113,12 +113,12 @@ public class ScreenFopViewHandler extend
             out.writeTo(response.getOutputStream());
             response.getOutputStream().flush();
         } catch (IOException e) {
-            renderError("Unable to write to OutputStream", e, request, response);
+            renderError("Unable to write to OutputStream", e, screenOutString, request, response);
         }
     }
 
-    protected void renderError(String msg, Exception e, HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException {
-        Debug.logError(msg + ": " + e, module);
+    protected void renderError(String msg, Exception e, String screenOutString, HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException {
+        Debug.logError(msg + ": " + e + "; Screen XSL:FO text was:\n" + screenOutString, module);
         try {
             Writer writer = new StringWriter();
             ScreenRenderer screens = new ScreenRenderer(writer, null, new HtmlScreenRenderer());

Modified: ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl Mon Jul 19 14:39:07 2010
@@ -234,7 +234,9 @@ ${item.description}</span>
         <script language="JavaScript" type="text/javascript">document.${formName}.${focusFieldName}.focus();</script><#lt/>
     </#if>
 </#macro>
-<#macro renderMultiFormClose></#macro>
+<#macro renderMultiFormClose>
+    </form><#lt/>
+</#macro>
 
 <#macro renderFormatListWrapperOpen formName style columnStyles>
     <table cellspacing="0" class="<#if style?has_content>${style}<#else>basic-table form-widget-table dark-grid</#if>"><#lt/>

Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl Mon Jul 19 14:39:07 2010
@@ -36,7 +36,7 @@ function submitForm(form, mode, value) {
         form.submit();
     } else if (mode == "EC") {
         // edit credit card
-        form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutpayment&amp;paymentMethodId="+value+"</@ofbizUrl>";
+        form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutpayment&paymentMethodId="+value+"</@ofbizUrl>";
         form.submit();
     } else if (mode == "GC") {
         // edit gift card
@@ -48,11 +48,11 @@ function submitForm(form, mode, value) {
         form.submit();
     } else if (mode == "EE") {
         // edit eft account
-        form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment&amp;paymentMethodId="+value+"</@ofbizUrl>";
+        form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutpayment&paymentMethodId="+value+"</@ofbizUrl>";
         form.submit();
     }else if(mode = "EG")
     //edit gift card
-        form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?DONE_PAGE=checkoutpayment&amp;paymentMethodId="+value+"</@ofbizUrl>";
+        form.action="<@ofbizUrl>updateCheckoutOptions/editgiftcard?DONE_PAGE=checkoutpayment&paymentMethodId="+value+"</@ofbizUrl>";
         form.submit();
 }
 //]]>

Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl?rev=965505&r1=965504&r2=965505&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl Mon Jul 19 14:39:07 2010
@@ -18,7 +18,7 @@ under the License.
 -->
 
 <script language="javascript" type="text/javascript">
-<!--
+//<![CDATA[
 function submitForm(form, mode, value) {
     if (mode == "DN") {
         // done action; checkout
@@ -30,11 +30,11 @@ function submitForm(form, mode, value) {
         form.submit();
     } else if (mode == "NA") {
         // new address
-        form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&amp;contactMechPurposeTypeId=SHIPPING_LOCATION&amp;DONE_PAGE=checkoutoptions</@ofbizUrl>";
+        form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&contactMechPurposeTypeId=SHIPPING_LOCATION&DONE_PAGE=checkoutoptions</@ofbizUrl>";
         form.submit();
     } else if (mode == "EA") {
         // edit address
-        form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=checkoutshippingaddress&amp;contactMechId="+value+"</@ofbizUrl>";
+        form.action="<@ofbizUrl>updateCheckoutOptions/editcontactmech?DONE_PAGE=checkoutshippingaddress&contactMechId="+value+"</@ofbizUrl>";
         form.submit();
     } else if (mode == "NC") {
         // new credit card
@@ -42,7 +42,7 @@ function submitForm(form, mode, value) {
         form.submit();
     } else if (mode == "EC") {
         // edit credit card
-        form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutoptions&amp;paymentMethodId="+value+"</@ofbizUrl>";
+        form.action="<@ofbizUrl>updateCheckoutOptions/editcreditcard?DONE_PAGE=checkoutoptions&paymentMethodId="+value+"</@ofbizUrl>";
         form.submit();
     } else if (mode == "NE") {
         // new eft account
@@ -50,12 +50,12 @@ function submitForm(form, mode, value) {
         form.submit();
     } else if (mode == "EE") {
         // edit eft account
-        form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutoptions&amp;paymentMethodId="+value+"</@ofbizUrl>";
+        form.action="<@ofbizUrl>updateCheckoutOptions/editeftaccount?DONE_PAGE=checkoutoptions&paymentMethodId="+value+"</@ofbizUrl>";
         form.submit();
     }
 }
 
-// -->
+//]]>
 </script>
 
 <form method="post" name="checkoutInfoForm" style="margin:0;">