Bug fixed [0000396] Converted AttributeSetInstance to a single html
authorDavid Baz Fayos <david.baz@openbravo.com>
Wed, 21 May 2008 22:38:10 +0000
changeset 987 29550073f826
parent 986 27d61914617c
child 988 9fded9ba709c
Bug fixed [0000396] Converted AttributeSetInstance to a single html
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
src-wad/src/org/openbravo/wad/controls/WADPAttribute.java
src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Receipt.html
src/org/openbravo/erpCommon/ad_reports/ABCbPartner.html
src/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas_Config.html
src/org/openbravo/erpCommon/info/AttributeSetInstance.html
src/org/openbravo/erpCommon/info/AttributeSetInstance.java
src/org/openbravo/erpCommon/info/AttributeSetInstance.xml
src/org/openbravo/erpCommon/info/AttributeSetInstance_F1.html
src/org/openbravo/erpCommon/info/AttributeSetInstance_F1.xml
src/org/openbravo/erpCommon/info/AttributeSetInstance_F2.html
src/org/openbravo/erpCommon/info/AttributeSetInstance_F2.xml
src/org/openbravo/erpCommon/info/AttributeSetInstance_FS.html
src/org/openbravo/erpCommon/info/AttributeSetInstance_FS.xml
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Wed May 21 17:43:38 2008 +0000
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Wed May 21 22:38:10 2008 +0000
@@ -3694,67 +3694,17 @@
 <!--801044 CREATEDBY-->
 <!--801044-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
 <!--801044 UPDATED-->
-<!--801044-->              <UPDATED><![CDATA[2006-05-22 17:34:27.0]]></UPDATED>
+<!--801044-->              <UPDATED><![CDATA[2008-05-21 17:34:27.0]]></UPDATED>
 <!--801044 UPDATEDBY-->
 <!--801044-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
 <!--801044 AD_MODEL_OBJECT_ID-->
 <!--801044-->              <AD_MODEL_OBJECT_ID><![CDATA[800785]]></AD_MODEL_OBJECT_ID>
 <!--801044 MAPPINGNAME-->
-<!--801044-->              <MAPPINGNAME><![CDATA[/info/AttributeSetInstance_FS.html]]></MAPPINGNAME>
+<!--801044-->              <MAPPINGNAME><![CDATA[/info/AttributeSetInstance.html]]></MAPPINGNAME>
 <!--801044 ISDEFAULT-->
 <!--801044-->              <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--801044**************--></AD_MODEL_OBJECT_MAPPING>
 
-<!--801045**************--><AD_MODEL_OBJECT_MAPPING>
-<!--801045 AD_MODEL_OBJECT_MAPPING_ID-->
-<!--801045-->              <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[801045]]></AD_MODEL_OBJECT_MAPPING_ID>
-<!--801045 AD_CLIENT_ID-->
-<!--801045-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--801045 AD_ORG_ID-->
-<!--801045-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--801045 ISACTIVE-->
-<!--801045-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801045 CREATED-->
-<!--801045-->              <CREATED><![CDATA[2006-05-22 17:34:29.0]]></CREATED>
-<!--801045 CREATEDBY-->
-<!--801045-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
-<!--801045 UPDATED-->
-<!--801045-->              <UPDATED><![CDATA[2006-05-22 17:34:29.0]]></UPDATED>
-<!--801045 UPDATEDBY-->
-<!--801045-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
-<!--801045 AD_MODEL_OBJECT_ID-->
-<!--801045-->              <AD_MODEL_OBJECT_ID><![CDATA[800785]]></AD_MODEL_OBJECT_ID>
-<!--801045 MAPPINGNAME-->
-<!--801045-->              <MAPPINGNAME><![CDATA[/info/AttributeSetInstance_F1.html]]></MAPPINGNAME>
-<!--801045 ISDEFAULT-->
-<!--801045-->              <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
-<!--801045**************--></AD_MODEL_OBJECT_MAPPING>
-
-<!--801046**************--><AD_MODEL_OBJECT_MAPPING>
-<!--801046 AD_MODEL_OBJECT_MAPPING_ID-->
-<!--801046-->              <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[801046]]></AD_MODEL_OBJECT_MAPPING_ID>
-<!--801046 AD_CLIENT_ID-->
-<!--801046-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--801046 AD_ORG_ID-->
-<!--801046-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--801046 ISACTIVE-->
-<!--801046-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801046 CREATED-->
-<!--801046-->              <CREATED><![CDATA[2006-05-22 17:34:32.0]]></CREATED>
-<!--801046 CREATEDBY-->
-<!--801046-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
-<!--801046 UPDATED-->
-<!--801046-->              <UPDATED><![CDATA[2006-05-22 17:34:32.0]]></UPDATED>
-<!--801046 UPDATEDBY-->
-<!--801046-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
-<!--801046 AD_MODEL_OBJECT_ID-->
-<!--801046-->              <AD_MODEL_OBJECT_ID><![CDATA[800785]]></AD_MODEL_OBJECT_ID>
-<!--801046 MAPPINGNAME-->
-<!--801046-->              <MAPPINGNAME><![CDATA[/info/AttributeSetInstance_F2.html]]></MAPPINGNAME>
-<!--801046 ISDEFAULT-->
-<!--801046-->              <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
-<!--801046**************--></AD_MODEL_OBJECT_MAPPING>
-
 <!--801047**************--><AD_MODEL_OBJECT_MAPPING>
 <!--801047 AD_MODEL_OBJECT_MAPPING_ID-->
 <!--801047-->              <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[801047]]></AD_MODEL_OBJECT_MAPPING_ID>
--- a/src-wad/src/org/openbravo/wad/controls/WADPAttribute.java	Wed May 21 17:43:38 2008 +0000
+++ b/src-wad/src/org/openbravo/wad/controls/WADPAttribute.java	Wed May 21 22:38:10 2008 +0000
@@ -59,7 +59,7 @@
     if (!getData("IsReadOnly").equals("Y") && !getData("IsReadOnlyTab").equals("Y")) {
       StringBuffer commandScript = new StringBuffer();
       StringBuffer text = new StringBuffer();
-      commandScript.append("openPAttribute(null, null, '../info/AttributeSetInstance_FS.html', ");
+      commandScript.append("openPAttribute(null, null, '../info/AttributeSetInstance.html', ");
       commandScript.append("null, true, 'frmMain', 'inp").append(getData("ColumnNameInp")).append("', ");
       commandScript.append("'inp").append(getData("ColumnNameInp")).append("_R', ");
       commandScript.append("inputValue(document.frmMain.inp").append(getData("ColumnNameInp")).append("_R), ");
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Receipt.html	Wed May 21 17:43:38 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Receipt.html	Wed May 21 22:38:10 2008 +0000
@@ -169,7 +169,7 @@
           <TR> 
             <TD > <INPUT type="text" size="20"  name="inpmAttributesetinstanceId_D" readonly="true"></INPUT>
             </TD>
-            <TD > <A href="#" onclick="openPAttribute(null, null, '../info/AttributeSetInstance_FS.html', null, false, 'frmMain', 'inpmAttributesetinstanceId', 'inpmAttributesetinstanceId_D', document.frmMain.inpmAttributesetinstanceId_D.value, 'WindowID', document.frmMain.inpWindowId.value, 'inpKeyValue', document.frmMain.inpmAttributesetinstanceId.value, 'inpwindowId', document.frmMain.inpWindowId.value, 'inpProduct', document.frmMain.inpmProductId.value);return false;" onmouseout="window.status='';return true;" onmouseover="window.status='Search';return true;" > 
+            <TD > <A href="#" onclick="openPAttribute(null, null, '../info/AttributeSetInstance.html', null, false, 'frmMain', 'inpmAttributesetinstanceId', 'inpmAttributesetinstanceId_D', document.frmMain.inpmAttributesetinstanceId_D.value, 'WindowID', document.frmMain.inpWindowId.value, 'inpKeyValue', document.frmMain.inpmAttributesetinstanceId.value, 'inpwindowId', document.frmMain.inpWindowId.value, 'inpProduct', document.frmMain.inpmProductId.value);return false;" onmouseout="window.status='';return true;" onmouseover="window.status='Search';return true;" > 
             <img  alt="Attribute Set Instance" title="Attribute set instance" width="16" height="16" border="0" src="../../../../../web/images/AttributeSetInstance.jpg"></IMG></A></TD>
           </TR>
         </TABLE></TD>
--- a/src/org/openbravo/erpCommon/ad_reports/ABCbPartner.html	Wed May 21 17:43:38 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ABCbPartner.html	Wed May 21 22:38:10 2008 +0000
@@ -222,7 +222,7 @@
                                   <tr>
                                     <td ><input type="text" size="14"  name="inpmAttributesetinstanceId_D" id="fieldAttributeName" value="xxV" readonly="true" /></td>
 
-                                    <td ><a href="#" onclick="openPAttribute(null, null, '../info/AttributeSetInstance_FS.html', null, false, 'frmMain', 'inpmAttributesetinstanceId', 'inpmAttributesetinstanceId_D', document.frmMain.inpmAttributesetinstanceId_D.value, 'WindowID', 'Rpt_Etiquetas', 'inpKeyValue', document.frmMain.inpmAttributesetinstanceId.value, 'inpwindowId', 'Rpt_Etiquetas', 'inpProduct', document.frmMain.inpmProductId.value);return false;" onmouseout="window.status='';return true;" onmouseover="window.status='Search';return true;"><img alt="Attribute Set Instance" width="20" height="20" border="0" src="../../../../../web/images/AttributeSetInstance.jpg" /></a></td>
+                                    <td ><a href="#" onclick="openPAttribute(null, null, '../info/AttributeSetInstance.html', null, false, 'frmMain', 'inpmAttributesetinstanceId', 'inpmAttributesetinstanceId_D', document.frmMain.inpmAttributesetinstanceId_D.value, 'WindowID', 'Rpt_Etiquetas', 'inpKeyValue', document.frmMain.inpmAttributesetinstanceId.value, 'inpwindowId', 'Rpt_Etiquetas', 'inpProduct', document.frmMain.inpmProductId.value);return false;" onmouseout="window.status='';return true;" onmouseover="window.status='Search';return true;"><img alt="Attribute Set Instance" width="20" height="20" border="0" src="../../../../../web/images/AttributeSetInstance.jpg" /></a></td>
                                   </tr>
                                 </table>
                               </td>
--- a/src/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas_Config.html	Wed May 21 17:43:38 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas_Config.html	Wed May 21 22:38:10 2008 +0000
@@ -287,7 +287,7 @@
                           <INPUT class="dojoValidateValid TextBox_btn_TwoCells_width" type="text"  name="inpmAttributesetinstanceId_D" maxlength="20" value="" id="fieldAttributeName"></INPUT>
                         </TD>
                         <TD class="FieldButton_ContentCell">
-                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Attribute'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"  onclick="openPAttribute(null, null, '../info/AttributeSetInstance_FS.html', null, false, 'frmMain', 'inpmAttributesetinstanceId', 'inpmAttributesetinstanceId_D', document.frmMain.inpmAttributesetinstanceId_D.value, 'WindowID', 'Rpt_Etiquetas', 'inpKeyValue', document.frmMain.inpmAttributesetinstanceId.value, 'inpwindowId', 'Rpt_Etiquetas', 'inpProduct', document.frmMain.inpmProductId.value);return false;">
+                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Attribute'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"  onclick="openPAttribute(null, null, '../info/AttributeSetInstance.html', null, false, 'frmMain', 'inpmAttributesetinstanceId', 'inpmAttributesetinstanceId_D', document.frmMain.inpmAttributesetinstanceId_D.value, 'WindowID', 'Rpt_Etiquetas', 'inpKeyValue', document.frmMain.inpmAttributesetinstanceId.value, 'inpwindowId', 'Rpt_Etiquetas', 'inpProduct', document.frmMain.inpmProductId.value);return false;">
                           <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Attribute';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
                             <TR>
                               <TD class="FieldButton_bg">
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/erpCommon/info/AttributeSetInstance.html	Wed May 21 22:38:10 2008 +0000
@@ -0,0 +1,216 @@
+<!--
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License. 
+ * The Original Code is Openbravo ERP. 
+ * The Initial Developer of the Original Code is Openbravo SL 
+ * All portions are Copyright (C) 2001-2007 Openbravo SL 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+-->
+<HTML>
+<HEAD>
+<TITLE>Attribute selector</TITLE>
+
+<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"></LINK> 
+
+<LINK rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"></LINK>
+
+<script language="JavaScript" type="text/javascript" id="paramDirection">
+var baseDirection = "../../../../../web/";
+</script> 
+<SCRIPT language="JavaScript" src="../../../../../web/js/messages.js" type="text/javascript"></SCRIPT>
+<SCRIPT language="JavaScript" src="../utility/MessagesJS.js" type="text/javascript"></SCRIPT>
+<script language="JavaScript" type="text/javascript" id="paramLanguage">
+  var LNG_POR_DEFECTO = "en_US";
+</script>
+<script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
+<SCRIPT language="JavaScript" src="../../../../../web/js/searchs.js" type="text/javascript"></SCRIPT>
+<SCRIPT language="JavaScript" src="../../../../../web/js/jscalendar/calendar.js" type="text/javascript"></SCRIPT>
+<SCRIPT language="JavaScript" src="../../../../../web/js/jscalendar/lang/calendar-es.js" type="text/javascript" id="fieldCalendar"></SCRIPT>
+<script language="JavaScript" src="../../../../../web/js/default/DateTextBox.js" type="text/javascript"></script>
+<SCRIPT language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></SCRIPT>
+<SCRIPT language="JavaScript" src="../../../../../web/js/default/MessageBox.js" type="text/javascript"></SCRIPT>
+<script language="JavaScript" src="../../../../../web/js/messages.js" type="text/javascript"></script>
+<SCRIPT language="JavaScript" src="../utility/MessagesJS.js" type="text/javascript"></SCRIPT>
+<script language="JavaScript" src="../../../../../web/js/dojoConfig.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript"></script>
+<SCRIPT language="JavaScript" type="text/javascript">
+function printMessage(msg) {
+	if (msg!=null && msg != "") alert(msg);
+	var clave = document.frmMain.inpInstance.value;
+	var texto = document.frmMain.inpDescription.value;
+	top.opener.closeSearch("SAVE", clave, texto, null);
+	return true;
+}
+</SCRIPT>
+<SCRIPT language="JavaScript" type="text/javascript" id="paramScript">
+function onloadFunctions() {
+  return true;
+}
+</SCRIPT>
+<script language="JavaScript" type="text/javascript">
+function depurarSelector(action) {
+	if (action=="SAVE") {
+		submitCommandForm("SAVE");
+	} else top.opener.closeSearch(action, "", "", null);
+	return true;
+}
+</script>
+	<SCRIPT language="JavaScript" type="text/javascript">
+	function onLoadDo(){
+		this.windowTables = new Array(
+		  new windowTableId('client', 'superior', 'buttonOK', 'inferior'),
+		  new windowTableId('client', 'inferior', 'buttonOK', 'inferior')
+		);
+		setWindowTableParentElement();
+		enableShortcuts('popup');
+		
+		resizePopup();
+		try {
+		  onloadFunctions();
+		} catch (e) {}
+		xx();
+
+		setWindowElementFocus('firstElement');
+	}
+
+	function onResizeDo(){
+		resizePopup();
+	}
+	</SCRIPT>
+</HEAD>
+<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();xx();" onresize="onResizeDo();" id="paramBody">
+<FORM name="frmMain" method="POST" action="AttributeSetInstance.html">
+  <INPUT type="hidden" name="Command">
+<INPUT type="hidden" name="IsPopUpCall" value="1">
+  <INPUT type="hidden" name="inpAttribute" value="" id="paramAttribute"> 
+  <INPUT type="hidden" name="inpInstance" value="" id="paramInstance"> 
+  <INPUT type="hidden" name="inpProduct" value="" id="paramProduct">
+  <INPUT type="hidden" name="inpDescription" value="" id="paramDescriptionHidden"> 
+  <INPUT type="hidden" name="inpwindowId" value="" id="paramWindowId"> 
+  <INPUT type="hidden" name="inpTabId" value="" id="paramTabId"> 
+  <INPUT type="hidden" name="inpLocatorId" value="" id="paramLocatorId"> 
+  
+  
+  <div class="Popup_ContentPane_CircleLogo">
+  <div class="Popup_WindowLogo">
+    <img class="Popup_WindowLogo_Icon Popup_WindowLogo_Icon_attribute" src="../../../../../web/images/blank.gif" border=0/></img>
+  </div>
+</div>
+
+<table cellspacing="0" cellpadding="0" width="100%" id="table_header">
+  <tr>
+    <td>
+      <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_NavBar" id="tdToolBar">
+        <tr class="Popup_NavBar_bg"><td></td>
+          <td class="Popup_NavBar_separator_cell"></td>
+          <td class="Popup_NavBar_bg_logo_left"></td>
+          <td class="Popup_NavBar_bg_logo" width="1" onclick="abrirNuevoBrowser('http://www.openbravo.com', 'Openbravo');return false;"><IMG src="../../../../../web/images/blank.gif" alt="Openbravo" title="Openbravo" border="0" id="openbravoLogo" class="Popup_NavBar_logo" /></td>
+          <td class="Popup_NavBar_bg_logo_right"></td>
+          <td class="Popup_NavBar_Popup_title_cell"><span>Attribute</span></td>
+          <td class="Popup_NavBar_separator_cell"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+
+  <tr>
+    <td>
+      <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_SeparatorBar" id="tdtopTabs">
+        <tr>
+          <td class="Popup_SeparatorBar_bg"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+
+<table cellspacing="0" cellpadding="0" width="100%">
+  <tr>
+    <td>
+      <div class="Popup_ContentPane_Client" style="overflow: auto; display: none;" id="client">
+        <table cellspacing="0" cellpadding="0" class="Popup_Client_TablePopup">
+
+          <tr>
+            <td class="TableEdition_OneCell_width"></td>
+            <td class="TableEdition_OneCell_width"></td>
+            <td class="TableEdition_OneCell_width"></td>
+            <td class="TableEdition_OneCell_width"></td>
+          </tr>
+          <div id="paramData">
+            <tr class="discard">
+              <td class="TitleCell discard"><SPAN class="LabelText" id="fieldAttributeName">xxattribute name</SPAN></td>
+              <td class="Combo_ContentCell" colspan="2">
+                <SELECT class="Combo Combo_OneCell_width" name="inpmAttribute" id="reportM_Attributevalue_ID">
+                </SELECT>
+              </td>
+              <td/>
+            </tr>
+            
+            <tr class="discard">
+              <td class="TitleCell"><SPAN class="LabelText">xxattribute name</SPAN></td>
+              <td class="Combo_ContentCell" colspan="2">
+                <SELECT class="Combo Combo_TwoCells_width"name="inpAttributeValues" id="inpAttributeValues">
+                </SELECT>
+              </td>
+              <td/>
+            </tr>
+          </div>
+          <tr>
+            <td class="TitleCell"><SPAN class="LabelText" id="paramNameDescription">Description</SPAN></td>
+            <td class="ContentCell" colspan="2"><span class="Label_ReadOnly_Text" id="paramDescription">xx</span></td>
+            <td/>
+          </tr>
+          <tr><td height="20px"></td></tr>
+          <tr>
+            <td class="TitleCell"></td>
+            <td class="Button_RightAlign_ContentCell">
+              <div>
+                <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='OK'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onclick="depurarSelector('SAVE');return false;" id="buttonOK">
+                  <table class="Button" onmousedown="this.className='Button_active'; return true;" onmouseup="this.className='Button'; return true;" onmouseover="this.className='Button_hover'; window.status='OK'; return true;" onmouseout="this.className='Button'; window.status=''; return true;">
+                    <tr>
+                      <td class="Button_left"><img class="Button_Icon Button_Icon_ok" alt="OK" title="OK" src="../web/images/blank.gif" border="0"></img></td>
+                      <td class="Button_text Button_width">OK</td>
+                      <td class="Button_right"></td>
+                    </tr>
+                  </table>
+                </a>
+              </div>
+            </td>
+            <td class="Button_LeftAlign_ContentCell">
+              <div>
+                <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Cancel'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onclick="depurarSelector('CLEAR');return false;">
+                  <table class="Button" onmousedown="this.className='Button_active'; return true;" onmouseup="this.className='Button'; return true;" onmouseover="this.className='Button_hover'; window.status='Cancel'; return true;" onmouseout="this.className='Button'; window.status=''; return true;">
+                    <tr>
+
+                      <td class="Button_left"><img class="Button_Icon Button_Icon_cancel" alt="Cancel" title="Cancel" src="../web/images/blank.gif" border="0"></img></td>
+                      <td class="Button_text Button_width">Cancel</td>
+                      <td class="Button_right"></td>
+                    </tr>
+                  </table>
+                </a>
+              </div>
+            </td>
+            <td class="TitleCell"></td>
+
+          </tr>
+        </table>
+      </div>
+    </td>
+   </tr>
+  </table>
+ </FORM>
+    
+</BODY>
+</HTML>
--- a/src/org/openbravo/erpCommon/info/AttributeSetInstance.java	Wed May 21 17:43:38 2008 +0000
+++ b/src/org/openbravo/erpCommon/info/AttributeSetInstance.java	Wed May 21 22:38:10 2008 +0000
@@ -68,8 +68,8 @@
       vars.setSessionValue("AttributeSetInstance.productInstance", strProductInstance);
       vars.setSessionValue("AttributeSetInstance.close", "N");
       if (strAttributeSet.equals("") || strAttributeSet.equals("0")) advisePopUp(response, "Info", Utility.messageBD(this, "PAttributeNoSelection", vars.getLanguage()));
-      else printPageFS(response, vars);
-    } else if (vars.commandIn("FRAME1")) {
+      else response.sendRedirect(strDireccion + request.getServletPath() + "?Command=DISPLAY");
+    } else if (vars.commandIn("DISPLAY")) {
       String strNameValue = vars.getGlobalVariable("inpInstance", "AttributeSetInstance.instance", "");
       String strAttributeSet = vars.getGlobalVariable("inpAttribute", "AttributeSetInstance.attribute");
       String strProductInstance = vars.getGlobalVariable("inpProductInstance", "AttributeSetInstance.productInstance", "");
@@ -79,10 +79,8 @@
       String strProduct = vars.getGlobalVariable("inpProduct", "AttributeSetInstance.product", "");
       String strIsSOTrx = Utility.getContext(this, vars, "isSOTrx", strWindowId);
       if (log4j.isDebugEnabled()) log4j.debug("strNameValue: " + strNameValue);
-      if (!strAttributeSet.equals("")) printPageFrame1(response, vars, strNameValue, strAttributeSet, strProductInstance, strWindowId, strTabId, strLocator, strIsSOTrx, strProduct);
+      if (!strAttributeSet.equals("")) printPage(response, vars, strNameValue, strAttributeSet, strProductInstance, strWindowId, strTabId, strLocator, strIsSOTrx, strProduct);
       else advisePopUp(response, "Info", Utility.messageBD(this, "PAttributeNoSelection", vars.getLanguage()));
-    } else if (vars.commandIn("FRAME2")) {
-      printPageFrame2(response, vars);
     } else if (vars.commandIn("SAVE")) {
       String strAttributeSet = vars.getRequiredStringParameter("inpAttribute");
       String strInstance = vars.getStringParameter("inpInstance");
@@ -95,7 +93,7 @@
       vars.setSessionValue("AttributeSetInstance.close", "Y");
       vars.setMessage(strTabId,myMessage);
       //vars.setSessionValue("AttributeSetInstance.message", strMessage);      
-      response.sendRedirect(strDireccion + request.getServletPath() + "?Command=FRAME1");
+      response.sendRedirect(strDireccion + request.getServletPath() + "?Command=DISPLAY");
     } else pageErrorPopUp(response);
   }
 
@@ -242,19 +240,9 @@
     return myMessage;
   }
 
-  void printPageFS(HttpServletResponse response, VariablesSecureApp vars) throws IOException, ServletException {
-    if (log4j.isDebugEnabled()) log4j.debug("Output: Frame Set del buscador de atributos");
-    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/AttributeSetInstance_FS").createXmlDocument();
-
-    response.setContentType("text/html; charset=UTF-8");
-    PrintWriter out = response.getWriter();
-    out.println(xmlDocument.print());
-    out.close();
-  }
-
-  void printPageFrame1(HttpServletResponse response, VariablesSecureApp vars, String strInstance, String strAttributeSet, String strProductInstance, String strWindowId, String strTabId, String strLocator, String strIsSOTrx, String strProduct) throws IOException, ServletException {
+  void printPage(HttpServletResponse response, VariablesSecureApp vars, String strInstance, String strAttributeSet, String strProductInstance, String strWindowId, String strTabId, String strLocator, String strIsSOTrx, String strProduct) throws IOException, ServletException {
     if (log4j.isDebugEnabled()) log4j.debug("Output: Frame 1 of the attributes seeker");
-    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/AttributeSetInstance_F1").createXmlDocument();
+    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/AttributeSetInstance").createXmlDocument();
 
     xmlDocument.setParameter("calendar", vars.getLanguage().substring(0,2));
     xmlDocument.setParameter("direction", "var baseDirection = \"" + strReplaceWith + "/\";\n");
@@ -481,18 +469,6 @@
     return Replace.replace(Replace.replace(Replace.replace(Replace.replace(Replace.replace(Replace.replace(strIni, "#", "")," ",""),"&",""),",",""),"(",""),")","");
   }
 
-  void printPageFrame2(HttpServletResponse response, VariablesSecureApp vars) throws IOException, ServletException {
-    if (log4j.isDebugEnabled()) log4j.debug("Output: Frame 3 of the attributes seeker");
-    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/AttributeSetInstance_F2").createXmlDocument();
-    xmlDocument.setParameter("direction", "var baseDirection = \"" + strReplaceWith + "/\";\n");
-    xmlDocument.setParameter("language", "LNG_POR_DEFECTO=\"" + vars.getLanguage() + "\";");
-    xmlDocument.setParameter("theme", vars.getTheme());
-    response.setContentType("text/html; charset=UTF-8");
-    PrintWriter out = response.getWriter();
-    out.println(xmlDocument.print());
-    out.close();
-  }
-
   public String getServletInfo() {
     return "Servlet that presents attributes seeker";
   } // end of getServletInfo() method
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/erpCommon/info/AttributeSetInstance.xml	Wed May 21 22:38:10 2008 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License. 
+ * The Original Code is Openbravo ERP. 
+ * The Initial Developer of the Original Code is Openbravo SL 
+ * All portions are Copyright (C) 2001-2006 Openbravo SL 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+-->
+<REPORT>
+	<template file="AttributeSetInstance.html"/>
+	<PARAMETER id="fieldCalendar" name="calendar" attribute="src" replace="es" default="en"/>
+	<PARAMETER id="paramDirection" name="direction" default=""/>
+	<PARAMETER id="paramLanguage" name="language" default=""/>
+	<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
+	<PARAMETER id="paramWindowId" name="windowId" attribute="value" default=""/>
+  <PARAMETER id="paramTabId" name="tabId" attribute="value" default=""/>
+  <PARAMETER id="paramAttribute" name="attribute" attribute="value"/>
+	<PARAMETER id="paramInstance" name="instance" attribute="value"/>
+	<PARAMETER id="paramProduct" name="product" attribute="value"/>
+	<PARAMETER id="paramLocatorId" name="locatorId" attribute="value"/>
+	<PARAMETER id="paramData" name="data"/>
+	<PARAMETER id="paramNameDescription" name="nameDescription"/>
+	<PARAMETER id="paramDescription" name="description"/>
+	<PARAMETER id="paramDescriptionHidden" name="description" attribute="value"/>
+	<PARAMETER id="paramScript" name="script"/>
+	<PARAMETER id="messageBoxID" name="messageType" attribute="class" replace="yy" default="HIDDEN"/>
+	<PARAMETER id="messageBoxIDTitle" name="messageTitle" default=""/>
+	<PARAMETER id="messageBoxIDMessage" name="messageMessage" default=""/>
+    <PARAMETER id="paramBody" name="body" attribute="onload" replace="xx();"/>
+	<DISCARD id="discard"/>
+</REPORT>
--- a/src/org/openbravo/erpCommon/info/AttributeSetInstance_F1.html	Wed May 21 17:43:38 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2007 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<HTML>
-<HEAD>
-<TITLE>Attribute selector</TITLE>
-
-<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"></LINK> 
-
-<LINK rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"></LINK>
-
-<script language="JavaScript" type="text/javascript" id="paramDirection">
-var baseDirection = "../../../../../web/";
-</script> 
-<SCRIPT language="JavaScript" src="../../../../../web/js/messages.js" type="text/javascript"></SCRIPT>
-<SCRIPT language="JavaScript" src="../utility/MessagesJS.js" type="text/javascript"></SCRIPT>
-<script language="JavaScript" type="text/javascript" id="paramLanguage">
-  var LNG_POR_DEFECTO = "en_US";
-</script>
-<script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
-<script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
-<script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
-<SCRIPT language="JavaScript" src="../../../../../web/js/searchs.js" type="text/javascript"></SCRIPT>
-<SCRIPT language="JavaScript" src="../../../../../web/js/jscalendar/calendar.js" type="text/javascript"></SCRIPT>
-<SCRIPT language="JavaScript" src="../../../../../web/js/jscalendar/lang/calendar-es.js" type="text/javascript" id="fieldCalendar"></SCRIPT>
-<script language="JavaScript" src="../../../../../web/js/default/DateTextBox.js" type="text/javascript"></script>
-<SCRIPT language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></SCRIPT>
-<SCRIPT language="JavaScript" src="../../../../../web/js/default/MessageBox.js" type="text/javascript"></SCRIPT>
-<script language="JavaScript" src="../../../../../web/js/messages.js" type="text/javascript"></script>
-<SCRIPT language="JavaScript" src="../utility/MessagesJS.js" type="text/javascript"></SCRIPT>
-<script language="JavaScript" src="../../../../../web/js/dojoConfig.js" type="text/javascript"></script>
-<script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript"></script>
-<SCRIPT language="JavaScript" type="text/javascript">
-function printMessage(msg) {
-	if (msg!=null && msg != "") alert(msg);
-	var clave = document.frmMain.inpInstance.value;
-	var texto = document.frmMain.inpDescription.value;
-	top.opener.closeSearch("SAVE", clave, texto, null);
-	return true;
-}
-</SCRIPT>
-<SCRIPT language="JavaScript" type="text/javascript" id="paramScript">
-function onloadFunctions() {
-  return true;
-}
-</SCRIPT>
-	<SCRIPT language="JavaScript" type="text/javascript">
-	function onLoadDo(){
-		this.windowTables = new Array(
-		  new windowTableId('client', 'superior', 'buttonOK', 'inferior'),
-		  new windowTableId('client', 'inferior', 'buttonOK', 'inferior')
-		);
-		setWindowTableParentElement();
-		enableShortcuts('popup');
-		
-		resizeArea();
-		try {
-		  onloadFunctions();
-		} catch (e) {}
-		xx();
-
-		setWindowElementFocus('firstElement');
-	}
-
-	function onResizeDo(){
-		resizeArea();
-	}
-	</SCRIPT>
-</HEAD>
-<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();xx();" onresize="onResizeDo();" id="paramBody">
-<FORM name="frmMain" method="POST" action="AttributeSetInstance_F1.html" target="_parent">
-  <INPUT type="hidden" name="Command">
-<INPUT type="hidden" name="IsPopUpCall" value="1">
-  <INPUT type="hidden" name="inpAttribute" value="" id="paramAttribute"> 
-  <INPUT type="hidden" name="inpInstance" value="" id="paramInstance"> 
-  <INPUT type="hidden" name="inpProduct" value="" id="paramProduct">
-  <INPUT type="hidden" name="inpDescription" value="" id="paramDescriptionHidden"> 
-  <INPUT type="hidden" name="inpwindowId" value="" id="paramWindowId"> 
-  <INPUT type="hidden" name="inpTabId" value="" id="paramTabId"> 
-  <INPUT type="hidden" name="inpLocatorId" value="" id="paramLocatorId"> 
-  
-  
-  <div class="Popup_ContentPane_CircleLogo">
-  <div class="Popup_WindowLogo">
-    <img class="Popup_WindowLogo_Icon Popup_WindowLogo_Icon_attribute" src="../../../../../web/images/blank.gif" border=0/></img>
-  </div>
-</div>
-
-<table cellspacing="0" cellpadding="0" width="100%">
-
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_NavBar" id="tdToolBar">
-        <tr class="Popup_NavBar_bg"><td></td>
-          <td class="Popup_NavBar_separator_cell"></td>
-          <td class="Popup_NavBar_bg_logo_left"></td>
-          <td class="Popup_NavBar_bg_logo" width="1" onclick="abrirNuevoBrowser('http://www.openbravo.com', 'Openbravo');return false;"><IMG src="../../../../../web/images/blank.gif" alt="Openbravo" title="Openbravo" border="0" id="openbravoLogo" class="Popup_NavBar_logo" /></td>
-          <td class="Popup_NavBar_bg_logo_right"></td>
-          <td class="Popup_NavBar_Popup_title_cell"><span>Attribute</span></td>
-          <td class="Popup_NavBar_separator_cell"></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_SeparatorBar" id="tdtopTabs">
-        <tr>
-          <td class="Popup_SeparatorBar_bg"></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  
-  <tr>
-    <td>
-      <div class="Popup_Client_TablePopup" style="padding: 0px; margin: 0px; overflow: auto;" id="client">
-        <table cellspacing="0" cellpadding="0" class="Popup_Client_TablePopup">
-
-          <tr>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-          </tr>
-          <div id="paramData">
-            <tr class="discard">
-              <td class="TitleCell discard"><SPAN class="LabelText" id="fieldAttributeName">xxattribute name</SPAN></td>
-              <td class="Combo_ContentCell" colspan="2">
-                <SELECT class="Combo Combo_OneCell_width" name="inpmAttribute" id="reportM_Attributevalue_ID">
-                </SELECT>
-              </td>
-              <td/>
-            </tr>
-            
-            <tr class="discard">
-              <td class="TitleCell"><SPAN class="LabelText">xxattribute name</SPAN></td>
-              <td class="Combo_ContentCell" colspan="2">
-                <SELECT class="Combo Combo_TwoCells_width"name="inpAttributeValues" id="inpAttributeValues">
-                </SELECT>
-              </td>
-              <td/>
-            </tr>
-          </div>
-          <tr>
-            <td class="TitleCell"><SPAN class="LabelText" id="paramNameDescription">Description</SPAN></td>
-            <td class="ContentCell" colspan="2"><span class="Label_ReadOnly_Text" id="paramDescription">xx</span></td>
-            <td/>
-          </tr>
-        </table>
-      </div>
-    </td>
-   </tr>
-  </table>
- </FORM>
-    
-</BODY>
-</HTML>
--- a/src/org/openbravo/erpCommon/info/AttributeSetInstance_F1.xml	Wed May 21 17:43:38 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<REPORT>
-	<template file="AttributeSetInstance_F1.html"/>
-	<PARAMETER id="fieldCalendar" name="calendar" attribute="src" replace="es" default="en"/>
-	<PARAMETER id="paramDirection" name="direction" default=""/>
-	<PARAMETER id="paramLanguage" name="language" default=""/>
-	<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
-	<PARAMETER id="paramWindowId" name="windowId" attribute="value" default=""/>
-  <PARAMETER id="paramTabId" name="tabId" attribute="value" default=""/>
-  <PARAMETER id="paramAttribute" name="attribute" attribute="value"/>
-	<PARAMETER id="paramInstance" name="instance" attribute="value"/>
-	<PARAMETER id="paramProduct" name="product" attribute="value"/>
-	<PARAMETER id="paramLocatorId" name="locatorId" attribute="value"/>
-	<PARAMETER id="paramData" name="data"/>
-	<PARAMETER id="paramNameDescription" name="nameDescription"/>
-	<PARAMETER id="paramDescription" name="description"/>
-	<PARAMETER id="paramDescriptionHidden" name="description" attribute="value"/>
-	<PARAMETER id="paramScript" name="script"/>
-	<PARAMETER id="messageBoxID" name="messageType" attribute="class" replace="yy" default="HIDDEN"/>
-	<PARAMETER id="messageBoxIDTitle" name="messageTitle" default=""/>
-	<PARAMETER id="messageBoxIDMessage" name="messageMessage" default=""/>
-    <PARAMETER id="paramBody" name="body" attribute="onload" replace="xx();"/>
-	<DISCARD id="discard"/>
-</REPORT>
--- a/src/org/openbravo/erpCommon/info/AttributeSetInstance_F2.html	Wed May 21 17:43:38 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2007 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<html>
-<head>
-<title>Business Partner selector</title>
-<link rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"> 
-      <link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"></link>
-      <script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/dojoConfig.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript"></script>
-      <script language="JavaScript" type="text/javascript" id="paramDirection">var baseDirection = "../../../../../web/";</script>
-      <script language="JavaScript" type="text/javascript" id="paramLanguage">var LNG_POR_DEFECTO = "en_US";</script>
-      <script language="JavaScript" src="../../../../../web/js/searchs.js" type="text/javascript"></script>
-      <script language="JavaScript" type="text/javascript">
-function depurarSelector(action) {
-	if (action=="SAVE") {
-		parent.superior.submitCommandForm("SAVE");
-	} else top.opener.closeSearch(action, "", "", null);
-	return true;
-}
-</script>
-	<SCRIPT language="JavaScript" type="text/javascript">
-	function onLoadDo(){
-		this.windowTables = new Array(
-		  new windowTableId('client', 'superior', 'buttonOK', 'inferior'),
-		  new windowTableId('client', 'inferior', 'buttonOK', 'inferior')
-		);
-		setWindowTableParentElement();
-		enableShortcuts('popup');
-	}
-
-	function onResizeDo(){
-	}
-	</SCRIPT>
-</head>
-<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
-
-
-<table cellspacing="0" cellpadding="0" width="100%">
-  <tr>
-    <td>
-      <div class="Popup_ContentPane_Client" id="client">
-        <table cellspacing="0" cellpadding="0" class="Popup_Client_TablePopup">
-
-          <tr>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-          </tr>
-
-          <tr>
-
-            <td class="TitleCell"></td>
-            <td class="Button_RightAlign_ContentCell">
-              <div>
-                <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='OK'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onclick="depurarSelector('SAVE');return false;" id="buttonOK">
-                  <table class="Button" onmousedown="this.className='Button_active'; return true;" onmouseup="this.className='Button'; return true;" onmouseover="this.className='Button_hover'; window.status='OK'; return true;" onmouseout="this.className='Button'; window.status=''; return true;">
-                    <tr>
-                      <td class="Button_left"><img class="Button_Icon Button_Icon_ok" alt="OK" title="OK" src="../web/images/blank.gif" border="0"></img></td>
-                      <td class="Button_text Button_width">OK</td>
-                      <td class="Button_right"></td>
-                    </tr>
-                  </table>
-                </a>
-              </div>
-            </td>
-            <td class="Button_LeftAlign_ContentCell">
-              <div>
-                <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Cancel'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onclick="depurarSelector('CLEAR');return false;">
-                  <table class="Button" onmousedown="this.className='Button_active'; return true;" onmouseup="this.className='Button'; return true;" onmouseover="this.className='Button_hover'; window.status='Cancel'; return true;" onmouseout="this.className='Button'; window.status=''; return true;">
-                    <tr>
-
-                      <td class="Button_left"><img class="Button_Icon Button_Icon_cancel" alt="Cancel" title="Cancel" src="../web/images/blank.gif" border="0"></img></td>
-                      <td class="Button_text Button_width">Cancel</td>
-                      <td class="Button_right"></td>
-                    </tr>
-                  </table>
-                </a>
-              </div>
-            </td>
-            <td class="TitleCell"></td>
-
-          </tr>
-        </table>
-      </div>
-    </td>
-  </tr>
-</table>
-</html>
-
--- a/src/org/openbravo/erpCommon/info/AttributeSetInstance_F2.xml	Wed May 21 17:43:38 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<REPORT>
-	<template file="AttributeSetInstance_F2.html"/>
-	<PARAMETER id="paramDirection" name="direction" default=""/>
-	<PARAMETER id="paramLanguage" name="language" default=""/>
-	<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
-	<DISCARD id="discard"/>
-</REPORT>
--- a/src/org/openbravo/erpCommon/info/AttributeSetInstance_FS.html	Wed May 21 17:43:38 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8"></META>
-<TITLE>Attribute selector</TITLE>
-<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"></LINK></HEAD>
-<FRAMESET rows="*,60px" frameborder="NO" border="0" framespacing="0" cols="*">
-<FRAME name="superior" id="paramFrameSuperior" scrolling="NO" noresize="" src="AttributeSetInstance_F1.html?Command=FRAME1"></FRAME>
-<FRAME name="inferior" scrolling="NO" noresize="" src="AttributeSetInstance_F2.html?Command=FRAME2"></FRAME></FRAMESET>
-</HTML>
--- a/src/org/openbravo/erpCommon/info/AttributeSetInstance_FS.xml	Wed May 21 17:43:38 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<REPORT>
-	<template file="AttributeSetInstance_FS.html"/>
-</REPORT>