Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFormsXml.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFormsXml.java:1.22 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFormsXml.java:1.23
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFormsXml.java:1.22	Sun Jun 20 21:58:10 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFormsXml.java	Wed Jun 23 12:31:02 2004
@@ -8,6 +8,7 @@
 import java.util.Vector;
 
 import org.codelutin.generator.ObjectModelGenerator;
+import org.codelutin.generator.models.object.ObjectModelAssociationClass;
 import org.codelutin.generator.models.object.ObjectModelAttribute;
 import org.codelutin.generator.models.object.ObjectModelClass;
 
@@ -98,6 +99,25 @@
         return stringReturn;
     }
 
+//===============================================================================
+    /**
+     *  create the parameters which is needed to be able to call the Show( associationClass).
+     * @param _attribute
+     * @return string to put after the begining of the URI ex: /Show<%=getCallForAssociationClass(clazz)%>}
+     */
+    private String getCallForAssociationClass( ObjectModelClass _participantClass ){
+        String relationName = _participantClass.getName();
+        String stringReturn = relationName + "?";
+        ListPkAttribute listPrimaryKey = new ListPkAttribute(model, _participantClass, false);
+        for(Iterator iterList=listPrimaryKey.getName().iterator(); iterList.hasNext(); ){
+            String fieldName = (String) iterList.next();
+            stringReturn += fieldName + "=${" + fieldName;
+            if( iterList.hasNext() )
+                stringReturn += stringReturn + "}&amp;";
+        }
+        return stringReturn;
+    }
+
     private boolean putLookup( Writer output, ObjectModelAttribute _att ) throws IOException {
         if( associe( _att ) ){
             /*{<lookup target-form-name="Lookup<%=_att.getName()%>"/>
@@ -155,6 +175,30 @@
                 }
             }
         }
+        if (clazz instanceof ObjectModelAssociationClass){
+            Map participantsWithName = Util.getParticipantsWithName(clazz);
+            for (int i=0; i<2; i++){
+                ObjectModelClass participantClass = (ObjectModelClass) ((List) participantsWithName.get("classParticipants")).get(i);
+                String participantName = (String) ((List) participantsWithName.get("attributeParticipants")).get(i);
+                if (Util.toUpperCaseFirstLetter(participantName).equals(participantClass.getName())) participantName = Util.getClassShortName(participantClass);
+                ListPkAttribute listParticipantPrimaryKey = new ListPkAttribute(model, participantClass, true);        
+                for (int j=0; j<listParticipantPrimaryKey.getName().size(); j++ ){
+                    String fieldName = participantName + Util.toUpperCaseFirstLetter((String) listParticipantPrimaryKey.getName().get(j) );
+/*{
+             <field name="<%=fieldName%>"><hidden/></field>
+}*/
+               }
+               if (! participantClass.equals((ObjectModelClass) attrEditAssoc.getDeclaringElement() ) ){
+                   String call = getCallForAssociationClass( participantClass );
+/*{
+             <field name="<%=participantName%>" title="<%=uiLabel( participantName )%>">
+                    <hyperlink target="Show<%=call%>}"
+                               description="[${<%=participantName%>Name}] ${<%=participantName%>Description}"/>
+             </field>
+}*/
+               }
+            }    
+        }
         for (Iterator iter = listAttList.iterator(); iter.hasNext(); ){
             ObjectModelAttribute attribute = (ObjectModelAttribute) iter.next();
             if (attribute.referenceClassifier() ){
@@ -234,9 +278,36 @@
                 }
             }
         }
+        if (clazz instanceof ObjectModelAssociationClass){
+            Map participantsWithName = Util.getParticipantsWithName(clazz);
+            for (int i=0; i<2; i++){
+                ObjectModelClass participantClass = (ObjectModelClass) ((List) participantsWithName.get("classParticipants")).get(i);
+                boolean hiddenField = participantClass.equals((ObjectModelClass) attrEditAssoc.getDeclaringElement() );
+                String participantName = (String) ((List) participantsWithName.get("attributeParticipants")).get(i);
+                if (Util.toUpperCaseFirstLetter(participantName).equals(participantClass.getName())) participantName = Util.getClassShortName(participantClass);
+                ListPkAttribute listParticipantPrimaryKey = new ListPkAttribute(model, participantClass, true);        
+                for (int j=0; j<listParticipantPrimaryKey.getName().size(); j++ ){
+                    String fieldName = participantName + Util.toUpperCaseFirstLetter((String) listParticipantPrimaryKey.getName().get(j) );
+                    if (hiddenField ) {
+/*{
+            <field name="<%=fieldName%>"><hidden/></field>
+}*/
+                    } else {
+/*{
+            <field name="<%=fieldName%>" title="<%=uiLabel( fieldName )%>" 
+                use-when="${isAdd}!=null">}*/
+                        if ("date-time".equals(listParticipantPrimaryKey.getType().get(j) ) ) { /*{<date-time/>}*/ }
+                        else { /*{<text/>}*/ }
+                            /*{</field>
+            <field name="<%=fieldName%>" title="<%=uiLabel( fieldName )%>" 
+                use-when="${isAdd}==null"><display/></field>
+}*/                            
+                    }
+               }
+            }    
+        }
         for ( Iterator iter = clazz.getAttributes().iterator(); iter.hasNext(); ){
             ObjectModelAttribute attribute = (ObjectModelAttribute) iter.next();       
-            System.out.println( "          Boucle " + attribute.getName() + "   suivant? " + iter.hasNext()  );
             if (! Util.hasGuiHidden(attribute) ){
                 if (Util.hasGuiCalculated(attribute) ){
 /*{
@@ -353,7 +424,7 @@
 *
 *@author           Olivier.Heintz@nereide.biz
 *@author           malin.nicolas@nereide.biz
-*@version          $Revision: 1.22 $
+*@version          $Revision: 1.23 $
 *@since            3.1
 *
 * This file has been generated, and will be re-generated,
@@ -363,14 +434,11 @@
 
 }*/
 
-      /*
-      ================================
-           Generation Find - Selection - Lookup 
-      ================================
-    */
-
-            if( Util.hasGuiLookup( clazz ) || Util.hasGuiList( clazz ) ){       
-                System.out.println( "Lookup-Find " + clazz.getName() );
+            //================================
+            //     Generation Find - Selection - Lookup 
+            //================================
+            if( Util.hasGuiLookup( clazz ) || Util.hasGuiList( clazz ) || Util.hasGuiListAll( clazz ) ){       
+                //System.out.println( "Lookup-Find " + clazz.getName() );
 /*{
 
 
@@ -407,7 +475,6 @@
                        Generation ListLookup
                   =================================
                 */
-                System.out.println( "ListLookup " + clazz.getName() );
 /*{
 
     <!-- ListLookup -->
@@ -420,7 +487,6 @@
                 for ( iter = listAttListLookup.iterator(); iter.hasNext(); ){
                     att = (ObjectModelAttribute) iter.next();
                     // TODO : completed by the test if classifier
-                    System.out.println( "ListLookup Attribute=" + att.getName() );
 /*{
              <field name="<%=att.getName()%>" title="<%=uiLabel( att )%>"><display/></field>
 
@@ -438,7 +504,6 @@
     //==================================
 
             if( Util.hasGuiShowList( clazz ) ){      
-                System.out.println( "List " + clazz.getName() );
 /*{
 
     <!-- List without link-->
@@ -474,7 +539,7 @@
             //     Generation List whith selection to be able to Edit
             //=========================================
             if (Util.hasGuiList( clazz ) || Util.hasGuiListAll( clazz ) ){
-                System.out.println( "Beginning ListEdit "  );
+                //System.out.println( "Beginning ListEdit "  );
 /*{
 
     <!-- List with link to Edit -->
@@ -489,11 +554,10 @@
             //     Generation SubList whith selection to be able to Edit
             //=========================================
             if (Util.isEditViaAssoc(model, clazz ) ){
-                System.out.println( "Beginning SubListEdit "  );
                 List editAssocList = Util.getEditAssocList(model, clazz);
                 for (Iterator iterED=editAssocList.iterator(); iterED.hasNext(); ){
                     ObjectModelAttribute attributeAssociated = (ObjectModelAttribute) iterED.next();
-                    String fromEntityName = (attributeAssociated.getName().equals(Util.toLowerCaseFirstLetter(clazz.getName() ) ) ) ?
+                    String fromEntityName = (attributeAssociated.getName().equals(Util.toLowerCaseFirstLetter(attributeAssociated.getClassifier().getName() ) ) ) ?
                         Util.toUpperCaseFirstLetter(attributeAssociated.getDeclaringElement().getName() ):
                         Util.toUpperCaseFirstLetter(attributeAssociated.getName() );
                     String entityUriName =  entityName +fromEntityName;
@@ -513,7 +577,6 @@
             //     Generation Edit/Add
             //=================================
             if( Util.hasGuiEdit( clazz ) ){    
-                System.out.println( "Edit " + clazz.getName() );
 /*{
 
     <!-- Edit/Ajout -->
@@ -529,11 +592,10 @@
             //     Generation SubEdit/Add
             //=================================
             if( Util.isEditViaAssoc(model, clazz ) ){    
-                System.out.println( "SubEdit " + clazz.getName() );
                 List editAssocList = Util.getEditAssocList(model, clazz);
                 for (Iterator iterED=editAssocList.iterator(); iterED.hasNext(); ){
                     ObjectModelAttribute attributeAssociated = (ObjectModelAttribute) iterED.next();
-                    String fromEntityName = (attributeAssociated.getName().equals(Util.toLowerCaseFirstLetter(clazz.getName() ) ) ) ?
+                    String fromEntityName = (attributeAssociated.getName().equals(Util.toLowerCaseFirstLetter(attributeAssociated.getClassifier().getName() ) ) ) ?
                         Util.toUpperCaseFirstLetter(attributeAssociated.getDeclaringElement().getName() ):
                         Util.toUpperCaseFirstLetter(attributeAssociated.getName() );
 /*{
@@ -551,8 +613,7 @@
             //=============================
             //     Generation Show
             //=============================
-            if( Util.hasGuiShow( clazz ) ){    //  TODO : add test if there is, at least, one association with guiEditAssoc
-                System.out.println( "Show " + clazz.getName() );
+            if( Util.hasGuiShow( clazz ) || Util.hasGuiEditAssoc( clazz )){    //  TODO : add test if there is, at least, one reverse association with Maxmultiplicity == 1
 /*{
 
     <!-- Show -->

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/Util.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/Util.java:1.20 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/Util.java:1.21
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/Util.java:1.20	Sun Jun 20 21:58:11 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/Util.java	Wed Jun 23 12:31:02 2004
@@ -28,9 +28,9 @@
 * Copyright Code Lutin
 * Copyright Nereide
 * Copyright Neogia
-* @version $Revision: 1.20 $
+* @version $Revision: 1.21 $
 *
-* Last update : $Date: 2004/06/20 21:58:11 $
+* Last update : $Date: 2004/06/23 12:31:02 $
 * by : $Author: holivier $
 */
 package org.nereide.ofbiz.neogia.generators;
@@ -555,6 +555,16 @@
     }
 
     /**
+     *  Give the Association class if exist, otherwise the _attribute.getClassifier. 
+     * @param _attribute
+     * @return the Association class if exist, or the _attribute.getClassifier otherwise.
+     */
+    public static ObjectModelClass getClassAssociated( ObjectModelAttribute _attribute ){
+        if ( _attribute.hasAssociationClass() ) return _attribute.getAssociationClass();
+        return (ObjectModelClass) _attribute.getClassifier();
+    }
+
+    /**
      *  Give the list of all the attribute in the other association which are associated with class with a tag editAsssoc.
      * @param model
      * @param _clazz
@@ -568,6 +578,13 @@
                 ObjectModelAttribute reverseAttribute = attribute.getReverseAttribute();
                 if (reverseAttribute != null && hasGuiEditAssoc(reverseAttribute) ) associationList.add(reverseAttribute );
             }    
+        }
+        if (_clazz instanceof ObjectModelAssociationClass ){
+            Map listMapParticipant =((ObjectModelAssociationClass) _clazz).getParticipants();
+            for (Iterator iterPart=listMapParticipant.keySet().iterator(); iterPart.hasNext(); ){
+                ObjectModelAttribute attribute = (ObjectModelAttribute) listMapParticipant.get( iterPart.next() );
+                if ( hasGuiEditAssoc(attribute  ) ) associationList.add(attribute );
+            }
         }
         List nonNavAttribute = getClassAssocWithoutNav(model, _clazz);
         if (nonNavAttribute.size() > 0 ){

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocBsh.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocBsh.java:1.1 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocBsh.java:1.2
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocBsh.java:1.1	Sun Jun 20 21:58:11 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocBsh.java	Wed Jun 23 12:31:02 2004
@@ -62,7 +62,7 @@
 
 
 /*{
-//  $Id: GeneratorEditAssocBsh.java,v 1.1 2004/06/20 21:58:11 holivier Exp $
+//  $Id: GeneratorEditAssocBsh.java,v 1.2 2004/06/23 12:31:02 holivier Exp $
 //  Copyright (c) 2004 Olivier Heintz - olivier.heintz@nereide.biz
 //  Copyright (c) 2004 Nereide - www.nereide.biz
 //  Copyright (c) 2004 Neogia - www.neogia.org
@@ -82,7 +82,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 //  @author     Olivier.Heintz@nereide.biz
-//  @version    $Revision: 1.1 $
+//  @version    $Revision: 1.2 $
 //  @since      3.1
 //  
 //  Calls Find on a dynamiqueView  to return an EntityListIterator of the
@@ -104,6 +104,7 @@
 import org.ofbiz.entity.GenericDelegator;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.entity.model.DynamicViewEntity;
+import org.ofbiz.entity.model.ModelKeyMap;
 import org.ofbiz.entity.util.EntityUtil;
 import org.ofbiz.entity.util.EntityFindOptions;
 import org.ofbiz.entity.util.EntityListIterator;
@@ -261,9 +262,9 @@
 }*/
         for (Iterator iterAssoc=associationList.iterator(); iterAssoc.hasNext(); ){
             ObjectModelAttribute association = (ObjectModelAttribute) iterAssoc.next();
-            ObjectModelClass classAssociated = (ObjectModelClass) association.getClassifier();
+            ObjectModelClass classAssociated = Util.getClassAssociated( association );
             String subPackageAssoc = (String) Util.initPackageName(classAssociated).get("subpackageName");
-            String fromEntityName = (association.getName().equals(Util.toLowerCaseFirstLetter(classAssociated.getName() ) ) ) ?
+            String fromEntityName = (association.getName().equals(Util.toLowerCaseFirstLetter(association.getClassifier().getName() ) ) ) ?
                 entityName :
                 Util.toUpperCaseFirstLetter(association.getName() );
             String reverseAttributeName = ( association.getReverseAttribute() != null ) ? 
@@ -372,16 +373,14 @@
                     }
                 }
 /*{         
-                dynamicView.addViewLink("EE", "E<%=String.valueOf(nbAssoc)%>", Boolean.TRUE, ModelKeyMap.makeKeyMapList(
-}*/            
+                dynamicView.addViewLink("EE", "E<%=String.valueOf(nbAssoc)%>", Boolean.TRUE, ModelKeyMap.makeKeyMapList( }*/            
                 boolean first = true;
                 for(Iterator iterList=listName.iterator(); iterList.hasNext(); ){
                     Map relationItem = (Map) iterList.next();
                     if ( ! first ){
 /*{, }*/                    
                     }
-/*{
-                "<%=(String) relationItem.get("fieldName")%>","<%=(String) relationItem.get("relFieldName")%>"}*/
+/*{"<%=(String) relationItem.get("fieldName")%>", "<%=(String) relationItem.get("relFieldName")%>"}*/
                     first = false;
                 }
 /*{ )); 

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorControlerXml.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorControlerXml.java:1.10 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorControlerXml.java:1.11
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorControlerXml.java:1.10	Mon Jun 14 22:14:09 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorControlerXml.java	Wed Jun 23 12:31:02 2004
@@ -51,7 +51,7 @@
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  *@author     Olivier.Heintz@nereide.biz
- *@version    $Revision: 1.10 $
+ *@version    $Revision: 1.11 $
  *@since      3.1
  * 
  * This file has been generated, and will be re-generated,
@@ -113,15 +113,21 @@
     </request-map>
 }*/
                     for (Iterator iter=associationList.iterator(); iter.hasNext(); ){
-                        String associationName = ((ObjectModelAttribute) iter.next() ).getName();
+                        ObjectModelAttribute attribute = (ObjectModelAttribute) iter.next();
+                        String associationName = (attribute.hasAssociationClass() ) ?
+                            attribute.getAssociationClass().getName() :
+                            attribute.getClassifier().getName();
+                        String fromEntityName = (attribute.getName().equals(Util.toLowerCaseFirstLetter(attribute.getClassifier().getName() ) ) ) ?
+                            clazz.getName() :
+                            Util.toUpperCaseFirstLetter(attribute.getName());
 /*{
-    <request-map uri="Edit<%=Util.toUpperCaseFirstLetter(associationName)%><%=clazz.getName()%>">
+    <request-map uri="Edit<%=associationName%><%=fromEntityName%>">
         <security https="true" auth="true"/>
         <event type="service" invoke="edit<%=Util.toUpperCaseFirstLetter(associationName)%>"/>
         <response name="success" type="view" value="EditAssoc<%=clazz.getName()%>"/>
         <response name="error"        type="view" value="EditAssoc<%=clazz.getName()%>"/>
     </request-map>
-    <request-map uri="Remove<%=Util.toUpperCaseFirstLetter(associationName)%><%=clazz.getName()%>">
+    <request-map uri="Remove<%=associationName%><%=fromEntityName%>">
         <security https="true" auth="true"/>
         <event type="service" invoke="remove<%=Util.toUpperCaseFirstLetter(associationName)%>"/>
         <response name="success" type="view" value="EditAssoc<%=clazz.getName()%>"/>
@@ -164,26 +170,23 @@
                 subpackageName = Util.getLastWord(Util.getParentPackageName(clazz.getPackageName()));
                 if (Util.hasGuiList(clazz) || Util.hasGuiListAll(clazz)){
 /*{       
-        <view-map name="List<%=clazz.getName()%>" type="jpublish" page="/<%=subpackageName%>/List<%=clazz.getName()%>.ftl"/>
 
+        <view-map name="List<%=clazz.getName()%>" type="jpublish" page="/<%=subpackageName%>/List<%=clazz.getName()%>.ftl"/>
 }*/
                 }
                if (Util.hasGuiEdit(clazz)){
 /*{                
         <view-map name="Edit<%=clazz.getName()%>" type="jpublish" page="/<%=subpackageName%>/Edit<%=clazz.getName()%>.ftl"/>
- 
 }*/
                }
                if (Util.hasGuiEditAssoc(clazz)){
 /*{                
         <view-map name="EditAssoc<%=clazz.getName()%>" type="jpublish" page="/<%=subpackageName%>/EditAssoc<%=clazz.getName()%>.ftl"/>
- 
 }*/
                }
                if (Util.hasGuiShow(clazz)){
 /*{                
         <view-map name="Show<%=clazz.getName()%>" type="jpublish" page="/<%=subpackageName%>/Show<%=clazz.getName()%>.ftl"/>
- 
 }*/
                }
             }

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorUiLabelProperties.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorUiLabelProperties.java:1.4 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorUiLabelProperties.java:1.5
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorUiLabelProperties.java:1.4	Thu Jun 10 08:47:55 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorUiLabelProperties.java	Wed Jun 23 12:31:02 2004
@@ -76,7 +76,7 @@
 #* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #*
 # *@author     Olivier.Heintz@nereide.biz
-# *@version    $Revision: 1.4 $
+# *@version    $Revision: 1.5 $
 # *@since      3.1
 # * 
 # * This file has been generated, and will be re-generated,
@@ -103,6 +103,7 @@
  /*{
 
 #    <%=entityName%>
+#<%=Util.toUpperCaseFirstLetter(packageName)%><%=entityName%>=<%=entityName%>
 }*/
                 if (Util.hasGuiList(clazz) || Util.hasGuiListAll(clazz)){
 /*{                    
@@ -116,6 +117,24 @@
 #<%=Util.toUpperCaseFirstLetter(packageName)%><%=entityName%>Creation=<%=entityName%> Creation
 }*/
                 }
+                if (Util.hasGuiEditAssoc(clazz) ){
+/*{                    
+#<%=Util.toUpperCaseFirstLetter(packageName)%>EditAssoc<%=entityName%>=Edit <%=entityName%> Association
+}*/
+                    List associations = Util.getAssocList(clazz);
+                    for (Iterator iter=associations.iterator(); iter.hasNext(); ){
+                        ObjectModelAttribute association = (ObjectModelAttribute) iter.next();
+/*{
+#<%=Util.toUpperCaseFirstLetter(packageName)%><%=entityName%><%=Util.toUpperCaseFirstLetter(association.getName() )%>Association=<%=entityName%> <%=Util.toUpperCaseFirstLetter(association.getName() )%> Association
+#<%=Util.toUpperCaseFirstLetter(packageName)%>ListOf<%=entityName%><%=Util.toUpperCaseFirstLetter(association.getName() )%>=List of <%=entityName%> <%=Util.toUpperCaseFirstLetter(association.getName() )%>
+}*/
+                    }
+                }
+                if (Util.isEditViaAssoc(model, clazz) ){
+/*{                    
+#<%=Util.toUpperCaseFirstLetter(packageName)%>Add<%=entityName%>=Add <%=entityName%>
+}*/
+                }
                 if (Util.hasGuiShow(clazz)){
 /*{
 #<%=Util.toUpperCaseFirstLetter(packageName)%>Show<%=entityName%>=Show <%=entityName%>
@@ -164,7 +183,6 @@
                         }
                         else {
                             // TODO : uiLabel related to association
-                            // ManufacturingListOfTechDataCalendarCalendarException=List of TechDataCalendar exception
                             // ManufacturingAddCalendarException=Add a Calendar Exception
                         }
                     }

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/ListPkAttribute.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/ListPkAttribute.java:1.2 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/ListPkAttribute.java:1.3
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/ListPkAttribute.java:1.2	Mon Jun 14 22:14:09 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/ListPkAttribute.java	Wed Jun 23 12:31:02 2004
@@ -39,9 +39,9 @@
  * @param clazz
  * @param boolean to say if the ofbizType is an entity OfbizType (true) or java OfbizType (false)
  * @param _classAssoc to be able to test for not retreiving  primaryKey when they coming from _classAssoc.
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  *
- * Last update : $Date: 2004/06/14 22:14:09 $
+ * Last update : $Date: 2004/06/23 12:31:02 $
  * by : $Author: holivier $
  */
 public class ListPkAttribute {
@@ -55,7 +55,6 @@
         listPkAttribute(model, clazz, entity, _classAssoc);
     }
     private void listPkAttribute(ObjectModel model, ObjectModelClass clazz,  boolean entity, ObjectModelClass _classAssoc){
-        System.out.println("XXXXXXX-getMapPrimaryKeyAttr1-Debug clazz="+clazz.getName());
         // search for non navigable association and composite 
         List classAssocWithoutNav = Util.getClassAssocWithoutNav(model, clazz);
         if (classAssocWithoutNav.size() > 0 ){
@@ -129,7 +128,6 @@
             if (entity) this.type.add(Util.getOfbizType(attribute) );
             else this.type.add(Util.getOfbizJavaType(attribute) );
         }
-        System.out.println("XXXXXXX-getMapPrimaryKeyAttr5-Debug  class="+clazz.getName()+" listPrimaryKeys="+this.name);
         return;
 
     }

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFindBsh.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFindBsh.java:1.3 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFindBsh.java:1.4
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFindBsh.java:1.3	Sun Jun 20 21:58:11 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFindBsh.java	Wed Jun 23 12:31:02 2004
@@ -21,13 +21,13 @@
 
     public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException {
         if(! Util.isEntity(clazz)) return;
-        if (! Util.hasGuiList(clazz)) return;
+        if (! Util.hasGuiList(clazz) && ! Util.hasGuiListAll(clazz) ) return;
         Map nameMap = Util.initPackageName(clazz);
         String packageName=(String) nameMap.get("packageName");
         System.out.println("XXXXXXXX1Debug clazz.getName="+clazz.getName());
 
 /*{
-//  $Id: GeneratorFindBsh.java,v 1.3 2004/06/20 21:58:11 holivier Exp $
+//  $Id: GeneratorFindBsh.java,v 1.4 2004/06/23 12:31:02 holivier Exp $
 //  Copyright (c) 2004 Olivier Heintz - olivier.heintz@nereide.biz
 //  Copyright (c) 2004 Nereide - www.nereide.biz
 //  Copyright (c) 2004 Neogia - www.neogia.org
@@ -47,7 +47,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 //  @author     Olivier.Heintz@nereide.biz
-//  @version    $Revision: 1.3 $
+//  @version    $Revision: 1.4 $
 //  @since      3.1
 //  
 //  Calls Find on a dynamiqueView  to return an EntityListIterator of the

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocFtl.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocFtl.java:1.1 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocFtl.java:1.2
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocFtl.java:1.1	Mon Jun 14 22:14:09 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocFtl.java	Wed Jun 23 12:31:02 2004
@@ -59,7 +59,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  * @author     Olivier.Heintz@nereide.biz
- *@version    $Revision: 1.1 $
+ *@version    $Revision: 1.2 $
  *@since      3.1
  * 
  * This file has been generated, and will be re-generated,
@@ -92,7 +92,7 @@
 }*/
         for (Iterator iter=associationList.iterator(); iter.hasNext(); ){
             ObjectModelAttribute association = (ObjectModelAttribute) iter.next();
-            ObjectModelClass classAssociated = (ObjectModelClass) association.getClassifier();
+            ObjectModelClass classAssociated = Util.getClassAssociated( association );
             nameMap = Util.initPackageName(classAssociated);
             String packageNameAssoc = Util.toUpperCaseFirstLetter((String) nameMap.get("packageName") );
 
@@ -142,7 +142,7 @@
 }*/
         for (Iterator iter=associationList.iterator(); iter.hasNext(); ){
             ObjectModelAttribute association = (ObjectModelAttribute) iter.next();
-            ObjectModelClass classAssociated = (ObjectModelClass) association.getClassifier();
+            ObjectModelClass classAssociated = Util.getClassAssociated( association );
             nameMap = Util.initPackageName(classAssociated);
             String packageNameAssoc = Util.toUpperCaseFirstLetter((String) nameMap.get("packageName") );