Delete ^M characters and force LF eol-style
authorJuan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com>
Tue, 22 Apr 2008 09:19:30 +0000
changeset 726 dac2a1486bd3
parent 725 628224a5ec94
child 727 23af88f55124
Delete ^M characters and force LF eol-style
src/org/openbravo/base/PeriodicBackgroundContextListener.java
src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html
src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.html
src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html
src/org/openbravo/erpCommon/ad_process/CashBankOperations.html
src/org/openbravo/erpCommon/ad_process/CreateAccountingReport.html
src/org/openbravo/erpCommon/ad_process/CreateTaxReport.html
src/org/openbravo/erpCommon/ad_reports/PurchaseOrderDimensionalNoComparative.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.html
src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.xml
src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance_data.xsql
src/org/openbravo/erpCommon/ad_reports/ReportBankJR.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelExportXLS.html
src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelExportXLS.xml
src/org/openbravo/erpCommon/ad_reports/ReportCashJR.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_Previous.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerJR.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscountJR.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorJR.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportInvoicesEditJR.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportMaterialTransactionEditionJR.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportPendingProductionJr.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportProductionRun.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSiteJR.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportPurchaseOrder.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoicedJasper.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderOpenItemEdit.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvidedJR.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportSalesPartnerProduct.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportShipmentEdition.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoicePurchase.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoicePurchaseForeign.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceSale.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceSaleForeign.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportToInvoiceConsignmentJR.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartnerJR.jrxml
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementJR.jrxml
src/org/openbravo/erpCommon/ad_reports/WeightDimensionalComparative.jrxml
src/org/openbravo/erpCommon/ad_reports/productionReport.jrxml
src/org/openbravo/erpCommon/ad_reports/productionSubReport.jrxml
src/org/openbravo/erpReports/C_OrderLinesJR.jrxml
src/org/openbravo/erpReports/RptC_ProposalJr.jrxml
src/org/openbravo/erpReports/RptC_Remittance.jrxml
src/org/openbravo/erpReports/RptC_Remittance_Lines.jrxml
src/org/openbravo/erpReports/RptMA_ProcessPlan.jrxml
--- a/src/org/openbravo/base/PeriodicBackgroundContextListener.java	Tue Apr 22 09:17:07 2008 +0000
+++ b/src/org/openbravo/base/PeriodicBackgroundContextListener.java	Tue Apr 22 09:19:30 2008 +0000
@@ -1,95 +1,95 @@
-package org.openbravo.base;
-
-import org.openbravo.base.secureApp.SystemPreferencesData;
-import org.openbravo.erpCommon.ad_background.PeriodicBackground;
-import org.openbravo.database.ConnectionProviderImpl;
-import org.openbravo.database.ConnectionProvider;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletException;
-import javax.servlet.ServletContext;
-import java.io.IOException;
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- * A ServletContextListener to startup and shutdown the periodic background process.
- *
- * @author Ben Sommerville
- */
-public class PeriodicBackgroundContextListener implements ServletContextListener {
-
-    public static final String BACKGROUND_ATTRIBUTE = "openbravoBackgroundProcesses";
-
-
-    public void contextInitialized(ServletContextEvent event) {
-        ServletContext context = event.getServletContext();
-        ConfigParameters configParameters = ConfigParameters.retrieveFrom(context);
-
-        Map<String, PeriodicBackground> backgroundProcess = new HashMap<String, PeriodicBackground>();
-        context.setAttribute(BACKGROUND_ATTRIBUTE, backgroundProcess);
-
-        if (configParameters.havePeriodicBackgroundTime() && configParameters.haveLogFileAcctServer() ) {
-            ConnectionProvider connectionProvider = ConnectionProviderContextListener.getPool(context);
-
-            SystemPreferencesData[] backgroundData = null;
-            try {
-                backgroundData = SystemPreferencesData.selectBackground(connectionProvider);
-            } catch (ServletException sex) {
-                sex.printStackTrace();
-            }
-            if (backgroundData != null && backgroundData.length > 0) {
-                for (int countBack = 0; countBack < backgroundData.length; countBack++) {
-                    PeriodicBackground object = null;
-                    try {
-                        object = new PeriodicBackground(connectionProvider, configParameters.getPeriodicBackgroundTime(),
-                                                            configParameters.strLogFileAcctServer,
-                                                            backgroundData[countBack].id,
-                                                            backgroundData[countBack].classname);
-                    } catch (IOException ioe) {
-                        ioe.printStackTrace();
-                    }
-                    if (object != null) {
-                        object.start();
-                        try {
-                            object.setActive(SystemPreferencesData.isActive(connectionProvider, backgroundData[countBack].id));
-                        } catch (ServletException sex) {
-                            sex.printStackTrace();
-                        }
-                        backgroundProcess.put(backgroundData[countBack].id, object);
-                    }
-                }
-            }
-        }
-    }
-
-
-    public void contextDestroyed(ServletContextEvent event) {
-        Map<String, PeriodicBackground> processes = getBackgroundProcesses(event.getServletContext());
-        for(PeriodicBackground object : processes.values()) {
-            object.destroy();
-        }
-        processes.clear();
-    }
-
-    private static  Map<String, PeriodicBackground> getBackgroundProcesses(ServletContext context) {
-        return (Map<String, PeriodicBackground>) context.getAttribute(BACKGROUND_ATTRIBUTE);
-    }
-
-
-
-    public static synchronized PeriodicBackground getBackgroundProcess(ServletContext context, String processId) {
-        return getBackgroundProcesses(context).get(processId);
-    }
-
-    public static synchronized void updateBackgroundProcess(ServletContext context, String processId, PeriodicBackground process) {
-        Map<String, PeriodicBackground> processes = getBackgroundProcesses(context);
-        PeriodicBackground oldProcess = processes.put(processId,process);
-        if( oldProcess != null ) {
-            oldProcess.destroy();
-        }
-    }
-
-
-}
+package org.openbravo.base;
+
+import org.openbravo.base.secureApp.SystemPreferencesData;
+import org.openbravo.erpCommon.ad_background.PeriodicBackground;
+import org.openbravo.database.ConnectionProviderImpl;
+import org.openbravo.database.ConnectionProvider;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletException;
+import javax.servlet.ServletContext;
+import java.io.IOException;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * A ServletContextListener to startup and shutdown the periodic background process.
+ *
+ * @author Ben Sommerville
+ */
+public class PeriodicBackgroundContextListener implements ServletContextListener {
+
+    public static final String BACKGROUND_ATTRIBUTE = "openbravoBackgroundProcesses";
+
+
+    public void contextInitialized(ServletContextEvent event) {
+        ServletContext context = event.getServletContext();
+        ConfigParameters configParameters = ConfigParameters.retrieveFrom(context);
+
+        Map<String, PeriodicBackground> backgroundProcess = new HashMap<String, PeriodicBackground>();
+        context.setAttribute(BACKGROUND_ATTRIBUTE, backgroundProcess);
+
+        if (configParameters.havePeriodicBackgroundTime() && configParameters.haveLogFileAcctServer() ) {
+            ConnectionProvider connectionProvider = ConnectionProviderContextListener.getPool(context);
+
+            SystemPreferencesData[] backgroundData = null;
+            try {
+                backgroundData = SystemPreferencesData.selectBackground(connectionProvider);
+            } catch (ServletException sex) {
+                sex.printStackTrace();
+            }
+            if (backgroundData != null && backgroundData.length > 0) {
+                for (int countBack = 0; countBack < backgroundData.length; countBack++) {
+                    PeriodicBackground object = null;
+                    try {
+                        object = new PeriodicBackground(connectionProvider, configParameters.getPeriodicBackgroundTime(),
+                                                            configParameters.strLogFileAcctServer,
+                                                            backgroundData[countBack].id,
+                                                            backgroundData[countBack].classname);
+                    } catch (IOException ioe) {
+                        ioe.printStackTrace();
+                    }
+                    if (object != null) {
+                        object.start();
+                        try {
+                            object.setActive(SystemPreferencesData.isActive(connectionProvider, backgroundData[countBack].id));
+                        } catch (ServletException sex) {
+                            sex.printStackTrace();
+                        }
+                        backgroundProcess.put(backgroundData[countBack].id, object);
+                    }
+                }
+            }
+        }
+    }
+
+
+    public void contextDestroyed(ServletContextEvent event) {
+        Map<String, PeriodicBackground> processes = getBackgroundProcesses(event.getServletContext());
+        for(PeriodicBackground object : processes.values()) {
+            object.destroy();
+        }
+        processes.clear();
+    }
+
+    private static  Map<String, PeriodicBackground> getBackgroundProcesses(ServletContext context) {
+        return (Map<String, PeriodicBackground>) context.getAttribute(BACKGROUND_ATTRIBUTE);
+    }
+
+
+
+    public static synchronized PeriodicBackground getBackgroundProcess(ServletContext context, String processId) {
+        return getBackgroundProcesses(context).get(processId);
+    }
+
+    public static synchronized void updateBackgroundProcess(ServletContext context, String processId, PeriodicBackground process) {
+        Map<String, PeriodicBackground> processes = getBackgroundProcesses(context);
+        PeriodicBackground oldProcess = processes.put(processId,process);
+        if( oldProcess != null ) {
+            oldProcess.destroy();
+        }
+    }
+
+
+}
--- a/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html	Tue Apr 22 09:17:07 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_forms/GenerateInvoicesmanual.html	Tue Apr 22 09:19:30 2008 +0000
@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/tr/xhtml1/Dtd/xhtml1-transitional.dtd">
-<!--
- *************************************************************************
- * 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 xmlns="http://www.w3.org/1999/xhtml">
-<HEAD>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<TITLE>Generate Invoices manual</TITLE>
-<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico" type="image/x-icon"/>
-<LINK rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css"></LINK>
-<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Main/Main_Manual.css" id="paramCSS"/>
-<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/appStatus.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/String.js" type="text/javascript"></SCRIPT>
-<SCRIPT language="JavaScript" src="../../../../../web/js/TypeAheadCombo.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 type="text/javascript"> 
-      //all dojo.require above this line
-      dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
-</script> 
-<SCRIPT language="JavaScript" type="text/javascript">
-
-function depurar(action) {
-  var frm=document.frmMain;
-  if (action=="GENERATE") {
-    if (radioValue(frm.inpOrder)==null) {
-    mensaje(1);
-    return false;
-    }
-    setProcessingMode('window',true);
-  } else if (action=="FIND") {
-    if (frm.inpadOrgId.value==null || frm.inpadOrgId.value=="") {
-    frm.inpadOrgId.focus();
-    mensaje(7);
-    return false;
-    }
-  }
-  return true;
-}
-
-function onloadFunctions() {
-	new TypeAheadCombo("inpadOrgId");
-}
-</SCRIPT>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/tr/xhtml1/Dtd/xhtml1-transitional.dtd">
+<!--
+ *************************************************************************
+ * 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 xmlns="http://www.w3.org/1999/xhtml">
+<HEAD>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<TITLE>Generate Invoices manual</TITLE>
+<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico" type="image/x-icon"/>
+<LINK rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css"></LINK>
+<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Main/Main_Manual.css" id="paramCSS"/>
+<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/appStatus.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/String.js" type="text/javascript"></SCRIPT>
+<SCRIPT language="JavaScript" src="../../../../../web/js/TypeAheadCombo.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 type="text/javascript"> 
+      //all dojo.require above this line
+      dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
+</script> 
+<SCRIPT language="JavaScript" type="text/javascript">
+
+function depurar(action) {
+  var frm=document.frmMain;
+  if (action=="GENERATE") {
+    if (radioValue(frm.inpOrder)==null) {
+    mensaje(1);
+    return false;
+    }
+    setProcessingMode('window',true);
+  } else if (action=="FIND") {
+    if (frm.inpadOrgId.value==null || frm.inpadOrgId.value=="") {
+    frm.inpadOrgId.focus();
+    mensaje(7);
+    return false;
+    }
+  }
+  return true;
+}
+
+function onloadFunctions() {
+	new TypeAheadCombo("inpadOrgId");
+}
+</SCRIPT>
 	<SCRIPT language="JavaScript" type="text/javascript">
-	
+	
   function onLoadDo(){
 		setProcessingMode('window', false); this.windowTables = new Array(
 		  new windowTableId('client', null, 'buttonSearch'),
@@ -104,325 +104,325 @@
 		resizeArea();
 	}
 	</SCRIPT>
-</HEAD>
-<BODY onload="onLoadDo();" onresize="onResizeDo();" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" id="paramMessage">
+</HEAD>
+<BODY onload="onLoadDo();" onresize="onResizeDo();" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" id="paramMessage">
       
-<FORM method="POST" action="GenerateInvoicesmanual.html" name="frmMain" >
-<INPUT type="hidden" name="Command"></INPUT>
-<input type="hidden" name="inpLastFieldChanged" value="">
-<INPUT type="hidden" name="inpcOrderId"></INPUT>
+<FORM method="POST" action="GenerateInvoicesmanual.html" name="frmMain" >
+<INPUT type="hidden" name="Command"></INPUT>
+<input type="hidden" name="inpLastFieldChanged" value="">
+<INPUT type="hidden" name="inpcOrderId"></INPUT>
 
-<table height="100%" border="0" cellpadding="0" cellspacing="0" id="main">
-    <tr>
-      <td valign="top" id="tdleftTabs"></td>
-      <td valign="top">
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Left">
-          <TR><TD class="Main_NavBar_bg_left" id="tdleftSeparator"></TD></TR>
-          <TR><TD class="Main_ToolBar_bg_left" valign="top"></TD></TR>
-          <TR><TD class="Main_Client_bg_left"></TD></TR>
-          <TR><TD class="Main_Bottom_bg_left"></TD></TR>
-        </TABLE>
-      </td>
-      <td valign="top">
-        <div class="Main_ContentPane_NavBar" id="tdtopButtons"></div>
-        <div class="Main_ContentPane_ToolBar" id="paramToolBar"></div>
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_TabPane" id="tdtopTabs">
-          <TR id="paramParentTabContainer"></TR>
-          <TR id="paramMainTabContainer"></TR>
-          <TR id="paramChildTabContainer"></TR>
-        </TABLE>
-        <DIV class="Main_ContentPane_Client" style="overflow: auto; display: none; border-bottom: 0px none;" id="client">
-                <table class="dojoTabContainer" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
-                  <tr>
-                    <td>
-                      <table class="dojoTabPaneWrapper" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
-                        <tr>
-                          <td>
-                            <!-- MessageBox -->
-
-                            <table cellpadding="0" cellspacing="0" id="messageBoxID" class="MessageBoxyy">
-                              <TBODY>
-                              <tr class="MessageBox_TopMargin">
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td></td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              <tr>
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td>
-
-                                  <table cellpadding="0" cellspacing="0" style="width: 100%;">
-                                    <TBODY>
-                                    <tr>
-                                      <td>
-                                        <div class="MessageBox_TopLeft"></div>
-                                        <div class="MessageBox_Left"></div>
-                                      </td>
-                                      <td class="MessageBox_bg">
-
-                                        <table class="MessageBox_Top">
-                                        <TBODY>
-                                          <tr>
-                                            <td>
-                                              <span>
-                                              <table cellpadding="0" cellspacing="0" class="MessageBox_Body_ContentCell">
-                                                <TBODY>
-                                                <tr>
-                                                  <td class="MessageBox_Icon_ContentCell">
-                                                    <div class="MessageBox_Icon"></div>
-                                                  </td>
-                                                  <td style="vertical-align: top;" id="messageBoxIDContent">
-                                                    <span>
-                                                      <div class="MessageBox_TextTitle" id="messageBoxIDTitle">
-                                                        xxInfo: AccessTableWithNoView
-                                                      </div>
-                                                      <div class="MessageBox_TextDescription" id="messageBoxIDMessage">
-                                                        xxThe current information is empty.
-                                                      </div>
-                                                      <div class="MessageBox_TextSeparator"></div>
-                                                    </span>
-                                                  </td>
-                                                </tr>
-                                                </TBODY>
-                                              </table>
-                                              </span>
-                                            </td>
-                                          </tr>
-                                          </TBODY>
-                                        </table>
-
-                                      </td>
-                                      <td class="MessageBox_RightTrans">
-                                        <div class="MessageBox_TopRight"></div>
-                                        <div class="MessageBox_Right"></div>
-                                      </td>
-                                    </tr>
-                                    <tr>
-                                      <td rowspan="2" class="MessageBox_BottomLeft">
-                                      </td>
-                                      <td class="MessageBox_BottomTrans MessageBox_bg">
-                                      </td>
-                                      <td rowspan="2" class="MessageBox_BottomRight">
-                                      </td>
-                                    </tr>
-                                    <tr>
-                                      <td class="MessageBox_Bottom">
-                                      </td>
-                                    </tr>
-                                    </TBODY>
-                                  </table>
-
-                                </td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              <tr class="MessageBox_BottomMargin">
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td></td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              </TBODY>
-                            </table>              <!-- USER CONTROLS -->
-              <TABLE class="Main_Client_TableEdition">
-                <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>
-                  <td class="TableEdition_OneCell_width"></td>
-                  <td class="TableEdition_OneCell_width"></td>
-                </tr>
-
-                <TR>
-                  <TD class="TitleCell"><SPAN class="LabelText">Business Partner</SPAN></TD>
-                  <TD class="TextBox_btn_ContentCell" colspan="2">
-                    <TABLE border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
-                      <TR>
-                        <TD class="TextBox_ContentCell">
-                          <INPUT type="hidden" name="inpcBpartnerId" value="" id="paramBPartnerId"></INPUT> 
-                          <INPUT class="dojoValidateValid TextBox_btn_TwoCells_width" type="text"  name="inpBpartnerId_DES" maxlength="20" value="" id="paramBPartnerDescription"></INPUT>
-                        </TD>
-                        <TD class="FieldButton_ContentCell">
-                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Business Partner'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"  onclick="openSearch(null, null, '../info/BusinessPartner_FS.html', 'SELECTOR_BUSINESS', false, 'frmMain', 'inpcBpartnerId', 'inpBpartnerId_DES', document.frmMain.inpBpartnerId_DES.value, 'WindowID', 'GenerateInvoicesmanual');return false;">
-                          <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Business Partner';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
-                            <TR>
-                              <TD class="FieldButton_bg">
-                                <IMG alt="Business Partner" class="FieldButton_Icon FieldButton_Icon_BusinessPartner" title="Business Partner" src="../../../../../web/images/blank.gif" border="0"></IMG>
-                              </TD>
-                            </TR>
-                          </TABLE>
-                          </a>
-                        </TD>
-                      </TR>
-                    </TABLE>
-                  </TD>
-                  <TD class="TitleCell"><SPAN class="LabelText">Organization</SPAN></TD>
-                  <TD class="Combo_ContentCell" colspan="2"> <SELECT name="inpadOrgId" class="Combo Combo_TwoCells_width" id="inpadOrgId"><DIV id="reportOrganization_M"></DIV>
-                    </SELECT></TD>
-                </TR>
-
-                <TR>
-                  <TD class="TitleCell"><SPAN class="LabelText">From Date</SPAN></TD>
-                  <TD class="TextBox_btn_ContentCell">
-                    <TABLE border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
-                      <TR>
-                        <TD class="TextBox_ContentCell">
-                          <INPUT dojoType="openbravo:DateTextbox" displayFormat="xx" saveFormat="yy"  class="TextBox_btn_OneCell_width" type="text" name="inpDateFrom" id="paramDateFrom" size="10" maxlength="10" value="" onkeyup="auto_complete_date(this.textbox, this.displayFormat);return true;"></INPUT><script>djConfig.searchIds.push("paramDateFrom");</script>
-                        </TD>
-                        <TD class="FieldButton_ContentCell">
-                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"  onclick="showCalendar('frmMain.inpDateFrom', document.frmMain.inpDateFrom.value, false);return false;">
-                          <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
-                            <TR>
-                              <TD class="FieldButton_bg">
-                                <IMG alt="Calendar" class="FieldButton_Icon FieldButton_Icon_Calendar" title="Calendar" src="../../../../../web/images/blank.gif" border="0"></IMG>
-                              </TD>
-                            </TR>
-                          </TABLE>
-                          </a>
-                        </TD>
-                      </TR>
-                    </TABLE>
-                  </TD>
-                  <TD class="TitleCell"></TD>
-                  <TD class="TitleCell"><SPAN class="LabelText">To Date</SPAN></TD>
-                  <TD class="TextBox_btn_ContentCell">
-                    <TABLE border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
-                      <TR>
-                        <TD class="TextBox_ContentCell">
-                          <INPUT dojoType="openbravo:DateTextbox" displayFormat="xx" saveFormat="yy"  class="TextBox_btn_OneCell_width" type="text" name="inpDateTo" id="paramDateTo" size="10" maxlength="10" value="" onkeyup="auto_complete_date(this.textbox, this.displayFormat);return true;"></INPUT><script>djConfig.searchIds.push("paramDateTo");</script>
-                        </TD>
-                        <TD class="FieldButton_ContentCell">
-                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"  onclick="showCalendar('frmMain.inpDateTo', document.frmMain.inpDateTo.value, false);return false;">
-                          <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
-                            <TR>
-                              <TD class="FieldButton_bg">
-                                <IMG alt="Calendar" class="FieldButton_Icon FieldButton_Icon_Calendar" title="Calendar" src="../../../../../web/images/blank.gif" border="0"></IMG>
-                              </TD>
-                            </TR>
-                          </TABLE>
-                          </a>
-                        </TD>
-                      </TR>
-                    </TABLE>
-                  </TD>
-                  <TD class="ContentCell"></TD>
-                </TR>
-                <TR>
-                  <TD class="TitleCell"></TD>
-                  <TD class="Button_LeftAlign_ContentCell">
-                    <div>
-                      <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Search'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onclick="submitCommandForm('FIND', true);return false;" id="buttonSearch">
-                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Search';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
-                        <tr>
-                          <td class="Button_left"><img class="Button_Icon Button_Icon_search" alt="Search" title="Search" src="../../../../../web/images/blank.gif" border=0/></td>
-                          <td class="Button_text Button_width">Search</td>
-                          <td class="Button_right"></td>
-                        </tr>
-                      </table>
-                      </a>
-                    </div>
-                  </TD>
-                  <TD class="TitleCell"></TD>
-                  <TD class="ContentCell"></TD>
-                  <TD class="TitleCell"></TD>
-                  <TD class="ContentCell"></TD>
-                </TR>
-              </TABLE>
-
-        <BR></BR>
-<!-- Begin Modification 01/08/07 -->
-<table cellspacing="0" cellpadding="0" width="100%" style="text-align:-moz-center;_text-align:center;">
-    <tr>
-      <td>
-      <div class="Popup_ContentPane_Client" style="overflow: auto;">
-        <TABLE cellspacing="0" cellpadding="0" width="100%" class="DataGrid_Header_Table DataGrid_Body_Table">
-          <TR class="Popup_Client_Selector_DataGrid_HeaderRow"> 
-            <td width="28" class="DataGrid_Body_LineNoCell"> <SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpTodos" onclick="marcarTodos(document.frmMain.inpOrder, this.checked);return true;"></INPUT></SPAN>
-            </td>
-            <th class="DataGrid_Header_Cell" width="103">Organization</th>
-            <th class="DataGrid_Header_Cell" width="157">Document type</th>
-            <th class="DataGrid_Header_Cell" width="87">Doc No.</th>
-            <th class="DataGrid_Header_Cell" width="354">Business Partner</th>
-            <th class="DataGrid_Header_Cell" width="106">Order Date</th>
-            <th class="DataGrid_Header_Cell" width="75">Lines amt</th>
-            <th class="DataGrid_Header_Cell" width="81">Not invoiced</th>
-          </TR>
-          <DIV id="sectionDetail"> 
-            <TR class="DataGrid_Body_Row DataGrid_Body_Row_xx" id="funcEvenOddRow"> 
-              <TD class="DataGrid_Body_LineNoCell"> <SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpOrder" value="" id="fieldCOrderId"></INPUT></SPAN>
-              </TD>
-              <TD class="DataGrid_Body_Cell" id="fieldAdorgname">xxFrilac</TD>
-              <TD class="DataGrid_Body_Cell" id="fieldCdoctypename">Standard order</TD>
-              <TD class="DataGrid_Body_Cell"> <A href="#" onclick="submitCommandFormParameter('DIRECT', document.frmMain.inpcOrderId, xx, false, document.frmMain, '../SalesOrder/Header_Relation.html', null, false, true);return false;" onmouseover="window.status='Sales Order';return true;" onmouseout="window.status='';return true;" class="Link" id="fieldId"> 
-                <SPAN id="fieldDocumentno">xx24/10/2004</SPAN></A></TD>
-              <TD class="DataGrid_Body_Cell" id="fieldCbpartnername">xxHuesker</TD>
-              <TD class="DataGrid_Body_Cell" id="fieldDateordered">xx12/03/2004</TD>
-              <TD class="DataGrid_Body_Cell" id="fieldGrandtotal">xx3</TD>
-              <TD class="DataGrid_Body_Cell" id="fieldTotallines">xx3</TD>
-            </TR>
-          </DIV>
-        </TABLE>
-       </div>
-     </td>
-    </tr>
- </table>
-<!-- End Modification 01/08/07 -->
-
-                      <!-- USER CONTROLS -->
-                </TD>
-              </TR>
-              </TABLE>
-              </TD>
-            </TR>
-          </TABLE>
-        </div>
-            <div >
-             <DIV class="Main_ContentPane_Client" style="overflow: auto; border-top: 0px none;" id="tdbottomButtons">
-              <TABLE class="Main_Client_TableEdition" cellspacing="0" cellpadding="0" style="width: 435px">
-                <tr>
-                  <td class="TableEdition_OneCell_width"></td>
-                  <td class="TableEdition_OneCell_width"></td>
-                  <td class="TableEdition_OneCell_width"></td>
-
-                </tr>
-
-                <TR>
-                  <TD></TD>
-                  <TD class="Button_LeftAlign_ContentCell">
-                    <div>
-                        <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Process'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onclick="submitCommandForm('GENERATE', true, null, null, null, true);return false;" id="buttonProcess">
-                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Process';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
-                        <tr>
-                          <td class="Button_left"><img class="Button_Icon Button_Icon_process" alt="Process" title="Process" src="../../../../../web/images/blank.gif" border=0/></td>
-                          <td class="Button_text Button_width">Process</td>
-                          <td class="Button_right"></td>
-                        </tr>
-                      </table>
-                      </a>
-                    </div>
-                  </TD>
-                  <TD class="TitleCell"></TD>
-                  <TD class="ContentCell"></TD>
-                  <TD class="TitleCell"></TD>
-                  <TD class="ContentCell"></TD>
-                </TR>
-              </TABLE>
-            </div>
-
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Menu_ContentPane_Bottom" id="tdbottomSeparator">
-          <TR>
-            <TD class="Main_Bottom_bg"><IMG src="../../../../../web/images/blank.gif" border="0"></TD>
-          </TR>
-        </TABLE></td>
-      <td valign="top">
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Right" id="tdrightSeparator">
-          <TR><TD class="Main_NavBar_bg_right"></TD></TR>
-          <TR><TD class="Main_ToolBar_bg_right" valign="top"></TD></TR>
-          <TR><TD class="Main_Client_bg_right"></TD></TR>
-          <TR><TD class="Main_Bottom_bg_right"></TD></TR>
-        </TABLE>
-      </td>
-    </tr>
-  </table>
-</form>
-</BODY>
-</HTML>
+<table height="100%" border="0" cellpadding="0" cellspacing="0" id="main">
+    <tr>
+      <td valign="top" id="tdleftTabs"></td>
+      <td valign="top">
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Left">
+          <TR><TD class="Main_NavBar_bg_left" id="tdleftSeparator"></TD></TR>
+          <TR><TD class="Main_ToolBar_bg_left" valign="top"></TD></TR>
+          <TR><TD class="Main_Client_bg_left"></TD></TR>
+          <TR><TD class="Main_Bottom_bg_left"></TD></TR>
+        </TABLE>
+      </td>
+      <td valign="top">
+        <div class="Main_ContentPane_NavBar" id="tdtopButtons"></div>
+        <div class="Main_ContentPane_ToolBar" id="paramToolBar"></div>
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_TabPane" id="tdtopTabs">
+          <TR id="paramParentTabContainer"></TR>
+          <TR id="paramMainTabContainer"></TR>
+          <TR id="paramChildTabContainer"></TR>
+        </TABLE>
+        <DIV class="Main_ContentPane_Client" style="overflow: auto; display: none; border-bottom: 0px none;" id="client">
+                <table class="dojoTabContainer" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
+                  <tr>
+                    <td>
+                      <table class="dojoTabPaneWrapper" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
+                        <tr>
+                          <td>
+                            <!-- MessageBox -->
+
+                            <table cellpadding="0" cellspacing="0" id="messageBoxID" class="MessageBoxyy">
+                              <TBODY>
+                              <tr class="MessageBox_TopMargin">
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td></td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              <tr>
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td>
+
+                                  <table cellpadding="0" cellspacing="0" style="width: 100%;">
+                                    <TBODY>
+                                    <tr>
+                                      <td>
+                                        <div class="MessageBox_TopLeft"></div>
+                                        <div class="MessageBox_Left"></div>
+                                      </td>
+                                      <td class="MessageBox_bg">
+
+                                        <table class="MessageBox_Top">
+                                        <TBODY>
+                                          <tr>
+                                            <td>
+                                              <span>
+                                              <table cellpadding="0" cellspacing="0" class="MessageBox_Body_ContentCell">
+                                                <TBODY>
+                                                <tr>
+                                                  <td class="MessageBox_Icon_ContentCell">
+                                                    <div class="MessageBox_Icon"></div>
+                                                  </td>
+                                                  <td style="vertical-align: top;" id="messageBoxIDContent">
+                                                    <span>
+                                                      <div class="MessageBox_TextTitle" id="messageBoxIDTitle">
+                                                        xxInfo: AccessTableWithNoView
+                                                      </div>
+                                                      <div class="MessageBox_TextDescription" id="messageBoxIDMessage">
+                                                        xxThe current information is empty.
+                                                      </div>
+                                                      <div class="MessageBox_TextSeparator"></div>
+                                                    </span>
+                                                  </td>
+                                                </tr>
+                                                </TBODY>
+                                              </table>
+                                              </span>
+                                            </td>
+                                          </tr>
+                                          </TBODY>
+                                        </table>
+
+                                      </td>
+                                      <td class="MessageBox_RightTrans">
+                                        <div class="MessageBox_TopRight"></div>
+                                        <div class="MessageBox_Right"></div>
+                                      </td>
+                                    </tr>
+                                    <tr>
+                                      <td rowspan="2" class="MessageBox_BottomLeft">
+                                      </td>
+                                      <td class="MessageBox_BottomTrans MessageBox_bg">
+                                      </td>
+                                      <td rowspan="2" class="MessageBox_BottomRight">
+                                      </td>
+                                    </tr>
+                                    <tr>
+                                      <td class="MessageBox_Bottom">
+                                      </td>
+                                    </tr>
+                                    </TBODY>
+                                  </table>
+
+                                </td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              <tr class="MessageBox_BottomMargin">
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td></td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              </TBODY>
+                            </table>              <!-- USER CONTROLS -->
+              <TABLE class="Main_Client_TableEdition">
+                <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>
+                  <td class="TableEdition_OneCell_width"></td>
+                  <td class="TableEdition_OneCell_width"></td>
+                </tr>
+
+                <TR>
+                  <TD class="TitleCell"><SPAN class="LabelText">Business Partner</SPAN></TD>
+                  <TD class="TextBox_btn_ContentCell" colspan="2">
+                    <TABLE border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
+                      <TR>
+                        <TD class="TextBox_ContentCell">
+                          <INPUT type="hidden" name="inpcBpartnerId" value="" id="paramBPartnerId"></INPUT> 
+                          <INPUT class="dojoValidateValid TextBox_btn_TwoCells_width" type="text"  name="inpBpartnerId_DES" maxlength="20" value="" id="paramBPartnerDescription"></INPUT>
+                        </TD>
+                        <TD class="FieldButton_ContentCell">
+                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Business Partner'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"  onclick="openSearch(null, null, '../info/BusinessPartner_FS.html', 'SELECTOR_BUSINESS', false, 'frmMain', 'inpcBpartnerId', 'inpBpartnerId_DES', document.frmMain.inpBpartnerId_DES.value, 'WindowID', 'GenerateInvoicesmanual');return false;">
+                          <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Business Partner';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
+                            <TR>
+                              <TD class="FieldButton_bg">
+                                <IMG alt="Business Partner" class="FieldButton_Icon FieldButton_Icon_BusinessPartner" title="Business Partner" src="../../../../../web/images/blank.gif" border="0"></IMG>
+                              </TD>
+                            </TR>
+                          </TABLE>
+                          </a>
+                        </TD>
+                      </TR>
+                    </TABLE>
+                  </TD>
+                  <TD class="TitleCell"><SPAN class="LabelText">Organization</SPAN></TD>
+                  <TD class="Combo_ContentCell" colspan="2"> <SELECT name="inpadOrgId" class="Combo Combo_TwoCells_width" id="inpadOrgId"><DIV id="reportOrganization_M"></DIV>
+                    </SELECT></TD>
+                </TR>
+
+                <TR>
+                  <TD class="TitleCell"><SPAN class="LabelText">From Date</SPAN></TD>
+                  <TD class="TextBox_btn_ContentCell">
+                    <TABLE border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
+                      <TR>
+                        <TD class="TextBox_ContentCell">
+                          <INPUT dojoType="openbravo:DateTextbox" displayFormat="xx" saveFormat="yy"  class="TextBox_btn_OneCell_width" type="text" name="inpDateFrom" id="paramDateFrom" size="10" maxlength="10" value="" onkeyup="auto_complete_date(this.textbox, this.displayFormat);return true;"></INPUT><script>djConfig.searchIds.push("paramDateFrom");</script>
+                        </TD>
+                        <TD class="FieldButton_ContentCell">
+                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"  onclick="showCalendar('frmMain.inpDateFrom', document.frmMain.inpDateFrom.value, false);return false;">
+                          <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
+                            <TR>
+                              <TD class="FieldButton_bg">
+                                <IMG alt="Calendar" class="FieldButton_Icon FieldButton_Icon_Calendar" title="Calendar" src="../../../../../web/images/blank.gif" border="0"></IMG>
+                              </TD>
+                            </TR>
+                          </TABLE>
+                          </a>
+                        </TD>
+                      </TR>
+                    </TABLE>
+                  </TD>
+                  <TD class="TitleCell"></TD>
+                  <TD class="TitleCell"><SPAN class="LabelText">To Date</SPAN></TD>
+                  <TD class="TextBox_btn_ContentCell">
+                    <TABLE border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
+                      <TR>
+                        <TD class="TextBox_ContentCell">
+                          <INPUT dojoType="openbravo:DateTextbox" displayFormat="xx" saveFormat="yy"  class="TextBox_btn_OneCell_width" type="text" name="inpDateTo" id="paramDateTo" size="10" maxlength="10" value="" onkeyup="auto_complete_date(this.textbox, this.displayFormat);return true;"></INPUT><script>djConfig.searchIds.push("paramDateTo");</script>
+                        </TD>
+                        <TD class="FieldButton_ContentCell">
+                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"  onclick="showCalendar('frmMain.inpDateTo', document.frmMain.inpDateTo.value, false);return false;">
+                          <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
+                            <TR>
+                              <TD class="FieldButton_bg">
+                                <IMG alt="Calendar" class="FieldButton_Icon FieldButton_Icon_Calendar" title="Calendar" src="../../../../../web/images/blank.gif" border="0"></IMG>
+                              </TD>
+                            </TR>
+                          </TABLE>
+                          </a>
+                        </TD>
+                      </TR>
+                    </TABLE>
+                  </TD>
+                  <TD class="ContentCell"></TD>
+                </TR>
+                <TR>
+                  <TD class="TitleCell"></TD>
+                  <TD class="Button_LeftAlign_ContentCell">
+                    <div>
+                      <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Search'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onclick="submitCommandForm('FIND', true);return false;" id="buttonSearch">
+                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Search';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
+                        <tr>
+                          <td class="Button_left"><img class="Button_Icon Button_Icon_search" alt="Search" title="Search" src="../../../../../web/images/blank.gif" border=0/></td>
+                          <td class="Button_text Button_width">Search</td>
+                          <td class="Button_right"></td>
+                        </tr>
+                      </table>
+                      </a>
+                    </div>
+                  </TD>
+                  <TD class="TitleCell"></TD>
+                  <TD class="ContentCell"></TD>
+                  <TD class="TitleCell"></TD>
+                  <TD class="ContentCell"></TD>
+                </TR>
+              </TABLE>
+
+        <BR></BR>
+<!-- Begin Modification 01/08/07 -->
+<table cellspacing="0" cellpadding="0" width="100%" style="text-align:-moz-center;_text-align:center;">
+    <tr>
+      <td>
+      <div class="Popup_ContentPane_Client" style="overflow: auto;">
+        <TABLE cellspacing="0" cellpadding="0" width="100%" class="DataGrid_Header_Table DataGrid_Body_Table">
+          <TR class="Popup_Client_Selector_DataGrid_HeaderRow"> 
+            <td width="28" class="DataGrid_Body_LineNoCell"> <SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpTodos" onclick="marcarTodos(document.frmMain.inpOrder, this.checked);return true;"></INPUT></SPAN>
+            </td>
+            <th class="DataGrid_Header_Cell" width="103">Organization</th>
+            <th class="DataGrid_Header_Cell" width="157">Document type</th>
+            <th class="DataGrid_Header_Cell" width="87">Doc No.</th>
+            <th class="DataGrid_Header_Cell" width="354">Business Partner</th>
+            <th class="DataGrid_Header_Cell" width="106">Order Date</th>
+            <th class="DataGrid_Header_Cell" width="75">Lines amt</th>
+            <th class="DataGrid_Header_Cell" width="81">Not invoiced</th>
+          </TR>
+          <DIV id="sectionDetail"> 
+            <TR class="DataGrid_Body_Row DataGrid_Body_Row_xx" id="funcEvenOddRow"> 
+              <TD class="DataGrid_Body_LineNoCell"> <SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpOrder" value="" id="fieldCOrderId"></INPUT></SPAN>
+              </TD>
+              <TD class="DataGrid_Body_Cell" id="fieldAdorgname">xxFrilac</TD>
+              <TD class="DataGrid_Body_Cell" id="fieldCdoctypename">Standard order</TD>
+              <TD class="DataGrid_Body_Cell"> <A href="#" onclick="submitCommandFormParameter('DIRECT', document.frmMain.inpcOrderId, xx, false, document.frmMain, '../SalesOrder/Header_Relation.html', null, false, true);return false;" onmouseover="window.status='Sales Order';return true;" onmouseout="window.status='';return true;" class="Link" id="fieldId"> 
+                <SPAN id="fieldDocumentno">xx24/10/2004</SPAN></A></TD>
+              <TD class="DataGrid_Body_Cell" id="fieldCbpartnername">xxHuesker</TD>
+              <TD class="DataGrid_Body_Cell" id="fieldDateordered">xx12/03/2004</TD>
+              <TD class="DataGrid_Body_Cell" id="fieldGrandtotal">xx3</TD>
+              <TD class="DataGrid_Body_Cell" id="fieldTotallines">xx3</TD>
+            </TR>
+          </DIV>
+        </TABLE>
+       </div>
+     </td>
+    </tr>
+ </table>
+<!-- End Modification 01/08/07 -->
+
+                      <!-- USER CONTROLS -->
+                </TD>
+              </TR>
+              </TABLE>
+              </TD>
+            </TR>
+          </TABLE>
+        </div>
+            <div >
+             <DIV class="Main_ContentPane_Client" style="overflow: auto; border-top: 0px none;" id="tdbottomButtons">
+              <TABLE class="Main_Client_TableEdition" cellspacing="0" cellpadding="0" style="width: 435px">
+                <tr>
+                  <td class="TableEdition_OneCell_width"></td>
+                  <td class="TableEdition_OneCell_width"></td>
+                  <td class="TableEdition_OneCell_width"></td>
+
+                </tr>
+
+                <TR>
+                  <TD></TD>
+                  <TD class="Button_LeftAlign_ContentCell">
+                    <div>
+                        <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Process'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onclick="submitCommandForm('GENERATE', true, null, null, null, true);return false;" id="buttonProcess">
+                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Process';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
+                        <tr>
+                          <td class="Button_left"><img class="Button_Icon Button_Icon_process" alt="Process" title="Process" src="../../../../../web/images/blank.gif" border=0/></td>
+                          <td class="Button_text Button_width">Process</td>
+                          <td class="Button_right"></td>
+                        </tr>
+                      </table>
+                      </a>
+                    </div>
+                  </TD>
+                  <TD class="TitleCell"></TD>
+                  <TD class="ContentCell"></TD>
+                  <TD class="TitleCell"></TD>
+                  <TD class="ContentCell"></TD>
+                </TR>
+              </TABLE>
+            </div>
+
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Menu_ContentPane_Bottom" id="tdbottomSeparator">
+          <TR>
+            <TD class="Main_Bottom_bg"><IMG src="../../../../../web/images/blank.gif" border="0"></TD>
+          </TR>
+        </TABLE></td>
+      <td valign="top">
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Right" id="tdrightSeparator">
+          <TR><TD class="Main_NavBar_bg_right"></TD></TR>
+          <TR><TD class="Main_ToolBar_bg_right" valign="top"></TD></TR>
+          <TR><TD class="Main_Client_bg_right"></TD></TR>
+          <TR><TD class="Main_Bottom_bg_right"></TD></TR>
+        </TABLE>
+      </td>
+    </tr>
+  </table>
+</form>
+</BODY>
+</HTML>
--- a/src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.html	Tue Apr 22 09:17:07 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.html	Tue Apr 22 09:19:30 2008 +0000
@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/tr/xhtml1/Dtd/xhtml1-transitional.dtd">
-<!--
- *************************************************************************
- * 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-2008 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<HEAD>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<TITLE>Initial Client Setup</TITLE>
-<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico" type="image/x-icon"/>
-<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Main/Main_Manual.css" id="paramCSS"/>
-<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/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/String.js" type="text/javascript"></SCRIPT>
-<SCRIPT language="JavaScript" src="../../../../../web/js/TypeAheadCombo.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="paramArrayRegion">
-var arrRegion=null;
-</SCRIPT>
-<script type="text/javascript"> 
-      //all dojo.require above this line
-      dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
-</script> 
-<SCRIPT language="JavaScript" type="text/javascript">
-function actualizarDatos(combo) {
-	cambiarListaCombo(document.frmMain.inpRegion, arrRegion, combo.options[combo.selectedIndex].value, false);
-}
-</SCRIPT>
-<SCRIPT language="JavaScript" type="text/javascript">
-function depurar(accion) {
-	var frm = document.frmMain;
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/tr/xhtml1/Dtd/xhtml1-transitional.dtd">
+<!--
+ *************************************************************************
+ * 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-2008 Openbravo SL 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<HEAD>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<TITLE>Initial Client Setup</TITLE>
+<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico" type="image/x-icon"/>
+<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Main/Main_Manual.css" id="paramCSS"/>
+<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/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/String.js" type="text/javascript"></SCRIPT>
+<SCRIPT language="JavaScript" src="../../../../../web/js/TypeAheadCombo.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="paramArrayRegion">
+var arrRegion=null;
+</SCRIPT>
+<script type="text/javascript"> 
+      //all dojo.require above this line
+      dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
+</script> 
+<SCRIPT language="JavaScript" type="text/javascript">
+function actualizarDatos(combo) {
+	cambiarListaCombo(document.frmMain.inpRegion, arrRegion, combo.options[combo.selectedIndex].value, false);
+}
+</SCRIPT>
+<SCRIPT language="JavaScript" type="text/javascript">
+function depurar(accion) {
+	var frm = document.frmMain;
   if (frm.inpCliente.value==null || frm.inpCliente.value=="") {frm.inpCliente.focus();  mensaje(7); return false; }
   if (frm.inpMoneda.value==null || frm.inpMoneda.value=="") {frm.inpMoneda.focus();  mensaje(7); return false; }
-  if (frm.inpPais.value==null || frm.inpPais.value=="") {frm.inpPais.focus();  mensaje(7); return false; }
+  if (frm.inpPais.value==null || frm.inpPais.value=="") {frm.inpPais.focus();  mensaje(7); return false; }
   if (frm.inpOrganizacion.value==null || frm.inpOrganizacion.value=="") {frm.inpOrganizacion.focus(); mensaje(7); return false; }
   if (frm.inpClienteUsuario.value==null || frm.inpClienteUsuario.value=="") {frm.inpClienteUsuario.focus(); mensaje(7); return false; }
   if (frm.inpOrganizacionUsuario.value==null || frm.inpOrganizacionUsuario.value=="") {frm.inpOrganizacionUsuario.focus();  mensaje(7); return false; }
-  if (frm.inpCiudad.value==null || frm.inpCiudad.value=="") {frm.inpCiudad.focus(); mensaje(7); return false; }
-	return true;
-}
-
-function onloadFunctions() {
-	new TypeAheadCombo("inpMoneda");
-	new TypeAheadCombo("inpPais");
-	new TypeAheadCombo("inpRegion");
-}
-</SCRIPT>
+  if (frm.inpCiudad.value==null || frm.inpCiudad.value=="") {frm.inpCiudad.focus(); mensaje(7); return false; }
+	return true;
+}
+
+function onloadFunctions() {
+	new TypeAheadCombo("inpMoneda");
+	new TypeAheadCombo("inpPais");
+	new TypeAheadCombo("inpRegion");
+}
+</SCRIPT>
 	<SCRIPT language="JavaScript" type="text/javascript">
 	function onLoadDo(){
 		this.windowTables = new Array(
@@ -102,284 +102,284 @@
 		resizeArea();
 	}
 	</SCRIPT>
-</HEAD>
-<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
-  <FORM name="frmMain" method="POST" action="InitialClientSetup.html" enctype="multipart/form-data" id="form"> 
-  <INPUT type="hidden" name="Command"></INPUT>
-  <input type="hidden" name="inpLastFieldChanged" value="">
-  <table height="100%" border="0" cellpadding="0" cellspacing="0" id="main">
-    <tr>
-      <td valign="top" id="tdleftTabs"></td>
-      <td valign="top">
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Left">
-          <TR><TD class="Main_NavBar_bg_left" id="tdleftSeparator"></TD></TR>
-          <TR><TD class="Main_ToolBar_bg_left" valign="top"></TD></TR>
-          <TR><TD class="Main_Client_bg_left"></TD></TR>
-          <TR><TD class="Main_Bottom_bg_left"></TD></TR>
-        </TABLE>
-      </td>
-      <td valign="top">
-        <div class="Main_ContentPane_NavBar" id="tdtopButtons"></div>
-        <div class="Main_ContentPane_ToolBar" id="paramToolBar"></div>
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_TabPane" id="tdtopTabs">
-          <TR id="paramParentTabContainer"></TR>
-          <TR id="paramMainTabContainer"></TR>
-          <TR id="paramChildTabContainer"></TR>
-        </TABLE>
-        <DIV class="Main_ContentPane_Client" style="overflow: auto; display: none;" id="client">
-                <table class="dojoTabContainer" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
-                  <tr>
-                    <td>
-                      <table class="dojoTabPaneWrapper" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
-                        <tr>
-                          <td>
-                            <!-- MessageBox -->
-
-                            <table cellpadding="0" cellspacing="0" id="messageBoxID" class="MessageBoxyy">
-                              <TBODY>
-                              <tr class="MessageBox_TopMargin">
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td></td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              <tr>
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td>
-
-                                  <table cellpadding="0" cellspacing="0" style="width: 100%;">
-                                    <TBODY>
-                                    <tr>
-                                      <td>
-                                        <div class="MessageBox_TopLeft"></div>
-                                        <div class="MessageBox_Left"></div>
-                                      </td>
-                                      <td class="MessageBox_bg">
-
-                                        <table class="MessageBox_Top">
-                                        <TBODY>
-                                          <tr>
-                                            <td>
-                                              <span>
-                                              <table cellpadding="0" cellspacing="0" class="MessageBox_Body_ContentCell">
-                                                <TBODY>
-                                                <tr>
-                                                  <td class="MessageBox_Icon_ContentCell">
-                                                    <div class="MessageBox_Icon"></div>
-                                                  </td>
-                                                  <td style="vertical-align: top;" id="messageBoxIDContent">
-                                                    <span>
-                                                      <div class="MessageBox_TextTitle" id="messageBoxIDTitle">
-                                                        xxInfo: AccessTableWithNoView
-                                                      </div>
-                                                      <div class="MessageBox_TextDescription" id="messageBoxIDMessage">
-                                                        xxThe current information is empty.
-                                                      </div>
-                                                      <div class="MessageBox_TextSeparator"></div>
-                                                    </span>
-                                                  </td>
-                                                </tr>
-                                                </TBODY>
-                                              </table>
-                                              </span>
-                                            </td>
-                                          </tr>
-                                          </TBODY>
-                                        </table>
-
-                                      </td>
-                                      <td class="MessageBox_RightTrans">
-                                        <div class="MessageBox_TopRight"></div>
-                                        <div class="MessageBox_Right"></div>
-                                      </td>
-                                    </tr>
-                                    <tr>
-                                      <td rowspan="2" class="MessageBox_BottomLeft">
-                                      </td>
-                                      <td class="MessageBox_BottomTrans MessageBox_bg">
-                                      </td>
-                                      <td rowspan="2" class="MessageBox_BottomRight">
-                                      </td>
-                                    </tr>
-                                    <tr>
-                                      <td class="MessageBox_Bottom">
-                                      </td>
-                                    </tr>
-                                    </TBODY>
-                                  </table>
-
-                                </td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              <tr class="MessageBox_BottomMargin">
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td></td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              </TBODY>
-                            </table>              <!-- USER CONTROLS -->
-              <TABLE class="Main_Client_TableEdition">
-                <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>
-                  <td class="TableEdition_OneCell_width"></td>
-                  <td class="TableEdition_OneCell_width"></td>
-                </tr>
-
-                <TR>
-                  <TD class="TitleCell"><SPAN class="LabelText">Client</SPAN></TD>
-                  <TD class="TextBox_ContentCell" colspan="2">
-                    <INPUT dojoType="openbravo:ValidationTextbox" required="true" class="TextBox_TwoCells_width required" type="text" name="inpCliente" id="paramCliente" maxlength="30" value="Cliente"></INPUT><script>djConfig.searchIds.push("paramCliente");</script>
-                  </TD>
+</HEAD>
+<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
+  <FORM name="frmMain" method="POST" action="InitialClientSetup.html" enctype="multipart/form-data" id="form"> 
+  <INPUT type="hidden" name="Command"></INPUT>
+  <input type="hidden" name="inpLastFieldChanged" value="">
+  <table height="100%" border="0" cellpadding="0" cellspacing="0" id="main">
+    <tr>
+      <td valign="top" id="tdleftTabs"></td>
+      <td valign="top">
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Left">
+          <TR><TD class="Main_NavBar_bg_left" id="tdleftSeparator"></TD></TR>
+          <TR><TD class="Main_ToolBar_bg_left" valign="top"></TD></TR>
+          <TR><TD class="Main_Client_bg_left"></TD></TR>
+          <TR><TD class="Main_Bottom_bg_left"></TD></TR>
+        </TABLE>
+      </td>
+      <td valign="top">
+        <div class="Main_ContentPane_NavBar" id="tdtopButtons"></div>
+        <div class="Main_ContentPane_ToolBar" id="paramToolBar"></div>
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_TabPane" id="tdtopTabs">
+          <TR id="paramParentTabContainer"></TR>
+          <TR id="paramMainTabContainer"></TR>
+          <TR id="paramChildTabContainer"></TR>
+        </TABLE>
+        <DIV class="Main_ContentPane_Client" style="overflow: auto; display: none;" id="client">
+                <table class="dojoTabContainer" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
+                  <tr>
+                    <td>
+                      <table class="dojoTabPaneWrapper" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
+                        <tr>
+                          <td>
+                            <!-- MessageBox -->
+
+                            <table cellpadding="0" cellspacing="0" id="messageBoxID" class="MessageBoxyy">
+                              <TBODY>
+                              <tr class="MessageBox_TopMargin">
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td></td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              <tr>
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td>
+
+                                  <table cellpadding="0" cellspacing="0" style="width: 100%;">
+                                    <TBODY>
+                                    <tr>
+                                      <td>
+                                        <div class="MessageBox_TopLeft"></div>
+                                        <div class="MessageBox_Left"></div>
+                                      </td>
+                                      <td class="MessageBox_bg">
+
+                                        <table class="MessageBox_Top">
+                                        <TBODY>
+                                          <tr>
+                                            <td>
+                                              <span>
+                                              <table cellpadding="0" cellspacing="0" class="MessageBox_Body_ContentCell">
+                                                <TBODY>
+                                                <tr>
+                                                  <td class="MessageBox_Icon_ContentCell">
+                                                    <div class="MessageBox_Icon"></div>
+                                                  </td>
+                                                  <td style="vertical-align: top;" id="messageBoxIDContent">
+                                                    <span>
+                                                      <div class="MessageBox_TextTitle" id="messageBoxIDTitle">
+                                                        xxInfo: AccessTableWithNoView
+                                                      </div>
+                                                      <div class="MessageBox_TextDescription" id="messageBoxIDMessage">
+                                                        xxThe current information is empty.
+                                                      </div>
+                                                      <div class="MessageBox_TextSeparator"></div>
+                                                    </span>
+                                                  </td>
+                                                </tr>
+                                                </TBODY>
+                                              </table>
+                                              </span>
+                                            </td>
+                                          </tr>
+                                          </TBODY>
+                                        </table>
+
+                                      </td>
+                                      <td class="MessageBox_RightTrans">
+                                        <div class="MessageBox_TopRight"></div>
+                                        <div class="MessageBox_Right"></div>
+                                      </td>
+                                    </tr>
+                                    <tr>
+                                      <td rowspan="2" class="MessageBox_BottomLeft">
+                                      </td>
+                                      <td class="MessageBox_BottomTrans MessageBox_bg">
+                                      </td>
+                                      <td rowspan="2" class="MessageBox_BottomRight">
+                                      </td>
+                                    </tr>
+                                    <tr>
+                                      <td class="MessageBox_Bottom">
+                                      </td>
+                                    </tr>
+                                    </TBODY>
+                                  </table>
+
+                                </td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              <tr class="MessageBox_BottomMargin">
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td></td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              </TBODY>
+                            </table>              <!-- USER CONTROLS -->
+              <TABLE class="Main_Client_TableEdition">
+                <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>
+                  <td class="TableEdition_OneCell_width"></td>
+                  <td class="TableEdition_OneCell_width"></td>
+                </tr>
+
+                <TR>
+                  <TD class="TitleCell"><SPAN class="LabelText">Client</SPAN></TD>
+                  <TD class="TextBox_ContentCell" colspan="2">
+                    <INPUT dojoType="openbravo:ValidationTextbox" required="true" class="TextBox_TwoCells_width required" type="text" name="inpCliente" id="paramCliente" maxlength="30" value="Cliente"></INPUT><script>djConfig.searchIds.push("paramCliente");</script>
+                  </TD>
                   <TD class="TitleCell"><SPAN class="LabelText">Organization</SPAN></TD>
                   <TD class="TextBox_ContentCell" colspan="2">
                     <INPUT dojoType="openbravo:ValidationTextbox" required="true" class="TextBox_TwoCells_width required" type="text" name="inpOrganizacion" id="paramOrganizacion" size="20" maxlength="30" value="Org"></INPUT><script>djConfig.searchIds.push("paramOrganizacion");</script>
-                  </TD>
-                </TR>
-                <TR>
-                  <TD class="TitleCell"><SPAN class="LabelText">Client Username</SPAN></TD>
-                  <TD class="TextBox_ContentCell" colspan="2">
-                    <INPUT dojoType="openbravo:ValidationTextbox" required="true" class="TextBox_TwoCells_width required" type="text" name="inpClienteUsuario" id="paramClienteUsuario" maxlength="30" value="ClienteAdmin"></INPUT><script>djConfig.searchIds.push("paramClienteUsuario");</script>
-                  </TD>
-                  <TD class="TitleCell"><SPAN class="LabelText">Organization Username</SPAN></TD>
-                  <TD class="Combo_ContentCell" colspan="2">
-                    <INPUT dojoType="openbravo:ValidationTextbox" required="true" class="TextBox_TwoCells_width required" type="text" name="inpOrganizacionUsuario" id="paramOrganizacionCliente" maxlength="30" value="ClienteUser"></INPUT><script>djConfig.searchIds.push("paramOrganizacionCliente");</script>
-                  </TD>
-                </TR>
-                <TR>
-                  <TD class="TitleCell"><SPAN class="LabelText">Country</SPAN></TD>
-                  <TD class="Combo_ContentCell" colspan="2">
-                    <SELECT name="inpPais" onchange="actualizarDatos(document.frmMain.inpPais);return true;" id="inpPais" class="Combo Combo_TwoCells_width required">
-                      <OPTION value=""></OPTION><DIV id="reportCountry_M"></DIV>
-                    </SELECT>
-                  </TD>
-                  <TD class="TitleCell"><SPAN class="LabelText">Region</SPAN></TD>
-                  <TD class="Combo_ContentCell" colspan="2">
-                    <SELECT name="inpRegion" id="inpRegion" class="Combo Combo_TwoCells_width">
-                      <OPTION value=""></OPTION><DIV id="reportRegion_M"></DIV>
-                    </SELECT>
-                  </TD>
-                </TR>
-                <TR>
-                  <TD class="TitleCell"><SPAN class="LabelText">City</SPAN></TD>
-                  <TD class="TextBox_ContentCell" colspan="2">
-                    <INPUT dojoType="openbravo:ValidationTextbox" required="true" class="TextBox_TwoCells_width required" type="text"  name="inpCiudad" id="paramCiudad" maxlength="30" value=""></INPUT><script>djConfig.searchIds.push("paramCiudad");</script>
-                  </TD>
+                  </TD>
+                </TR>
+                <TR>
+                  <TD class="TitleCell"><SPAN class="LabelText">Client Username</SPAN></TD>
+                  <TD class="TextBox_ContentCell" colspan="2">
+                    <INPUT dojoType="openbravo:ValidationTextbox" required="true" class="TextBox_TwoCells_width required" type="text" name="inpClienteUsuario" id="paramClienteUsuario" maxlength="30" value="ClienteAdmin"></INPUT><script>djConfig.searchIds.push("paramClienteUsuario");</script>
+                  </TD>
+                  <TD class="TitleCell"><SPAN class="LabelText">Organization Username</SPAN></TD>
+                  <TD class="Combo_ContentCell" colspan="2">
+                    <INPUT dojoType="openbravo:ValidationTextbox" required="true" class="TextBox_TwoCells_width required" type="text" name="inpOrganizacionUsuario" id="paramOrganizacionCliente" maxlength="30" value="ClienteUser"></INPUT><script>djConfig.searchIds.push("paramOrganizacionCliente");</script>
+                  </TD>
+                </TR>
+                <TR>
+                  <TD class="TitleCell"><SPAN class="LabelText">Country</SPAN></TD>
+                  <TD class="Combo_ContentCell" colspan="2">
+                    <SELECT name="inpPais" onchange="actualizarDatos(document.frmMain.inpPais);return true;" id="inpPais" class="Combo Combo_TwoCells_width required">
+                      <OPTION value=""></OPTION><DIV id="reportCountry_M"></DIV>
+                    </SELECT>
+                  </TD>
+                  <TD class="TitleCell"><SPAN class="LabelText">Region</SPAN></TD>
+                  <TD class="Combo_ContentCell" colspan="2">
+                    <SELECT name="inpRegion" id="inpRegion" class="Combo Combo_TwoCells_width">
+                      <OPTION value=""></OPTION><DIV id="reportRegion_M"></DIV>
+                    </SELECT>
+                  </TD>
+                </TR>
+                <TR>
+                  <TD class="TitleCell"><SPAN class="LabelText">City</SPAN></TD>
+                  <TD class="TextBox_ContentCell" colspan="2">
+                    <INPUT dojoType="openbravo:ValidationTextbox" required="true" class="TextBox_TwoCells_width required" type="text"  name="inpCiudad" id="paramCiudad" maxlength="30" value=""></INPUT><script>djConfig.searchIds.push("paramCiudad");</script>
+                  </TD>
                   <TD class="TitleCell"><SPAN class="LabelText">Currency</SPAN></TD>
                   <TD class="Combo_ContentCell" colspan="2">
                     <SELECT name="inpMoneda" id="inpMoneda" class="Combo Combo_TwoCells_width required" required="true">
                       <OPTION value=""></OPTION><DIV id="reportCurrency_M"></DIV>
                     </SELECT>
-                  </TD>
-                </TR>
-                <TR>
-                  <td colspan="6">
-                    <table class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
-                    <tbody>
-                      <tr class="FieldGroup_TopMargin"/>
-                      <tr>
-                        <td class="FieldGroupTitle_Left"><img class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"/></td>
-                        <td class="FieldGroupTitle">Accounting Dimensions</td>
-                        <td class="FieldGroupTitle_Right"><img class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"/></td>
-                        <td class="FieldGroupContent"/>
-                      </tr>
-                      <tr class="FieldGroup_BottomMargin"/>
-                    </tbody>
-                    </table>
-                  </td>
-                </TR>
-                <TR>
-                  <TD class="TitleCell"><SPAN class="LabelText">Business Partner</SPAN></TD>
-                  <TD class="Radio_Check_ContentCell"><SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpTercero" id="fieldTercero" value="-1"></INPUT></SPAN></TD>
-                  <TD class="TitleCell"></TD>
-                  <TD class="ContentCell"></TD>
-                  <TD class="TitleCell"><SPAN class="LabelText">Product</SPAN></TD>
-                  <TD class="Radio_Check_ContentCell"><SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpProducto" id="fieldProducto" value="-1"></INPUT></SPAN></TD>
-                </TR>
-                <TR>
-                  <TD class="TitleCell"><SPAN class="LabelText">Project</SPAN></TD>
-                  <TD class="Radio_Check_ContentCell"><SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpProyecto" id="fieldProyecto" value="-1"></INPUT></SPAN></TD>
-                  <TD class="TitleCell"></TD>
-                  <TD class="ContentCell"></TD>
-                  <TD class="TitleCell"></TD>
-                  <TD class="ContentCell"></TD>
-                </TR>
-                <TR>
-                  <TD class="TitleCell"><SPAN class="LabelText">Campaign</SPAN></TD>
-                  <TD class="Radio_Check_ContentCell"><SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpCampana" id="fieldCampana" value="-1"></INPUT></SPAN></TD>
-                  <TD class="TitleCell"></TD>
-                  <TD class="ContentCell"></TD>
-                  <TD class="TitleCell"><SPAN class="LabelText">Sales Region</SPAN></TD>
-                  <TD class="Radio_Check_ContentCell"><SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpZonaVentas" id="fieldZonaVentas" value="-1"></INPUT></SPAN></TD>
-                </TR>
-                <TR>
-                  <TD class="TitleCell"><SPAN class="LabelText">Accounting File</SPAN></TD>
-                  <TD class="TextBox_ContentCell" colspan="2">
-                    <INPUT type="file" class="dojoValidateValid TextBox_TwoCells_width" name="inpArchivo"></INPUT>
-                  </TD>
-                  <TD class="TitleCell"></TD>
-                  <TD class="ContentCell"></TD>
-                  <TD class="ContentCell"></TD>
-                </TR>
-                <TR>
-                  <TD class="TitleCell"></TD>
-                  <TD class="ContentCell"></TD>
-                  <TD class="Button_RightAlign_ContentCell">
-                    <div>
-                      <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Accept'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onclick="submitCommandForm('ACEPTAR',true);return false;" id="buttonOK">
-                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Accept';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
-                        <tr>
-                          <td class="Button_left"><img class="Button_Icon Button_Icon_ok" alt="Accept" title="Accept" src="../../../../../web/images/blank.gif" border=0/></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="submitCommandForm('CANCELAR');return false;">
-                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Cancel';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';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/></td>
-                          <td class="Button_text Button_width">Cancel</td>
-                          <td class="Button_right"></td>
-                        </tr>
-                      </table>
-                      </a>
-                    </div>
-                  </TD>
-                  <TD class="TitleCell"></TD>
-                  <TD class="ContentCell"></TD>
-                </TR>
-              </TABLE>
-
-
-                      <!-- USER CONTROLS -->
-                </TD>
-              </TR>
-              </TABLE>
-              </TD>
-            </TR>
-          </TABLE>
-        </div>
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Menu_ContentPane_Bottom" id="tdbottomSeparator">
-          <TR>
-            <TD class="Main_Bottom_bg"><IMG src="../../../../../web/images/blank.gif" border="0"></TD>
-          </TR>
-        </TABLE></td>
-      <td valign="top">
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Right" id="tdrightSeparator">
-          <TR><TD class="Main_NavBar_bg_right"></TD></TR>
-          <TR><TD class="Main_ToolBar_bg_right" valign="top"></TD></TR>
-          <TR><TD class="Main_Client_bg_right"></TD></TR>
-          <TR><TD class="Main_Bottom_bg_right"></TD></TR>
-        </TABLE>
-      </td>
-    </tr>
-  </table>
-</form>
-</BODY>
-</HTML>
+                  </TD>
+                </TR>
+                <TR>
+                  <td colspan="6">
+                    <table class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
+                    <tbody>
+                      <tr class="FieldGroup_TopMargin"/>
+                      <tr>
+                        <td class="FieldGroupTitle_Left"><img class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"/></td>
+                        <td class="FieldGroupTitle">Accounting Dimensions</td>
+                        <td class="FieldGroupTitle_Right"><img class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"/></td>
+                        <td class="FieldGroupContent"/>
+                      </tr>
+                      <tr class="FieldGroup_BottomMargin"/>
+                    </tbody>
+                    </table>
+                  </td>
+                </TR>
+                <TR>
+                  <TD class="TitleCell"><SPAN class="LabelText">Business Partner</SPAN></TD>
+                  <TD class="Radio_Check_ContentCell"><SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpTercero" id="fieldTercero" value="-1"></INPUT></SPAN></TD>
+                  <TD class="TitleCell"></TD>
+                  <TD class="ContentCell"></TD>
+                  <TD class="TitleCell"><SPAN class="LabelText">Product</SPAN></TD>
+                  <TD class="Radio_Check_ContentCell"><SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpProducto" id="fieldProducto" value="-1"></INPUT></SPAN></TD>
+                </TR>
+                <TR>
+                  <TD class="TitleCell"><SPAN class="LabelText">Project</SPAN></TD>
+                  <TD class="Radio_Check_ContentCell"><SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpProyecto" id="fieldProyecto" value="-1"></INPUT></SPAN></TD>
+                  <TD class="TitleCell"></TD>
+                  <TD class="ContentCell"></TD>
+                  <TD class="TitleCell"></TD>
+                  <TD class="ContentCell"></TD>
+                </TR>
+                <TR>
+                  <TD class="TitleCell"><SPAN class="LabelText">Campaign</SPAN></TD>
+                  <TD class="Radio_Check_ContentCell"><SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpCampana" id="fieldCampana" value="-1"></INPUT></SPAN></TD>
+                  <TD class="TitleCell"></TD>
+                  <TD class="ContentCell"></TD>
+                  <TD class="TitleCell"><SPAN class="LabelText">Sales Region</SPAN></TD>
+                  <TD class="Radio_Check_ContentCell"><SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpZonaVentas" id="fieldZonaVentas" value="-1"></INPUT></SPAN></TD>
+                </TR>
+                <TR>
+                  <TD class="TitleCell"><SPAN class="LabelText">Accounting File</SPAN></TD>
+                  <TD class="TextBox_ContentCell" colspan="2">
+                    <INPUT type="file" class="dojoValidateValid TextBox_TwoCells_width" name="inpArchivo"></INPUT>
+                  </TD>
+                  <TD class="TitleCell"></TD>
+                  <TD class="ContentCell"></TD>
+                  <TD class="ContentCell"></TD>
+                </TR>
+                <TR>
+                  <TD class="TitleCell"></TD>
+                  <TD class="ContentCell"></TD>
+                  <TD class="Button_RightAlign_ContentCell">
+                    <div>
+                      <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Accept'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onclick="submitCommandForm('ACEPTAR',true);return false;" id="buttonOK">
+                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Accept';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
+                        <tr>
+                          <td class="Button_left"><img class="Button_Icon Button_Icon_ok" alt="Accept" title="Accept" src="../../../../../web/images/blank.gif" border=0/></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="submitCommandForm('CANCELAR');return false;">
+                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Cancel';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';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/></td>
+                          <td class="Button_text Button_width">Cancel</td>
+                          <td class="Button_right"></td>
+                        </tr>
+                      </table>
+                      </a>
+                    </div>
+                  </TD>
+                  <TD class="TitleCell"></TD>
+                  <TD class="ContentCell"></TD>
+                </TR>
+              </TABLE>
+
+
+                      <!-- USER CONTROLS -->
+                </TD>
+              </TR>
+              </TABLE>
+              </TD>
+            </TR>
+          </TABLE>
+        </div>
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Menu_ContentPane_Bottom" id="tdbottomSeparator">
+          <TR>
+            <TD class="Main_Bottom_bg"><IMG src="../../../../../web/images/blank.gif" border="0"></TD>
+          </TR>
+        </TABLE></td>
+      <td valign="top">
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Right" id="tdrightSeparator">
+          <TR><TD class="Main_NavBar_bg_right"></TD></TR>
+          <TR><TD class="Main_ToolBar_bg_right" valign="top"></TD></TR>
+          <TR><TD class="Main_Client_bg_right"></TD></TR>
+          <TR><TD class="Main_Bottom_bg_right"></TD></TR>
+        </TABLE>
+      </td>
+    </tr>
+  </table>
+</form>
+</BODY>
+</HTML>
--- a/src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html	Tue Apr 22 09:17:07 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html	Tue Apr 22 09:19:30 2008 +0000
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/tr/xhtml1/Dtd/xhtml1-transitional.dtd">
-<!--
- *************************************************************************
- * 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-2008 Openbravo S.L. 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<HEAD>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<TITLE>Preferences</TITLE>
-<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico" type="image/x-icon"/>
-<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Main/Main_Manual.css" id="paramCSS"/>
-<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/calculator.js" type="text/javascript"></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/String.js" type="text/javascript"></SCRIPT>
-<SCRIPT language="JavaScript" src="../../../../../web/js/TypeAheadCombo.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 type="text/javascript"> 
-      //all dojo.require above this line
-      dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
-</script> 
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD Xhtml 1.0 Transitional//EN" "http://www.w3.org/tr/xhtml1/Dtd/xhtml1-transitional.dtd">
+<!--
+ *************************************************************************
+ * 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-2008 Openbravo S.L. 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<HEAD>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<TITLE>Preferences</TITLE>
+<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico" type="image/x-icon"/>
+<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Main/Main_Manual.css" id="paramCSS"/>
+<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/calculator.js" type="text/javascript"></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/String.js" type="text/javascript"></SCRIPT>
+<SCRIPT language="JavaScript" src="../../../../../web/js/TypeAheadCombo.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 type="text/javascript"> 
+      //all dojo.require above this line
+      dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
+</script> 
 	<SCRIPT language="JavaScript" type="text/javascript">
 	function onLoadDo(){
 		this.windowTables = new Array(
@@ -74,343 +74,343 @@
 		resizeArea();
 	}
 	</SCRIPT>
-</HEAD>
-<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();" id="paramMessage">
-      <FORM name="frmMain" method="post" action="ShowSessionPreferences.html">
-        <INPUT type="hidden" name="Command"></INPUT>
-  <table height="100%" border="0" cellpadding="0" cellspacing="0" id="main">
-    <tr>
-      <td valign="top" id="tdleftTabs"></td>
-      <td valign="top">
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Left">
-          <TR><TD class="Main_NavBar_bg_left" id="tdleftSeparator"></TD></TR>
-          <TR><TD class="Main_ToolBar_bg_left" valign="top"></TD></TR>
-          <TR><TD class="Main_Client_bg_left"></TD></TR>
-          <TR><TD class="Main_Bottom_bg_left"></TD></TR>
-        </TABLE>
-      </td>
-      <td valign="top">
-        <div class="Main_ContentPane_NavBar" id="tdtopButtons"></div>
-        <div class="Main_ContentPane_ToolBar" id="paramToolBar"></div>
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_TabPane" id="tdtopTabs">
-          <TR id="paramParentTabContainer"><td class="tabBackGroundInit"><div><span class="tabTitle"><div><span>Show Session - Preferences</span></div></span></div></td></tr>
-          <tr><td class="tabBackGround"></td></tr>
-          </TR>
-       </TABLE>
-
-        <DIV class="Main_ContentPane_Client" style="overflow: auto; display: none;" id="client">
-                <table class="dojoTabContainer" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
-                  <tr>
-                    <td>
-                      <table class="dojoTabPaneWrapper" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
-                        <tr>
-                          <td>
-                            <!-- MessageBox -->
-
-                            <table cellpadding="0" cellspacing="0" id="messageBoxID" class="MessageBoxyy">
-                              <TBODY>
-                              <tr class="MessageBox_TopMargin">
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td></td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              <tr>
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td>
-
-                                  <table cellpadding="0" cellspacing="0" style="width: 100%;">
-                                    <TBODY>
-                                    <tr>
-                                      <td>
-                                        <div class="MessageBox_TopLeft"></div>
-                                        <div class="MessageBox_Left"></div>
-                                      </td>
-                                      <td class="MessageBox_bg">
-
-                                        <table class="MessageBox_Top">
-                                        <TBODY>
-                                          <tr>
-                                            <td>
-                                              <span>
-                                              <table cellpadding="0" cellspacing="0" class="MessageBox_Body_ContentCell">
-                                                <TBODY>
-                                                <tr>
-                                                  <td class="MessageBox_Icon_ContentCell">
-                                                    <div class="MessageBox_Icon"></div>
-                                                  </td>
-                                                  <td style="vertical-align: top;" id="messageBoxIDContent">
-                                                    <span>
-                                                      <div class="MessageBox_TextTitle" id="messageBoxIDTitle">
-                                                        xxInfo: AccessTableWithNoView
-                                                      </div>
-                                                      <div class="MessageBox_TextDescription" id="messageBoxIDMessage">
-                                                        xxThe current information is empty.
-                                                      </div>
-                                                      <div class="MessageBox_TextSeparator"></div>
-                                                    </span>
-                                                  </td>
-                                                </tr>
-                                                </TBODY>
-                                              </table>
-                                              </span>
-                                            </td>
-                                          </tr>
-                                          </TBODY>
-                                        </table>
-
-                                      </td>
-                                      <td class="MessageBox_RightTrans">
-                                        <div class="MessageBox_TopRight"></div>
-                                        <div class="MessageBox_Right"></div>
-                                      </td>
-                                    </tr>
-                                    <tr>
-                                      <td rowspan="2" class="MessageBox_BottomLeft">
-                                      </td>
-                                      <td class="MessageBox_BottomTrans MessageBox_bg">
-                                      </td>
-                                      <td rowspan="2" class="MessageBox_BottomRight">
-                                      </td>
-                                    </tr>
-                                    <tr>
-                                      <td class="MessageBox_Bottom">
-                                      </td>
-                                    </tr>
-                                    </TBODY>
-                                  </table>
-
-                                </td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              <tr class="MessageBox_BottomMargin">
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td></td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              </TBODY>
-                            </table>              <!-- USER CONTROLS -->
-              <TABLE class="Main_Client_TableEdition">
-                <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>
-                  <td class="TableEdition_OneCell_width"></td>
-                  <td class="TableEdition_OneCell_width"></td>
-                </tr>
-
-                <tr>
-                  <td colspan="6">
-                    <TEXTAREA name="inpInfo" cols="100%" rows="15" wrap="OFF" id="paramInfo" disabled="">xx</TEXTAREA>
-                  </td>
-                </tr>
-
-
-                <TR>
-                  <TD class="TitleCell"><SPAN class="LabelText">Show accounting tabs</SPAN></TD>
-                  <TD class="Radio_Check_ContentCell"><SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpAccounting" value="Y" id="paramAccounting"></INPUT></SPAN></TD>
-                  <TD class="TitleCell"><SPAN class="LabelText">Show translation tabs</SPAN></TD>
-                  <TD class="Radio_Check_ContentCell"><SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpTranslate" value="Y" id="paramTranslate"></INPUT></SPAN></TD>
-                  <TD class="TitleCell"><SPAN class="LabelText">Show test</SPAN></TD>
-                  <TD class="Radio_Check_ContentCell"><SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpTest" value="Y" id="paramTest"></INPUT></SPAN></TD>
-                </TR>
-
-                <TR>
+</HEAD>
+<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();" id="paramMessage">
+      <FORM name="frmMain" method="post" action="ShowSessionPreferences.html">
+        <INPUT type="hidden" name="Command"></INPUT>
+  <table height="100%" border="0" cellpadding="0" cellspacing="0" id="main">
+    <tr>
+      <td valign="top" id="tdleftTabs"></td>
+      <td valign="top">
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Left">
+          <TR><TD class="Main_NavBar_bg_left" id="tdleftSeparator"></TD></TR>
+          <TR><TD class="Main_ToolBar_bg_left" valign="top"></TD></TR>
+          <TR><TD class="Main_Client_bg_left"></TD></TR>
+          <TR><TD class="Main_Bottom_bg_left"></TD></TR>
+        </TABLE>
+      </td>
+      <td valign="top">
+        <div class="Main_ContentPane_NavBar" id="tdtopButtons"></div>
+        <div class="Main_ContentPane_ToolBar" id="paramToolBar"></div>
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_TabPane" id="tdtopTabs">
+          <TR id="paramParentTabContainer"><td class="tabBackGroundInit"><div><span class="tabTitle"><div><span>Show Session - Preferences</span></div></span></div></td></tr>
+          <tr><td class="tabBackGround"></td></tr>
+          </TR>
+       </TABLE>
+
+        <DIV class="Main_ContentPane_Client" style="overflow: auto; display: none;" id="client">
+                <table class="dojoTabContainer" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
+                  <tr>
+                    <td>
+                      <table class="dojoTabPaneWrapper" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
+                        <tr>
+                          <td>
+                            <!-- MessageBox -->
+
+                            <table cellpadding="0" cellspacing="0" id="messageBoxID" class="MessageBoxyy">
+                              <TBODY>
+                              <tr class="MessageBox_TopMargin">
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td></td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              <tr>
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td>
+
+                                  <table cellpadding="0" cellspacing="0" style="width: 100%;">
+                                    <TBODY>
+                                    <tr>
+                                      <td>
+                                        <div class="MessageBox_TopLeft"></div>
+                                        <div class="MessageBox_Left"></div>
+                                      </td>
+                                      <td class="MessageBox_bg">
+
+                                        <table class="MessageBox_Top">
+                                        <TBODY>
+                                          <tr>
+                                            <td>
+                                              <span>
+                                              <table cellpadding="0" cellspacing="0" class="MessageBox_Body_ContentCell">
+                                                <TBODY>
+                                                <tr>
+                                                  <td class="MessageBox_Icon_ContentCell">
+                                                    <div class="MessageBox_Icon"></div>
+                                                  </td>
+                                                  <td style="vertical-align: top;" id="messageBoxIDContent">
+                                                    <span>
+                                                      <div class="MessageBox_TextTitle" id="messageBoxIDTitle">
+                                                        xxInfo: AccessTableWithNoView
+                                                      </div>
+                                                      <div class="MessageBox_TextDescription" id="messageBoxIDMessage">
+                                                        xxThe current information is empty.
+                                                      </div>
+                                                      <div class="MessageBox_TextSeparator"></div>
+                                                    </span>
+                                                  </td>
+                                                </tr>
+                                                </TBODY>
+                                              </table>
+                                              </span>
+                                            </td>
+                                          </tr>
+                                          </TBODY>
+                                        </table>
+
+                                      </td>
+                                      <td class="MessageBox_RightTrans">
+                                        <div class="MessageBox_TopRight"></div>
+                                        <div class="MessageBox_Right"></div>
+                                      </td>
+                                    </tr>
+                                    <tr>
+                                      <td rowspan="2" class="MessageBox_BottomLeft">
+                                      </td>
+                                      <td class="MessageBox_BottomTrans MessageBox_bg">
+                                      </td>
+                                      <td rowspan="2" class="MessageBox_BottomRight">
+                                      </td>
+                                    </tr>
+                                    <tr>
+                                      <td class="MessageBox_Bottom">
+                                      </td>
+                                    </tr>
+                                    </TBODY>
+                                  </table>
+
+                                </td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              <tr class="MessageBox_BottomMargin">
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td></td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              </TBODY>
+                            </table>              <!-- USER CONTROLS -->
+              <TABLE class="Main_Client_TableEdition">
+                <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>
+                  <td class="TableEdition_OneCell_width"></td>
+                  <td class="TableEdition_OneCell_width"></td>
+                </tr>
+
+                <tr>
+                  <td colspan="6">
+                    <TEXTAREA name="inpInfo" cols="100%" rows="15" wrap="OFF" id="paramInfo" disabled="">xx</TEXTAREA>
+                  </td>
+                </tr>
+
+
+                <TR>
+                  <TD class="TitleCell"><SPAN class="LabelText">Show accounting tabs</SPAN></TD>
+                  <TD class="Radio_Check_ContentCell"><SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpAccounting" value="Y" id="paramAccounting"></INPUT></SPAN></TD>
+                  <TD class="TitleCell"><SPAN class="LabelText">Show translation tabs</SPAN></TD>
+                  <TD class="Radio_Check_ContentCell"><SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpTranslate" value="Y" id="paramTranslate"></INPUT></SPAN></TD>
+                  <TD class="TitleCell"><SPAN class="LabelText">Show test</SPAN></TD>
+                  <TD class="Radio_Check_ContentCell"><SPAN class="Checkbox_container_NOT_Focused"><INPUT type="checkbox" name="inpTest" value="Y" id="paramTest"></INPUT></SPAN></TD>
+                </TR>
+
+                <TR>
                   <TD class="TitleCell"> <SPAN class="LabelText">Show audit</SPAN></TD>
                   <TD class="Radio_Check_ContentCell"> 
                     <INPUT type="checkbox" name="inpAudit" value="Y" id="paramAudit"></INPUT>
-                  </TD>
-                  <TD class="TitleCell"> <SPAN class="LabelText">Date</SPAN></TD>
-                  <TD class="TextBox_btn_ContentCell">
-                    <TABLE border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
-                      <TR>
-                        <TD class="TextBox_ContentCell">
-                          <INPUT dojoType="openbravo:DateTextbox" displayFormat="xx" saveFormat="yy" class="TextBox_btn_OneCell_width" type="text" name="inpFecha" id="paramFecha" value="xx" maxlength="10" onkeyup="auto_complete_date(this.textbox, this.displayFormat);return true;"></INPUT><script>djConfig.searchIds.push("paramFecha");</script>
-                        </TD>
-                        <TD class="FieldButton_ContentCell">
-                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"   onclick="showCalendar('frmMain.inpFecha', document.frmMain.inpFecha.value, false);return false;">
-                          <table class="FieldButton" onmouseout="window.status='';return true;" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calculator';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
-                            <TR>
-                              <TD class="FieldButton_bg">
-                                <IMG alt="Calendar" class="FieldButton_Icon FieldButton_Icon_calendar" title="Calendar" src="../../../../../web/images/blank.gif" border="0"></IMG>
-                              </TD>
-                            </TR>
-                          </TABLE>
-                          </a>
-                        </TD>
-                      </TR>
-                    </TABLE>
-                  </TD>
-                  <TD class="TitleCell"><SPAN class="LabelText">Theme</SPAN></TD>
-                  <TD class="Combo_ContentCell"> <select name="inpTheme" id="reportTheme_S" class="Combo Combo_OneCell_width">
-                      <div id="reportTheme"><option value="xxclassic" class="discard">xxClasicc</div>
-                    </select></TD>
-                </TR>
-
-                <TR>
-                  <TD class="TitleCell"><SPAN class="LabelText">Records range</SPAN></TD>
-                  <TD class="TextBox_btn_ContentCell">
-                    <TABLE border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
-                      <TR>
-                        <TD class="TextBox_ContentCell">
-                          <INPUT dojoType="openbravo:RealNumberTextbox" class="TextBox_btn_OneCell_width" type="text" name="inpRecordRange" id="RecordRange" value="xx" maxlength="10" onkeydown="auto_complete_number(this, true, true);return true;"></INPUT><script>djConfig.searchIds.push("RecordRange");</script>
-                        </TD>
-                        <TD class="FieldButton_ContentCell">
-                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calculator'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"   onclick="calculator('frmMain.inpRecordRange', document.frmMain.inpRecordRange.value, false);return false;">
-                          <table class="FieldButton" onmouseout="window.status='';return true;" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calculator';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
-                            <TR>
-                              <TD class="FieldButton_bg">
-                                <IMG alt="Calculator" class="FieldButton_Icon FieldButton_Icon_Calc" title="Calculator" src="../../../../../web/images/blank.gif" border="0"></IMG>
-                              </TD>
-                            </TR>
-                          </TABLE>
-                          </a>
-                        </TD>
-                      </TR>
-                    </TABLE>
-                  </TD>
-                  <TD class="TitleCell"><SPAN class="LabelText">Transaction range</SPAN></TD>
-                  <TD class="TextBox_btn_ContentCell">
-                    <TABLE border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
-                      <TR>
-                        <TD class="TextBox_ContentCell">
-                          <INPUT dojoType="openbravo:RealNumberTextbox" class="TextBox_btn_OneCell_width" type="text" name="inpTransactionalRange" id="paramTransactionalRange" value="xx" maxlength="10" onkeydown="auto_complete_number(this, true, true);return true;"></INPUT><script>djConfig.searchIds.push("paramTransactionalRange");</script>
-                        </TD>
-                        <TD class="FieldButton_ContentCell">
-                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calculator'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"   onclick="calculator('frmMain.inpTransactionalRange', document.frmMain.inpTransactionalRange.value, false);return false;">
-                          <table class="FieldButton" onmouseout="window.status='';return true;" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calculator';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
-                            <TR>
-                              <TD class="FieldButton_bg">
-                                <IMG alt="Calculator" class="FieldButton_Icon FieldButton_Icon_Calc" title="Calculator" src="../../../../../web/images/blank.gif" border="0"></IMG>
-                              </TD>
-                            </TR>
-                          </TABLE>
-                          </a>
-                        </TD>
-                      </TR>
-                    </TABLE>
-                  </TD>
-                  <TD class="TitleCell"><SPAN class="LabelText">Selector registry range</SPAN></TD>
-                  <TD class="TextBox_btn_ContentCell">
-                    <TABLE border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
-                      <TR>
-                        <TD class="TextBox_ContentCell">
-                          <INPUT dojoType="openbravo:RealNumberTextbox" class="TextBox_btn_OneCell_width" type="text" name="inpRecordRangeInfo" id="RecordRangeInfo" value="xx" maxlength="10" onkeydown="auto_complete_number(this, true, true);return true;"></INPUT><script>djConfig.searchIds.push("RecordRangeInfo");</script>
-                        </TD>
-                        <TD class="FieldButton_ContentCell">
-                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calculator'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"   onclick="calculator('frmMain.inpTransactionalRange', document.frmMain.inpTransactionalRange.value, false);return false;">
-                          <table class="FieldButton" onmouseout="window.status='';return true;" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calculator';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
-                            <TR>
-                              <TD class="FieldButton_bg">
-                                <IMG alt="Calculator" class="FieldButton_Icon FieldButton_Icon_Calc" title="Calculator" src="../../../../../web/images/blank.gif" border="0"></IMG>
-                              </TD>
-                            </TR>
-                          </TABLE>
-                          </a>
-                        </TD>
-                      </TR>
-                    </TABLE>
-                  </TD>
-                </TR>
-
-
-                <TR>
-                  <TD colspan="2" class="Button_RightAlign_ContentCell">
-                    <div>
-                      <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Connections pool'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onmouseover="window.status='Connections pool';return true;" onclick="submitCommandForm('DEFAULT', false, null, '../utility/PoolStatus.html', '_self');return true;">
-                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Connections pool';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
-                        <tr>
-                          <td class="Button_left"><img class="Button_Icon Button_Icon_process" alt="Connections pool" title="Connections pool" src="../../../../../web/images/blank.gif" border=0/></td>
-                          <td class="Button_text">Connections pool</td>
-                          <td class="Button_right"></td>
-                        </tr>
-                      </table>
-                      </a>
-                    </div>
-                  </TD>
-                  <TD colspan="2" class="Button_CenterAlign_ContentCell">
-                    <div>
-                      <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Change Logs'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onmouseover="window.status='Change Logs';return true;" onclick="submitCommandForm('DEFAULT', false, null, '../utility/SetPriority.html', '_self');return true;">
-                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Change Logs';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
-                        <tr>
-                          <td class="Button_left"><img class="Button_Icon Button_Icon_edit" alt="Change Logs" title="Change Logs" src="../../../../../web/images/blank.gif" border=0/></td>
-                          <td class="Button_text">Change Logs</td>
-                          <td class="Button_right"></td>
-                        </tr>
-                      </table>
-                      </a>
-                    </div>
-                  </TD>
-                  <TD colspan="2" class="Button_LeftAlign_ContentCell">
-                    <div>
-                      <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='View role information'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onmouseover="window.status='View role information';return true;" 
-                      onclick="openServletNewWindow('DEFAULT', false, 'Role.html', 'ROLE', null, null, '460', '775');return true;">                               
-                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='View role information';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
-                        <tr>
-                          <td class="Button_left"><img class="Button_Icon Button_Icon_process" alt="View role information" title="View role information" src="../../../../../web/images/blank.gif" border=0/></td>
-                          <td class="Button_text">View role information</td>
-                          <td class="Button_right"></td>
-                        </tr>
-                      </table>
-                      </a>
-                    </div>
-                  </TD>
-                </TR>
-                <TR>
-                  <TD colspan="2" class="Button_RightAlign_ContentCell">
-                    <div>
-                      <a class="ButtonLink" href="#" onfocus="this.className='ButtonLink_hover'; window.status='Save'; return true;" onblur="this.className='ButtonLink'; window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_hover'; return true;" onmouseover="window.status='Save';return true;" onclick="submitCommandForm('SAVE_PREFERENCES', false, null, 'ShowSessionPreferences.html', '_self');return false;" id="buttonSave">
-                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Save';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
-                        <tr>
-                          <td class="Button_left"><img class="Button_Icon Button_Icon_save" alt="Save" title="Save" src="../../../../../web/images/blank.gif" border=0/></td>
-                          <td class="Button_text">Save Preferences</td>
-                          <td class="Button_right"></td>
-                        </tr>
-                      </table>
-                      </a>
-                    </div>
-                  </TD>
-                  <TD colspan="2"></TD>
-                  <TD colspan="2" class="Button_LeftAlign_ContentCell">
-                    <div>
-                      <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Clear Session'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;"  onmouseover="window.status='Clear Session';return true;" onclick="openServletNewWindow('DEFAULT', false, '../ad_actionButton/ClearSession.html', 'ROLE', null, null, '220');return true;">
-                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Clear Session';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
-                        <tr>
-                          <td class="Button_left"><img class="Button_Icon Button_Icon_clear" alt="Clear Session" title="Clear Session" src="../../../../../web/images/blank.gif" border=0/></td>
-                          <td class="Button_text">Clear Session</td>
-                          <td class="Button_right"></td>
-                        </tr>
-                      </table>
-                      </a>
-                    </div>
-                  </TD>
-                </TR>
-              </table>
-                      <!-- USER CONTROLS -->
-                </TD>
-              </TR>
-
-              </TABLE>
-              </TD>
-            </TR>
-          </TABLE>
-        </div>
-
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Menu_ContentPane_Bottom" id="tdbottomSeparator">
-          <TR>
-            <TD class="Main_Bottom_bg"><IMG src="../../../../../web/images/blank.gif" border="0"></TD>
-          </TR>
-        </TABLE></td>
-      <td valign="top">
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Right" id="tdrightSeparator">
-          <TR><TD class="Main_NavBar_bg_right"></TD></TR>
-          <TR><TD class="Main_ToolBar_bg_right" valign="top"></TD></TR>
-          <TR><TD class="Main_Client_bg_right"></TD></TR>
-          <TR><TD class="Main_Bottom_bg_right"></TD></TR>
-        </TABLE>
-      </td>
-    </tr>
-  </table>
-</FORM>
-</BODY>
-</HTML>
+                  </TD>
+                  <TD class="TitleCell"> <SPAN class="LabelText">Date</SPAN></TD>
+                  <TD class="TextBox_btn_ContentCell">
+                    <TABLE border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
+                      <TR>
+                        <TD class="TextBox_ContentCell">
+                          <INPUT dojoType="openbravo:DateTextbox" displayFormat="xx" saveFormat="yy" class="TextBox_btn_OneCell_width" type="text" name="inpFecha" id="paramFecha" value="xx" maxlength="10" onkeyup="auto_complete_date(this.textbox, this.displayFormat);return true;"></INPUT><script>djConfig.searchIds.push("paramFecha");</script>
+                        </TD>
+                        <TD class="FieldButton_ContentCell">
+                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"   onclick="showCalendar('frmMain.inpFecha', document.frmMain.inpFecha.value, false);return false;">
+                          <table class="FieldButton" onmouseout="window.status='';return true;" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calculator';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
+                            <TR>
+                              <TD class="FieldButton_bg">
+                                <IMG alt="Calendar" class="FieldButton_Icon FieldButton_Icon_calendar" title="Calendar" src="../../../../../web/images/blank.gif" border="0"></IMG>
+                              </TD>
+                            </TR>
+                          </TABLE>
+                          </a>
+                        </TD>
+                      </TR>
+                    </TABLE>
+                  </TD>
+                  <TD class="TitleCell"><SPAN class="LabelText">Theme</SPAN></TD>
+                  <TD class="Combo_ContentCell"> <select name="inpTheme" id="reportTheme_S" class="Combo Combo_OneCell_width">
+                      <div id="reportTheme"><option value="xxclassic" class="discard">xxClasicc</div>
+                    </select></TD>
+                </TR>
+
+                <TR>
+                  <TD class="TitleCell"><SPAN class="LabelText">Records range</SPAN></TD>
+                  <TD class="TextBox_btn_ContentCell">
+                    <TABLE border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
+                      <TR>
+                        <TD class="TextBox_ContentCell">
+                          <INPUT dojoType="openbravo:RealNumberTextbox" class="TextBox_btn_OneCell_width" type="text" name="inpRecordRange" id="RecordRange" value="xx" maxlength="10" onkeydown="auto_complete_number(this, true, true);return true;"></INPUT><script>djConfig.searchIds.push("RecordRange");</script>
+                        </TD>
+                        <TD class="FieldButton_ContentCell">
+                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calculator'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"   onclick="calculator('frmMain.inpRecordRange', document.frmMain.inpRecordRange.value, false);return false;">
+                          <table class="FieldButton" onmouseout="window.status='';return true;" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calculator';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
+                            <TR>
+                              <TD class="FieldButton_bg">
+                                <IMG alt="Calculator" class="FieldButton_Icon FieldButton_Icon_Calc" title="Calculator" src="../../../../../web/images/blank.gif" border="0"></IMG>
+                              </TD>
+                            </TR>
+                          </TABLE>
+                          </a>
+                        </TD>
+                      </TR>
+                    </TABLE>
+                  </TD>
+                  <TD class="TitleCell"><SPAN class="LabelText">Transaction range</SPAN></TD>
+                  <TD class="TextBox_btn_ContentCell">
+                    <TABLE border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
+                      <TR>
+                        <TD class="TextBox_ContentCell">
+                          <INPUT dojoType="openbravo:RealNumberTextbox" class="TextBox_btn_OneCell_width" type="text" name="inpTransactionalRange" id="paramTransactionalRange" value="xx" maxlength="10" onkeydown="auto_complete_number(this, true, true);return true;"></INPUT><script>djConfig.searchIds.push("paramTransactionalRange");</script>
+                        </TD>
+                        <TD class="FieldButton_ContentCell">
+                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calculator'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"   onclick="calculator('frmMain.inpTransactionalRange', document.frmMain.inpTransactionalRange.value, false);return false;">
+                          <table class="FieldButton" onmouseout="window.status='';return true;" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calculator';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
+                            <TR>
+                              <TD class="FieldButton_bg">
+                                <IMG alt="Calculator" class="FieldButton_Icon FieldButton_Icon_Calc" title="Calculator" src="../../../../../web/images/blank.gif" border="0"></IMG>
+                              </TD>
+                            </TR>
+                          </TABLE>
+                          </a>
+                        </TD>
+                      </TR>
+                    </TABLE>
+                  </TD>
+                  <TD class="TitleCell"><SPAN class="LabelText">Selector registry range</SPAN></TD>
+                  <TD class="TextBox_btn_ContentCell">
+                    <TABLE border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
+                      <TR>
+                        <TD class="TextBox_ContentCell">
+                          <INPUT dojoType="openbravo:RealNumberTextbox" class="TextBox_btn_OneCell_width" type="text" name="inpRecordRangeInfo" id="RecordRangeInfo" value="xx" maxlength="10" onkeydown="auto_complete_number(this, true, true);return true;"></INPUT><script>djConfig.searchIds.push("RecordRangeInfo");</script>
+                        </TD>
+                        <TD class="FieldButton_ContentCell">
+                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calculator'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"   onclick="calculator('frmMain.inpTransactionalRange', document.frmMain.inpTransactionalRange.value, false);return false;">
+                          <table class="FieldButton" onmouseout="window.status='';return true;" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calculator';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
+                            <TR>
+                              <TD class="FieldButton_bg">
+                                <IMG alt="Calculator" class="FieldButton_Icon FieldButton_Icon_Calc" title="Calculator" src="../../../../../web/images/blank.gif" border="0"></IMG>
+                              </TD>
+                            </TR>
+                          </TABLE>
+                          </a>
+                        </TD>
+                      </TR>
+                    </TABLE>
+                  </TD>
+                </TR>
+
+
+                <TR>
+                  <TD colspan="2" class="Button_RightAlign_ContentCell">
+                    <div>
+                      <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Connections pool'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onmouseover="window.status='Connections pool';return true;" onclick="submitCommandForm('DEFAULT', false, null, '../utility/PoolStatus.html', '_self');return true;">
+                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Connections pool';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
+                        <tr>
+                          <td class="Button_left"><img class="Button_Icon Button_Icon_process" alt="Connections pool" title="Connections pool" src="../../../../../web/images/blank.gif" border=0/></td>
+                          <td class="Button_text">Connections pool</td>
+                          <td class="Button_right"></td>
+                        </tr>
+                      </table>
+                      </a>
+                    </div>
+                  </TD>
+                  <TD colspan="2" class="Button_CenterAlign_ContentCell">
+                    <div>
+                      <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Change Logs'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onmouseover="window.status='Change Logs';return true;" onclick="submitCommandForm('DEFAULT', false, null, '../utility/SetPriority.html', '_self');return true;">
+                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Change Logs';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
+                        <tr>
+                          <td class="Button_left"><img class="Button_Icon Button_Icon_edit" alt="Change Logs" title="Change Logs" src="../../../../../web/images/blank.gif" border=0/></td>
+                          <td class="Button_text">Change Logs</td>
+                          <td class="Button_right"></td>
+                        </tr>
+                      </table>
+                      </a>
+                    </div>
+                  </TD>
+                  <TD colspan="2" class="Button_LeftAlign_ContentCell">
+                    <div>
+                      <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='View role information'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onmouseover="window.status='View role information';return true;" 
+                      onclick="openServletNewWindow('DEFAULT', false, 'Role.html', 'ROLE', null, null, '460', '775');return true;">                               
+                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='View role information';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
+                        <tr>
+                          <td class="Button_left"><img class="Button_Icon Button_Icon_process" alt="View role information" title="View role information" src="../../../../../web/images/blank.gif" border=0/></td>
+                          <td class="Button_text">View role information</td>
+                          <td class="Button_right"></td>
+                        </tr>
+                      </table>
+                      </a>
+                    </div>
+                  </TD>
+                </TR>
+                <TR>
+                  <TD colspan="2" class="Button_RightAlign_ContentCell">
+                    <div>
+                      <a class="ButtonLink" href="#" onfocus="this.className='ButtonLink_hover'; window.status='Save'; return true;" onblur="this.className='ButtonLink'; window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_hover'; return true;" onmouseover="window.status='Save';return true;" onclick="submitCommandForm('SAVE_PREFERENCES', false, null, 'ShowSessionPreferences.html', '_self');return false;" id="buttonSave">
+                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Save';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
+                        <tr>
+                          <td class="Button_left"><img class="Button_Icon Button_Icon_save" alt="Save" title="Save" src="../../../../../web/images/blank.gif" border=0/></td>
+                          <td class="Button_text">Save Preferences</td>
+                          <td class="Button_right"></td>
+                        </tr>
+                      </table>
+                      </a>
+                    </div>
+                  </TD>
+                  <TD colspan="2"></TD>
+                  <TD colspan="2" class="Button_LeftAlign_ContentCell">
+                    <div>
+                      <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Clear Session'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;"  onmouseover="window.status='Clear Session';return true;" onclick="openServletNewWindow('DEFAULT', false, '../ad_actionButton/ClearSession.html', 'ROLE', null, null, '220');return true;">
+                        <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Clear Session';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
+                        <tr>
+                          <td class="Button_left"><img class="Button_Icon Button_Icon_clear" alt="Clear Session" title="Clear Session" src="../../../../../web/images/blank.gif" border=0/></td>
+                          <td class="Button_text">Clear Session</td>
+                          <td class="Button_right"></td>
+                        </tr>
+                      </table>
+                      </a>
+                    </div>
+                  </TD>
+                </TR>
+              </table>
+                      <!-- USER CONTROLS -->
+                </TD>
+              </TR>
+
+              </TABLE>
+              </TD>
+            </TR>
+          </TABLE>
+        </div>
+
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Menu_ContentPane_Bottom" id="tdbottomSeparator">
+          <TR>
+            <TD class="Main_Bottom_bg"><IMG src="../../../../../web/images/blank.gif" border="0"></TD>
+          </TR>
+        </TABLE></td>
+      <td valign="top">
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Right" id="tdrightSeparator">
+          <TR><TD class="Main_NavBar_bg_right"></TD></TR>
+          <TR><TD class="Main_ToolBar_bg_right" valign="top"></TD></TR>
+          <TR><TD class="Main_Client_bg_right"></TD></TR>
+          <TR><TD class="Main_Bottom_bg_right"></TD></TR>
+        </TABLE>
+      </td>
+    </tr>
+  </table>
+</FORM>
+</BODY>
+</HTML>
--- a/src/org/openbravo/erpCommon/ad_process/CashBankOperations.html	Tue Apr 22 09:17:07 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_process/CashBankOperations.html	Tue Apr 22 09:19:30 2008 +0000
@@ -1,117 +1,117 @@
-<!--
- *************************************************************************
- * 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>Cash and bank transactions</TITLE>
-
-<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico" type="image/x-icon"/>
-<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"/>
-<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Main/Main_Manual.css" id="paramCSS"/>
-
-<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" type="text/javascript" id="paramAlertMsg">ALERT_MSG = "Are you sure?";</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/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/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/String.js" type="text/javascript"></SCRIPT>
-<SCRIPT language="JavaScript" src="../../../../../web/js/TypeAheadCombo.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 type="text/javascript">
-        dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
-      </script>
-      
-
-<SCRIPT language="JavaScript" type="text/javascript">
-function depurar() {
-	var frm = document.frmMain;
-	if ((frm.inpCBankAccountFromID.value==null || frm.inpCBankAccountFromID.value=="") && (frm.inpCCashFromID.value==null || frm.inpCCashFromID.value=="")) {
-		frm.inpCBankAccountFromID.focus();
-		mensaje(1);
-		return false;
-	}
-	if ((frm.inpCBankAccountFromID.value!=null && frm.inpCBankAccountFromID.value!="") && (frm.inpCCashFromID.value!=null && frm.inpCCashFromID.value!="")) {
-		frm.inpCBankAccountFromID.focus();
-		mensaje(14);
-		return false;
-	}
-	if ((frm.inpCBankAccountToID.value==null || frm.inpCBankAccountToID.value=="") && (frm.inpCCashToID.value==null || frm.inpCCashToID.value=="")) {
-		frm.inpCBankAccountToID.focus();
-		mensaje(1);
-		return false;
-	}
-	if ((frm.inpCBankAccountToID.value!=null && frm.inpCBankAccountToID.value!="") && (frm.inpCCashToID.value!=null && frm.inpCCashToID.value!="")) {
-		frm.inpCBankAccountToID.focus();
-		mensaje(15);
-		return false;
-	}
-	if ((frm.inpAmount.value <= 0)) {
-		frm.inpAmount.focus();
-		mensaje(9);
-		return false;
-	}
-	if ((frm.inppaymentruleFrom.value==null || frm.inppaymentruleFrom.value=="")) {
-		frm.inppaymentruleFrom.focus();
-		mensaje(1);
-		return false;
-	}
-	if ((frm.inppaymentruleTo.value==null || frm.inppaymentruleTo.value=="")) {
-		frm.inppaymentruleTo.focus();
-		mensaje(1);
-		return false;
-	}
-	if ((frm.inpAmount.value==null || frm.inpAmount.value=="")) {
-		frm.inpAmount.focus();
-		mensaje(1);
-		return false;
-	}
-	if ((frm.inpmovementdate.value==null || frm.inpmovementdate.value=="")) {
-		frm.inpmovementdate.focus();
-		mensaje(1);
-		return false;
-	}
-	return true;
-}
-
-function onloadFunctions() {
-	new TypeAheadCombo("inpCBankAccountFromID");
-  new TypeAheadCombo("inpCBankAccountToID");
-  new TypeAheadCombo("inpCCashFromID");
-  new TypeAheadCombo("inpCCashToID");
-  new TypeAheadCombo("inppaymentruleFrom");
-  new TypeAheadCombo("inppaymentruleTo");
-}
-</SCRIPT>
+<!--
+ *************************************************************************
+ * 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>Cash and bank transactions</TITLE>
+
+<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico" type="image/x-icon"/>
+<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"/>
+<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Main/Main_Manual.css" id="paramCSS"/>
+
+<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" type="text/javascript" id="paramAlertMsg">ALERT_MSG = "Are you sure?";</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/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/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/String.js" type="text/javascript"></SCRIPT>
+<SCRIPT language="JavaScript" src="../../../../../web/js/TypeAheadCombo.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 type="text/javascript">
+        dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
+      </script>
+      
+
+<SCRIPT language="JavaScript" type="text/javascript">
+function depurar() {
+	var frm = document.frmMain;
+	if ((frm.inpCBankAccountFromID.value==null || frm.inpCBankAccountFromID.value=="") && (frm.inpCCashFromID.value==null || frm.inpCCashFromID.value=="")) {
+		frm.inpCBankAccountFromID.focus();
+		mensaje(1);
+		return false;
+	}
+	if ((frm.inpCBankAccountFromID.value!=null && frm.inpCBankAccountFromID.value!="") && (frm.inpCCashFromID.value!=null && frm.inpCCashFromID.value!="")) {
+		frm.inpCBankAccountFromID.focus();
+		mensaje(14);
+		return false;
+	}
+	if ((frm.inpCBankAccountToID.value==null || frm.inpCBankAccountToID.value=="") && (frm.inpCCashToID.value==null || frm.inpCCashToID.value=="")) {
+		frm.inpCBankAccountToID.focus();
+		mensaje(1);
+		return false;
+	}
+	if ((frm.inpCBankAccountToID.value!=null && frm.inpCBankAccountToID.value!="") && (frm.inpCCashToID.value!=null && frm.inpCCashToID.value!="")) {
+		frm.inpCBankAccountToID.focus();
+		mensaje(15);
+		return false;
+	}
+	if ((frm.inpAmount.value <= 0)) {
+		frm.inpAmount.focus();
+		mensaje(9);
+		return false;
+	}
+	if ((frm.inppaymentruleFrom.value==null || frm.inppaymentruleFrom.value=="")) {
+		frm.inppaymentruleFrom.focus();
+		mensaje(1);
+		return false;
+	}
+	if ((frm.inppaymentruleTo.value==null || frm.inppaymentruleTo.value=="")) {
+		frm.inppaymentruleTo.focus();
+		mensaje(1);
+		return false;
+	}
+	if ((frm.inpAmount.value==null || frm.inpAmount.value=="")) {
+		frm.inpAmount.focus();
+		mensaje(1);
+		return false;
+	}
+	if ((frm.inpmovementdate.value==null || frm.inpmovementdate.value=="")) {
+		frm.inpmovementdate.focus();
+		mensaje(1);
+		return false;
+	}
+	return true;
+}
+
+function onloadFunctions() {
+	new TypeAheadCombo("inpCBankAccountFromID");
+  new TypeAheadCombo("inpCBankAccountToID");
+  new TypeAheadCombo("inpCCashFromID");
+  new TypeAheadCombo("inpCCashToID");
+  new TypeAheadCombo("inppaymentruleFrom");
+  new TypeAheadCombo("inppaymentruleTo");
+}
+</SCRIPT>
 	<SCRIPT language="JavaScript" type="text/javascript">
 	function onLoadDo(){
 		this.windowTables = new Array(
@@ -137,332 +137,332 @@
 		resizeArea();
 	}
 	</SCRIPT>
-</HEAD>
-<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();"  id="body">
-<FORM id="form" method="POST" action="CashBankOperations.html" name="frmMain">
-  <INPUT type="hidden" name="Command">
-<INPUT type="hidden" name="IsPopUpCall" value="1"></INPUT>
-<table height="100%" border="0" cellpadding="0" cellspacing="0" id="main">
-    <tr>
-      <td valign="top" id="tdleftTabs"></td>
-      <td valign="top">
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Left">
-          <TR><TD class="Main_NavBar_bg_left" id="tdleftSeparator"></TD></TR>
-          <TR><TD class="Main_ToolBar_bg_left" valign="top"></TD></TR>
-          <TR><TD class="Main_Client_bg_left"></TD></TR>
-          <TR><TD class="Main_Bottom_bg_left"></TD></TR>
-        </TABLE>
-      </td>
-      <td valign="top">
-        <div class="Main_ContentPane_NavBar" id="tdtopButtons"></div>
-        <div class="Main_ContentPane_ToolBar" id="paramToolBar"></div>
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_TabPane" id="tdtopTabs">
-          <TR id="paramParentTabContainer"></TR>
-          <TR id="paramMainTabContainer"></TR>
-          <TR id="paramChildTabContainer"></TR>
-        </TABLE>
-        <div class="Main_ContentPane_Client" style="overflow: auto;" id="client">
-                <table class="dojoTabContainer" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
-                  <tr>
-                    <td>
-                      <table class="dojoTabPaneWrapper" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
-                        <tr>
-                          <td>
-                            <!-- MessageBox -->
-
-                            <table cellpadding="0" cellspacing="0" id="messageBoxID" class="MessageBoxyy">
-                              <TBODY>
-                              <tr class="MessageBox_TopMargin">
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td></td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              <tr>
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td>
-
-                                  <table cellpadding="0" cellspacing="0" style="width: 100%;">
-                                    <TBODY>
-                                    <tr>
-                                      <td>
-                                        <div class="MessageBox_TopLeft"></div>
-                                        <div class="MessageBox_Left"></div>
-                                      </td>
-                                      <td class="MessageBox_bg">
-
-                                        <table class="MessageBox_Top">
-                                        <TBODY>
-                                          <tr>
-                                            <td>
-                                              <span>
-                                              <table cellpadding="0" cellspacing="0" class="MessageBox_Body_ContentCell">
-                                                <TBODY>
-                                                <tr>
-                                                  <td class="MessageBox_Icon_ContentCell">
-                                                    <div class="MessageBox_Icon"></div>
-                                                  </td>
-                                                  <td style="vertical-align: top;" id="messageBoxIDContent">
-                                                    <span>
-                                                      <div class="MessageBox_TextTitle" id="messageBoxIDTitle">
-                                                        xxInfo: AccessTableWithNoView
-                                                      </div>
-                                                      <div class="MessageBox_TextDescription" id="messageBoxIDMessage">
-                                                        xxThe current information is empty.
-                                                      </div>
-                                                      <div class="MessageBox_TextSeparator"></div>
-                                                    </span>
-                                                  </td>
-                                                </tr>
-                                                </TBODY>
-                                              </table>
-                                              </span>
-                                            </td>
-                                          </tr>
-                                          </TBODY>
-                                        </table>
-
-                                      </td>
-                                      <td class="MessageBox_RightTrans">
-                                        <div class="MessageBox_TopRight"></div>
-                                        <div class="MessageBox_Right"></div>
-                                      </td>
-                                    </tr>
-                                    <tr>
-                                      <td rowspan="2" class="MessageBox_BottomLeft">
-                                      </td>
-                                      <td class="MessageBox_BottomTrans MessageBox_bg">
-                                      </td>
-                                      <td rowspan="2" class="MessageBox_BottomRight">
-                                      </td>
-                                    </tr>
-                                    <tr>
-                                      <td class="MessageBox_Bottom">
-                                      </td>
-                                    </tr>
-                                    </TBODY>
-                                  </table>
-
-                                </td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              <tr class="MessageBox_BottomMargin">
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td></td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              </TBODY>
-                            </table>
-        <!-- USER CONTROLS -->
-              <TABLE class="Main_Client_TableEdition">
-                <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>
-                  <td class="TableEdition_OneCell_width"></td>
-                  <td class="TableEdition_OneCell_width"></td>
-                </tr>
-  <tr>
-    <td colspan="6">
-      <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_InfoBar">
-        <tr>
-          <td class="Popup_InfoBar_Icon_cell"><IMG src="../../../../../web/images/blank.gif" border="0" class="Popup_InfoBar_Icon_info" /></td>
-          <td class="Popup_InfoBar_text_table">
-            <table>
-              <tr>
-                <td class="Popup_InfoBar_text" id="helpDiscard"><SPAN id="processHelp">&nbsp;</SPAN></td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <TR>
-          <TD colspan="6">
-            <TABLE class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
-              <TR class="FieldGroup_TopMargin"></TR>
-              <TR>
-                <TD class="FieldGroupTitle_Left"><IMG class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
-                <TD class="FieldGroupTitle">From</TD>
-                <TD class="FieldGroupTitle_Right"><IMG class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
-                <TD class="FieldGroupContent"></TD>
-
-              </TR>
-              <TR class="FieldGroup_BottomMargin"></TR>
-            </TABLE>
-          </TD>
-   </TR>
-   
-   <tr>
-      <TD class="TitleCell"><SPAN class="LabelText">Bank account</SPAN>&nbsp;</TD>
-      <TD class="Combo_ContentCell" colspan="2"> 
-        <SELECT class="Combo Combo_TwoCells_width" name="inpCBankAccountFromID" id="inpCBankAccountFromID">
-          <OPTION value=""/><DIV id="reportC_BankAccountFrom_ID"></DIV>
-        </SELECT>
-     </TD>
-     <TD class="TitleCell"><SPAN class="LabelText">Cash</SPAN>&nbsp;</TD>
+</HEAD>
+<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();"  id="body">
+<FORM id="form" method="POST" action="CashBankOperations.html" name="frmMain">
+  <INPUT type="hidden" name="Command">
+<INPUT type="hidden" name="IsPopUpCall" value="1"></INPUT>
+<table height="100%" border="0" cellpadding="0" cellspacing="0" id="main">
+    <tr>
+      <td valign="top" id="tdleftTabs"></td>
+      <td valign="top">
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Left">
+          <TR><TD class="Main_NavBar_bg_left" id="tdleftSeparator"></TD></TR>
+          <TR><TD class="Main_ToolBar_bg_left" valign="top"></TD></TR>
+          <TR><TD class="Main_Client_bg_left"></TD></TR>
+          <TR><TD class="Main_Bottom_bg_left"></TD></TR>
+        </TABLE>
+      </td>
+      <td valign="top">
+        <div class="Main_ContentPane_NavBar" id="tdtopButtons"></div>
+        <div class="Main_ContentPane_ToolBar" id="paramToolBar"></div>
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_TabPane" id="tdtopTabs">
+          <TR id="paramParentTabContainer"></TR>
+          <TR id="paramMainTabContainer"></TR>
+          <TR id="paramChildTabContainer"></TR>
+        </TABLE>
+        <div class="Main_ContentPane_Client" style="overflow: auto;" id="client">
+                <table class="dojoTabContainer" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
+                  <tr>
+                    <td>
+                      <table class="dojoTabPaneWrapper" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
+                        <tr>
+                          <td>
+                            <!-- MessageBox -->
+
+                            <table cellpadding="0" cellspacing="0" id="messageBoxID" class="MessageBoxyy">
+                              <TBODY>
+                              <tr class="MessageBox_TopMargin">
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td></td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              <tr>
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td>
+
+                                  <table cellpadding="0" cellspacing="0" style="width: 100%;">
+                                    <TBODY>
+                                    <tr>
+                                      <td>
+                                        <div class="MessageBox_TopLeft"></div>
+                                        <div class="MessageBox_Left"></div>
+                                      </td>
+                                      <td class="MessageBox_bg">
+
+                                        <table class="MessageBox_Top">
+                                        <TBODY>
+                                          <tr>
+                                            <td>
+                                              <span>
+                                              <table cellpadding="0" cellspacing="0" class="MessageBox_Body_ContentCell">
+                                                <TBODY>
+                                                <tr>
+                                                  <td class="MessageBox_Icon_ContentCell">
+                                                    <div class="MessageBox_Icon"></div>
+                                                  </td>
+                                                  <td style="vertical-align: top;" id="messageBoxIDContent">
+                                                    <span>
+                                                      <div class="MessageBox_TextTitle" id="messageBoxIDTitle">
+                                                        xxInfo: AccessTableWithNoView
+                                                      </div>
+                                                      <div class="MessageBox_TextDescription" id="messageBoxIDMessage">
+                                                        xxThe current information is empty.
+                                                      </div>
+                                                      <div class="MessageBox_TextSeparator"></div>
+                                                    </span>
+                                                  </td>
+                                                </tr>
+                                                </TBODY>
+                                              </table>
+                                              </span>
+                                            </td>
+                                          </tr>
+                                          </TBODY>
+                                        </table>
+
+                                      </td>
+                                      <td class="MessageBox_RightTrans">
+                                        <div class="MessageBox_TopRight"></div>
+                                        <div class="MessageBox_Right"></div>
+                                      </td>
+                                    </tr>
+                                    <tr>
+                                      <td rowspan="2" class="MessageBox_BottomLeft">
+                                      </td>
+                                      <td class="MessageBox_BottomTrans MessageBox_bg">
+                                      </td>
+                                      <td rowspan="2" class="MessageBox_BottomRight">
+                                      </td>
+                                    </tr>
+                                    <tr>
+                                      <td class="MessageBox_Bottom">
+                                      </td>
+                                    </tr>
+                                    </TBODY>
+                                  </table>
+
+                                </td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              <tr class="MessageBox_BottomMargin">
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td></td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              </TBODY>
+                            </table>
+        <!-- USER CONTROLS -->
+              <TABLE class="Main_Client_TableEdition">
+                <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>
+                  <td class="TableEdition_OneCell_width"></td>
+                  <td class="TableEdition_OneCell_width"></td>
+                </tr>
+  <tr>
+    <td colspan="6">
+      <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_InfoBar">
+        <tr>
+          <td class="Popup_InfoBar_Icon_cell"><IMG src="../../../../../web/images/blank.gif" border="0" class="Popup_InfoBar_Icon_info" /></td>
+          <td class="Popup_InfoBar_text_table">
+            <table>
+              <tr>
+                <td class="Popup_InfoBar_text" id="helpDiscard"><SPAN id="processHelp">&nbsp;</SPAN></td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <TR>
+          <TD colspan="6">
+            <TABLE class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
+              <TR class="FieldGroup_TopMargin"></TR>
+              <TR>
+                <TD class="FieldGroupTitle_Left"><IMG class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
+                <TD class="FieldGroupTitle">From</TD>
+                <TD class="FieldGroupTitle_Right"><IMG class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
+                <TD class="FieldGroupContent"></TD>
+
+              </TR>
+              <TR class="FieldGroup_BottomMargin"></TR>
+            </TABLE>
+          </TD>
+   </TR>
+   
+   <tr>
+      <TD class="TitleCell"><SPAN class="LabelText">Bank account</SPAN>&nbsp;</TD>
       <TD class="Combo_ContentCell" colspan="2"> 
-        <SELECT class="Combo Combo_TwoCells_width" name="inpCCashFromID" id="inpCCashFromID">
-          <OPTION value=""></OPTION><DIV id="reportC_CashFrom_ID"></DIV>
+        <SELECT class="Combo Combo_TwoCells_width" name="inpCBankAccountFromID" id="inpCBankAccountFromID">
+          <OPTION value=""/><DIV id="reportC_BankAccountFrom_ID"></DIV>
+        </SELECT>
+     </TD>
+     <TD class="TitleCell"><SPAN class="LabelText">Cash</SPAN>&nbsp;</TD>
+      <TD class="Combo_ContentCell" colspan="2"> 
+        <SELECT class="Combo Combo_TwoCells_width" name="inpCCashFromID" id="inpCCashFromID">
+          <OPTION value=""></OPTION><DIV id="reportC_CashFrom_ID"></DIV>
         </SELECT>
       </TD>
     </tr>
-    <tr>
-      <TD class="TitleCell"><SPAN class="LabelText">Payment rule</SPAN>&nbsp;</TD>
+    <tr>
+      <TD class="TitleCell"><SPAN class="LabelText">Payment rule</SPAN>&nbsp;</TD>
       <TD class="Combo_ContentCell"> 
-        <SELECT class="Combo Combo_OneCell_width" name="inppaymentruleFrom" id="inppaymentruleFrom">
-          <OPTION value=""></OPTION><DIV id="reportPaymentRuleFrom"></DIV>
+        <SELECT class="Combo Combo_OneCell_width" name="inppaymentruleFrom" id="inppaymentruleFrom">
+          <OPTION value=""></OPTION><DIV id="reportPaymentRuleFrom"></DIV>
         </SELECT></TD>
      <td/><td/>
-     <td/><td/>
-   </tr>
-   
-   
-   <TR>
-          <TD colspan="6">
-            <TABLE class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
-              <TR class="FieldGroup_TopMargin"></TR>
-              <TR>
-                <TD class="FieldGroupTitle_Left"><IMG class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
-                <TD class="FieldGroupTitle">To</TD>
-                <TD class="FieldGroupTitle_Right"><IMG class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
-                <TD class="FieldGroupContent"></TD>
-
-              </TR>
-              <TR class="FieldGroup_BottomMargin"></TR>
-            </TABLE>
-          </TD>
-   </TR>
-   
-   <tr>
-      <TD class="TitleCell"><SPAN class="LabelText">Bank account</SPAN>&nbsp;</TD>
-      <TD class="Combo_ContentCell" colspan="2"> 
-        <SELECT class="Combo Combo_TwoCells_width" name="inpCBankAccountToID" id="inpCBankAccountToID">
-          <OPTION value=""/><DIV id="reportC_BankAccountFrom_ID"></DIV>
-        </SELECT>
-     </TD>
-     <TD class="TitleCell"><SPAN class="LabelText">Cash</SPAN>&nbsp;</TD>
-      <TD class="Combo_ContentCell" colspan="2"> <SELECT class="Combo Combo_TwoCells_width" name="inpCCashToID" id="inpCCashToID">
-          <OPTION value=""></OPTION><DIV id="reportC_CashTo_ID"></DIV>
+     <td/><td/>
+   </tr>
+   
+   
+   <TR>
+          <TD colspan="6">
+            <TABLE class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
+              <TR class="FieldGroup_TopMargin"></TR>
+              <TR>
+                <TD class="FieldGroupTitle_Left"><IMG class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
+                <TD class="FieldGroupTitle">To</TD>
+                <TD class="FieldGroupTitle_Right"><IMG class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
+                <TD class="FieldGroupContent"></TD>
+
+              </TR>
+              <TR class="FieldGroup_BottomMargin"></TR>
+            </TABLE>
+          </TD>
+   </TR>
+   
+   <tr>
+      <TD class="TitleCell"><SPAN class="LabelText">Bank account</SPAN>&nbsp;</TD>
+      <TD class="Combo_ContentCell" colspan="2"> 
+        <SELECT class="Combo Combo_TwoCells_width" name="inpCBankAccountToID" id="inpCBankAccountToID">
+          <OPTION value=""/><DIV id="reportC_BankAccountFrom_ID"></DIV>
+        </SELECT>
+     </TD>
+     <TD class="TitleCell"><SPAN class="LabelText">Cash</SPAN>&nbsp;</TD>
+      <TD class="Combo_ContentCell" colspan="2"> <SELECT class="Combo Combo_TwoCells_width" name="inpCCashToID" id="inpCCashToID">
+          <OPTION value=""></OPTION><DIV id="reportC_CashTo_ID"></DIV>
         </SELECT></TD>
    </tr>
-   <tr>
-      <TD class="TitleCell"><SPAN class="LabelText">Payment rule</SPAN>&nbsp;</TD>
-      <TD class="Combo_ContentCell"> <SELECT class="Combo Combo_OneCell_width" name="inppaymentruleTo" id="inppaymentruleTo">
-          <OPTION value=""></OPTION><DIV id="reportPaymentRuleTo"></DIV>
+   <tr>
+      <TD class="TitleCell"><SPAN class="LabelText">Payment rule</SPAN>&nbsp;</TD>
+      <TD class="Combo_ContentCell"> <SELECT class="Combo Combo_OneCell_width" name="inppaymentruleTo" id="inppaymentruleTo">
+          <OPTION value=""></OPTION><DIV id="reportPaymentRuleTo"></DIV>
         </SELECT></TD>
         <td/><td/>
-     <td/><td/>
-   </tr>
-   
-   
-   
-   <TR>
-          <TD colspan="6">
-            <TABLE class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
-              <TR class="FieldGroup_TopMargin"></TR>
-              <TR>
-                <TD class="FieldGroupTitle_Left"><IMG class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
-                <TD class="FieldGroupTitle">Movement</TD>
-                <TD class="FieldGroupTitle_Right"><IMG class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
-                <TD class="FieldGroupContent"></TD>
-
-              </TR>
-              <TR class="FieldGroup_BottomMargin"></TR>
-            </TABLE>
-          </TD>
-   </TR>
-
-    
-    <TR> 
-      <TD class="TitleCell"><SPAN class="LabelText">Amount</SPAN>&nbsp;</TD>
-      <TD class="TextBox_ContentCell"> <INPUT class="dojoValidateValid TextBox_OneCell_width" type="text" name="inpAmount" value=""></INPUT>
-      </TD>
-      <TD class="TitleCell"><SPAN class="LabelText">Movement date</SPAN></TD>
-      <TD class="TextBox_btn_ContentCell">
-
-              <TABLE border="0" cellspacing="0" cellpadding="0" summary="" style="padding-top: 0px;">
-                <TR>
-                  <TD class="TextBox_ContentCell">
-                    <INPUT dojotype="openbravo:DateTextbox" displayformat="xx" saveformat="yy" class="TextBox_btn_OneCell_width"  type="text" name="inpmovementdate" id="inpmovementdate" size="10" maxlength="10" value="" onkeyup="auto_complete_date(this.textbox, this.displayFormat);return true;"></INPUT><SCRIPT>djConfig.searchIds.push("inpmovementdate");</SCRIPT>
-                  </TD>
-                  <TD class="FieldButton_ContentCell">
-                    <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpmovementdate', document.frmMain.inpmovementdate.value, false);return false;" >
-                      <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
-                      <TR>
-
-                        <TD class="FieldButton_bg">
-                          <IMG alt="Calendar" class="FieldButton_Icon FieldButton_Icon_Calendar" title="Calendar" src="../../../../../web/images/blank.gif" border="0"></IMG>
-                        </TD>
-                      </TR>
-                    </TABLE>
-                    </a>
-                  </TD>
-                </TR>
-              </TABLE>
-            </TD>
-     </TR>
-    <TR> 
-      <TD class="TitleCell"><SPAN class="LabelText">Description</SPAN>&nbsp;</TD>
-      <TD class="TextBox_ContentCell" colspan="4"> <TEXTAREA class="dojoValidateValid TextArea_FiveCells_width TextArea_Medium_height" rows="2" name="inpdescription"></TEXTAREA></TD>
-      <td/>
-    </TR>
-    <tr>
-            <td class="TitleCell"></td>
-            <td class="ContentCell" colspan="2"><SPAN class="LabelText" id="question">&nbsp;</SPAN></td>
-            <td class="ContentCell"></td>
-            <td class="TitleCell"></td>
-            <td class="ContentCell"></td>
-          </tr>
-          <tr>
-            <td class="TitleCell"></td>
-            <td class="Button_RightAlign_ContentCell">
-              <div>
-                <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Accept'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onclick="submitCommandForm('SAVE', true);return false;" id="buttonOK">
-                  <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Accept';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
-                  <tr>
-                    <td class="Button_left"><img class="Button_Icon Button_Icon_ok" alt="Accept" title="Accept" src="../../../../../web/images/blank.gif" border=0/></td>
-                    <td class="Button_text Button_width">OK</td>
-                    <td class="Button_right"></td>
-                  </tr>
-                </table>
-                </a>
-              </div>
-            </td>
-            <td class="Button_LeftAlign_ContentCell">
-        
-            </td>
-            <td class="ContentCell"></td>
-            <td class="TitleCell"></td>
-            <td class="ContentCell"></td>
-          </tr>
-              </TABLE>
-
-                      <!-- USER CONTROLS -->
-                </td>
-              </tr>
-              </table>
-              </td>
-            </tr>
-          </table>
-        </div>
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Menu_ContentPane_Bottom" id="tdbottomSeparator">
-          <TR>
-            <TD class="Main_Bottom_bg"><IMG src="../../../../../web/images/blank.gif" border="0"></TD>
-          </TR>
-        </TABLE>
-        </td>
-      <td valign="top">
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Right" id="tdrightSeparator">
-          <TR><TD class="Main_NavBar_bg_right"></TD></TR>
-          <TR><TD class="Main_ToolBar_bg_right" valign="top"></TD></TR>
-          <TR><TD class="Main_Client_bg_right"></TD></TR>
-          <TR><TD class="Main_Bottom_bg_right"></TD></TR>
-        </TABLE>
-      </td>
-    </tr>
-  </table>
-</FORM>
-</BODY>
-</HTML>
+     <td/><td/>
+   </tr>
+   
+   
+   
+   <TR>
+          <TD colspan="6">
+            <TABLE class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
+              <TR class="FieldGroup_TopMargin"></TR>
+              <TR>
+                <TD class="FieldGroupTitle_Left"><IMG class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
+                <TD class="FieldGroupTitle">Movement</TD>
+                <TD class="FieldGroupTitle_Right"><IMG class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
+                <TD class="FieldGroupContent"></TD>
+
+              </TR>
+              <TR class="FieldGroup_BottomMargin"></TR>
+            </TABLE>
+          </TD>
+   </TR>
+
+    
+    <TR> 
+      <TD class="TitleCell"><SPAN class="LabelText">Amount</SPAN>&nbsp;</TD>
+      <TD class="TextBox_ContentCell"> <INPUT class="dojoValidateValid TextBox_OneCell_width" type="text" name="inpAmount" value=""></INPUT>
+      </TD>
+      <TD class="TitleCell"><SPAN class="LabelText">Movement date</SPAN></TD>
+      <TD class="TextBox_btn_ContentCell">
+
+              <TABLE border="0" cellspacing="0" cellpadding="0" summary="" style="padding-top: 0px;">
+                <TR>
+                  <TD class="TextBox_ContentCell">
+                    <INPUT dojotype="openbravo:DateTextbox" displayformat="xx" saveformat="yy" class="TextBox_btn_OneCell_width"  type="text" name="inpmovementdate" id="inpmovementdate" size="10" maxlength="10" value="" onkeyup="auto_complete_date(this.textbox, this.displayFormat);return true;"></INPUT><SCRIPT>djConfig.searchIds.push("inpmovementdate");</SCRIPT>
+                  </TD>
+                  <TD class="FieldButton_ContentCell">
+                    <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpmovementdate', document.frmMain.inpmovementdate.value, false);return false;" >
+                      <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
+                      <TR>
+
+                        <TD class="FieldButton_bg">
+                          <IMG alt="Calendar" class="FieldButton_Icon FieldButton_Icon_Calendar" title="Calendar" src="../../../../../web/images/blank.gif" border="0"></IMG>
+                        </TD>
+                      </TR>
+                    </TABLE>
+                    </a>
+                  </TD>
+                </TR>
+              </TABLE>
+            </TD>
+     </TR>
+    <TR> 
+      <TD class="TitleCell"><SPAN class="LabelText">Description</SPAN>&nbsp;</TD>
+      <TD class="TextBox_ContentCell" colspan="4"> <TEXTAREA class="dojoValidateValid TextArea_FiveCells_width TextArea_Medium_height" rows="2" name="inpdescription"></TEXTAREA></TD>
+      <td/>
+    </TR>
+    <tr>
+            <td class="TitleCell"></td>
+            <td class="ContentCell" colspan="2"><SPAN class="LabelText" id="question">&nbsp;</SPAN></td>
+            <td class="ContentCell"></td>
+            <td class="TitleCell"></td>
+            <td class="ContentCell"></td>
+          </tr>
+          <tr>
+            <td class="TitleCell"></td>
+            <td class="Button_RightAlign_ContentCell">
+              <div>
+                <a class="ButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Accept'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='ButtonLink_active'; return true;" onkeyup="this.className='ButtonLink_focus'; return true;" onclick="submitCommandForm('SAVE', true);return false;" id="buttonOK">
+                  <table class="Button" onmouseout="this.className='Button';window.status='';return true;" onmouseover="this.className='Button_hover';window.status='Accept';return true;" onmousedown="this.className='Button_active';return true;" onmouseup="this.className='Button';return true;">
+                  <tr>
+                    <td class="Button_left"><img class="Button_Icon Button_Icon_ok" alt="Accept" title="Accept" src="../../../../../web/images/blank.gif" border=0/></td>
+                    <td class="Button_text Button_width">OK</td>
+                    <td class="Button_right"></td>
+                  </tr>
+                </table>
+                </a>
+              </div>
+            </td>
+            <td class="Button_LeftAlign_ContentCell">
+        
+            </td>
+            <td class="ContentCell"></td>
+            <td class="TitleCell"></td>
+            <td class="ContentCell"></td>
+          </tr>
+              </TABLE>
+
+                      <!-- USER CONTROLS -->
+                </td>
+              </tr>
+              </table>
+              </td>
+            </tr>
+          </table>
+        </div>
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Menu_ContentPane_Bottom" id="tdbottomSeparator">
+          <TR>
+            <TD class="Main_Bottom_bg"><IMG src="../../../../../web/images/blank.gif" border="0"></TD>
+          </TR>
+        </TABLE>
+        </td>
+      <td valign="top">
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Right" id="tdrightSeparator">
+          <TR><TD class="Main_NavBar_bg_right"></TD></TR>
+          <TR><TD class="Main_ToolBar_bg_right" valign="top"></TD></TR>
+          <TR><TD class="Main_Client_bg_right"></TD></TR>
+          <TR><TD class="Main_Bottom_bg_right"></TD></TR>
+        </TABLE>
+      </td>
+    </tr>
+  </table>
+</FORM>
+</BODY>
+</HTML>
--- a/src/org/openbravo/erpCommon/ad_process/CreateAccountingReport.html	Tue Apr 22 09:17:07 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_process/CreateAccountingReport.html	Tue Apr 22 09:19:30 2008 +0000
@@ -1,69 +1,69 @@
-<!--
- *************************************************************************
- * 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-2008 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<HTML>
-<HEAD>
-<TITLE>Accounting report</TITLE>
-
-
-<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico" type="image/x-icon"/>
-<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"/>
-<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Main/Main_Manual.css" id="paramCSS2"/>
-
-<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" type="text/javascript" id="paramAlertMsg">ALERT_MSG = "Are you sure?";</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/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/String.js" type="text/javascript"></SCRIPT>
-<SCRIPT language="JavaScript" src="../../../../../web/js/TypeAheadCombo.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 type="text/javascript"> 
-      //all dojo.require above this line
-      dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
-</script> 
-
-
-<SCRIPT language="JavaScript" type="text/javascript" id="paramArray">var array=null;</SCRIPT>
-<SCRIPT language="JavaScript" type="text/javascript">
-function depurarCombo(){
-  var frm = document.frmMain;
-  var id = frm.inpAccountingReportId.value;
-  var value = null;
-  var arrayCombo = new Array();
-  var count = 0;
-  for (i = 0; i<array.length; i++) {
-    if (id == array[i][0]) {
-      value = array[i][2];
-    }
+<!--
+ *************************************************************************
+ * 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-2008 Openbravo SL 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+-->
+<HTML>
+<HEAD>
+<TITLE>Accounting report</TITLE>
+
+
+<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico" type="image/x-icon"/>
+<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"/>
+<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Main/Main_Manual.css" id="paramCSS2"/>
+
+<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" type="text/javascript" id="paramAlertMsg">ALERT_MSG = "Are you sure?";</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/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/String.js" type="text/javascript"></SCRIPT>
+<SCRIPT language="JavaScript" src="../../../../../web/js/TypeAheadCombo.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 type="text/javascript"> 
+      //all dojo.require above this line
+      dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
+</script> 
+
+
+<SCRIPT language="JavaScript" type="text/javascript" id="paramArray">var array=null;</SCRIPT>
+<SCRIPT language="JavaScript" type="text/javascript">
+function depurarCombo(){
+  var frm = document.frmMain;
+  var id = frm.inpAccountingReportId.value;
+  var value = null;
+  var arrayCombo = new Array();
+  var count = 0;
+  for (i = 0; i<array.length; i++) {
+    if (id == array[i][0]) {
+      value = array[i][2];
+    }
   }
   if(value=='A'){
   	displayLogicElement('selEliminarYear', false);
@@ -87,29 +87,29 @@
     }
   }
   rellenarCombo(frm.inpYearId, arrayCombo2, false, false);
-  return true;
-}
-function depurar(){
-	if (frm.inpcAcctSchemaId.value == null || frm.inpcAcctSchemaId.value == "") {
-		frm.inpcAcctSchemaId.focus();
-		mensaje(7);
-		return false;
-	} return true;
-}
-function displayCombos(){
-	var frm = document.frmMain;
-	var id = frm.inpAccountingReportId.value;
-	//alert(id);
-
-	for (i = 0; i<array.length; i++) {
-		if (array[i][0] == id){
-			if (array[i][1] == 'Y') displayLogicElement('selEliminarOrg', true);
-      else displayLogicElement('selEliminarOrg', false);
-			break;
-		}
-	}
-  depurarCombo();
-	return true;
+  return true;
+}
+function depurar(){
+	if (frm.inpcAcctSchemaId.value == null || frm.inpcAcctSchemaId.value == "") {
+		frm.inpcAcctSchemaId.focus();
+		mensaje(7);
+		return false;
+	} return true;
+}
+function displayCombos(){
+	var frm = document.frmMain;
+	var id = frm.inpAccountingReportId.value;
+	//alert(id);
+
+	for (i = 0; i<array.length; i++) {
+		if (array[i][0] == id){
+			if (array[i][1] == 'Y') displayLogicElement('selEliminarOrg', true);
+      else displayLogicElement('selEliminarOrg', false);
+			break;
+		}
+	}
+  depurarCombo();
+	return true;
 }
 
 function refreshAccounts() {
@@ -117,13 +117,13 @@
   var cmbAccount = document.frmMain.inpAccountingReportId;  
   cambiarListaCombo(cmbAccount, arrAccount, cmbAccountSchema.options[cmbAccountSchema.selectedIndex].value, false);  
   return true;
-}
+}
 </SCRIPT>
 
 <script language="JavaScript" type="text/javascript" id="paramArrayAccount">
 var arrAccount=null;
 </script>
-
+
 	<SCRIPT language="JavaScript" type="text/javascript">
 	function onLoadDo(){
 		this.windowTables = new Array(
@@ -143,178 +143,178 @@
 		resizeArea();
 	}
 	</SCRIPT>
-</HEAD>
+</HEAD>
 <BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
-<FORM id="form" method="POST" action="CreateAccountingReport.html" name="frmMain">
-  <INPUT type="hidden" name="Command">
-<INPUT type="hidden" name="IsPopUpCall" value="1"></INPUT>
-  
-  <table height="100%" border="0" cellpadding="0" cellspacing="0" id="main">
-    <tr>
-      <td valign="top" id="tdleftTabs"></td>
-      <td valign="top">
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Left">
-          <TR><TD class="Main_NavBar_bg_left" id="tdleftSeparator"></TD></TR>
-          <TR><TD class="Main_ToolBar_bg_left" valign="top"></TD></TR>
-          <TR><TD class="Main_Client_bg_left"></TD></TR>
-          <TR><TD class="Main_Bottom_bg_left"></TD></TR>
-        </TABLE>
-      </td>
-      <td valign="top">
-        <div class="Main_ContentPane_NavBar" id="tdtopButtons"></div>
-        <div class="Main_ContentPane_ToolBar" id="paramToolBar"></div>
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_TabPane" id="tdtopTabs">
-          <TR id="paramParentTabContainer"></TR>
-          <TR id="paramMainTabContainer"></TR>
-          <TR id="paramChildTabContainer"></TR>
-        </TABLE>
-        <DIV class="Main_ContentPane_Client" style="overflow: auto;" id="client">
-                <table class="dojoTabContainer" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
-                  <tr>
-                    <td>
-                      <table class="dojoTabPaneWrapper" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
-                        <tr>
-                          <td>
-                            <!-- MessageBox -->
-
-                            <table cellpadding="0" cellspacing="0" id="messageBoxID" class="MessageBoxyy">
-                              <TBODY>
-                              <tr class="MessageBox_TopMargin">
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td></td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              <tr>
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td>
-
-                                  <table cellpadding="0" cellspacing="0" style="width: 100%;">
-                                    <TBODY>
-                                    <tr>
-                                      <td>
-                                        <div class="MessageBox_TopLeft"></div>
-                                        <div class="MessageBox_Left"></div>
-                                      </td>
-                                      <td class="MessageBox_bg">
-
-                                        <table class="MessageBox_Top">
-                                        <TBODY>
-                                          <tr>
-                                            <td>
-                                              <span>
-                                              <table cellpadding="0" cellspacing="0" class="MessageBox_Body_ContentCell">
-                                                <TBODY>
-                                                <tr>
-                                                  <td class="MessageBox_Icon_ContentCell">
-                                                    <div class="MessageBox_Icon"></div>
-                                                  </td>
-                                                  <td style="vertical-align: top;" id="messageBoxIDContent">
-                                                    <span>
-                                                      <div class="MessageBox_TextTitle" id="messageBoxIDTitle">
-                                                        xxInfo: AccessTableWithNoView
-                                                      </div>
-                                                      <div class="MessageBox_TextDescription" id="messageBoxIDMessage">
-                                                        xxThe current information is empty.
-                                                      </div>
-                                                      <div class="MessageBox_TextSeparator"></div>
-                                                    </span>
-                                                  </td>
-                                                </tr>
-                                                </TBODY>
-                                              </table>
-                                              </span>
-                                            </td>
-                                          </tr>
-                                          </TBODY>
-                                        </table>
-
-                                      </td>
-                                      <td class="MessageBox_RightTrans">
-                                        <div class="MessageBox_TopRight"></div>
-                                        <div class="MessageBox_Right"></div>
-                                      </td>
-                                    </tr>
-                                    <tr>
-                                      <td rowspan="2" class="MessageBox_BottomLeft">
-                                      </td>
-                                      <td class="MessageBox_BottomTrans MessageBox_bg">
-                                      </td>
-                                      <td rowspan="2" class="MessageBox_BottomRight">
-                                      </td>
-                                    </tr>
-                                    <tr>
-                                      <td class="MessageBox_Bottom">
-                                      </td>
-                                    </tr>
-                                    </TBODY>
-                                  </table>
-
-                                </td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              <tr class="MessageBox_BottomMargin">
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td></td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              </TBODY>
-                            </table>
-        <!-- USER CONTROLS -->
-              <TABLE class="Main_Client_TableEdition">
-                <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>
-                  <td class="TableEdition_OneCell_width"></td>
-                  <td class="TableEdition_OneCell_width"></td>
-                </tr>
-  <tr>
-    <td colspan="6">
-      <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_InfoBar">
-        <tr>
-          <td class="Popup_InfoBar_Icon_cell"><IMG src="../../../../../web/images/blank.gif" border="0" class="Popup_InfoBar_Icon_info" /></td>
-          <td class="Popup_InfoBar_text_table">
-            <table>
-              <tr>
-                <td class="Popup_InfoBar_text" id="helpDiscard"><SPAN id="paramHelp">&nbsp;</SPAN></td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-          <tr>
-            <td colspan="6" height="15px"></td>
-          </tr>
-   <tr>
-		<td class="TitleCell"><span class="LabelText">Account&nbsp;</span></td>
-
-		<td class="Combo_ContentCell" colspan="2">
-			<select class="ComboKey Combo_TwoCells_width required" required="true" name="inpAccountingReportId" id="inpAccountingReportId" onChange="displayCombos();return false;">
-				<DIV id="reportAD_ACCOUNTINGRPT_ELEMENT"></DIV>
-			</select>
-		</td>
-	</tr>
-	<tr id="selEliminarOrg" style="display:none;">
-		<td class="TitleCell"><span class="LabelText">Organization&nbsp;</span></td>
-		<td class="Combo_ContentCell" colspan="2">
-			<select class="ComboKey Combo_TwoCells_width" name="inpadOrgId" id="inpadOrgId">
-				<option value=""></option>
-				<DIV id="reportAD_ORG"></DIV>
-			</select>
-		</td>
+<FORM id="form" method="POST" action="CreateAccountingReport.html" name="frmMain">
+  <INPUT type="hidden" name="Command">
+<INPUT type="hidden" name="IsPopUpCall" value="1"></INPUT>
+  
+  <table height="100%" border="0" cellpadding="0" cellspacing="0" id="main">
+    <tr>
+      <td valign="top" id="tdleftTabs"></td>
+      <td valign="top">
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Left">
+          <TR><TD class="Main_NavBar_bg_left" id="tdleftSeparator"></TD></TR>
+          <TR><TD class="Main_ToolBar_bg_left" valign="top"></TD></TR>
+          <TR><TD class="Main_Client_bg_left"></TD></TR>
+          <TR><TD class="Main_Bottom_bg_left"></TD></TR>
+        </TABLE>
+      </td>
+      <td valign="top">
+        <div class="Main_ContentPane_NavBar" id="tdtopButtons"></div>
+        <div class="Main_ContentPane_ToolBar" id="paramToolBar"></div>
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_TabPane" id="tdtopTabs">
+          <TR id="paramParentTabContainer"></TR>
+          <TR id="paramMainTabContainer"></TR>
+          <TR id="paramChildTabContainer"></TR>
+        </TABLE>
+        <DIV class="Main_ContentPane_Client" style="overflow: auto;" id="client">
+                <table class="dojoTabContainer" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
+                  <tr>
+                    <td>
+                      <table class="dojoTabPaneWrapper" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
+                        <tr>
+                          <td>
+                            <!-- MessageBox -->
+
+                            <table cellpadding="0" cellspacing="0" id="messageBoxID" class="MessageBoxyy">
+                              <TBODY>
+                              <tr class="MessageBox_TopMargin">
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td></td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              <tr>
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td>
+
+                                  <table cellpadding="0" cellspacing="0" style="width: 100%;">
+                                    <TBODY>
+                                    <tr>
+                                      <td>
+                                        <div class="MessageBox_TopLeft"></div>
+                                        <div class="MessageBox_Left"></div>
+                                      </td>
+                                      <td class="MessageBox_bg">
+
+                                        <table class="MessageBox_Top">
+                                        <TBODY>
+                                          <tr>
+                                            <td>
+                                              <span>
+                                              <table cellpadding="0" cellspacing="0" class="MessageBox_Body_ContentCell">
+                                                <TBODY>
+                                                <tr>
+                                                  <td class="MessageBox_Icon_ContentCell">
+                                                    <div class="MessageBox_Icon"></div>
+                                                  </td>
+                                                  <td style="vertical-align: top;" id="messageBoxIDContent">
+                                                    <span>
+                                                      <div class="MessageBox_TextTitle" id="messageBoxIDTitle">
+                                                        xxInfo: AccessTableWithNoView
+                                                      </div>
+                                                      <div class="MessageBox_TextDescription" id="messageBoxIDMessage">
+                                                        xxThe current information is empty.
+                                                      </div>
+                                                      <div class="MessageBox_TextSeparator"></div>
+                                                    </span>
+                                                  </td>
+                                                </tr>
+                                                </TBODY>
+                                              </table>
+                                              </span>
+                                            </td>
+                                          </tr>
+                                          </TBODY>
+                                        </table>
+
+                                      </td>
+                                      <td class="MessageBox_RightTrans">
+                                        <div class="MessageBox_TopRight"></div>
+                                        <div class="MessageBox_Right"></div>
+                                      </td>
+                                    </tr>
+                                    <tr>
+                                      <td rowspan="2" class="MessageBox_BottomLeft">
+                                      </td>
+                                      <td class="MessageBox_BottomTrans MessageBox_bg">
+                                      </td>
+                                      <td rowspan="2" class="MessageBox_BottomRight">
+                                      </td>
+                                    </tr>
+                                    <tr>
+                                      <td class="MessageBox_Bottom">
+                                      </td>
+                                    </tr>
+                                    </TBODY>
+                                  </table>
+
+                                </td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              <tr class="MessageBox_BottomMargin">
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td></td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              </TBODY>
+                            </table>
+        <!-- USER CONTROLS -->
+              <TABLE class="Main_Client_TableEdition">
+                <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>
+                  <td class="TableEdition_OneCell_width"></td>
+                  <td class="TableEdition_OneCell_width"></td>
+                </tr>
+  <tr>
+    <td colspan="6">
+      <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_InfoBar">
+        <tr>
+          <td class="Popup_InfoBar_Icon_cell"><IMG src="../../../../../web/images/blank.gif" border="0" class="Popup_InfoBar_Icon_info" /></td>
+          <td class="Popup_InfoBar_text_table">
+            <table>
+              <tr>
+                <td class="Popup_InfoBar_text" id="helpDiscard"><SPAN id="paramHelp">&nbsp;</SPAN></td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+          <tr>
+            <td colspan="6" height="15px"></td>
+          </tr>
+   <tr>
+		<td class="TitleCell"><span class="LabelText">Account&nbsp;</span></td>
+
+		<td class="Combo_ContentCell" colspan="2">
+			<select class="ComboKey Combo_TwoCells_width required" required="true" name="inpAccountingReportId" id="inpAccountingReportId" onChange="displayCombos();return false;">
+				<DIV id="reportAD_ACCOUNTINGRPT_ELEMENT"></DIV>
+			</select>
+		</td>
 	</tr>
-	<tr>
-		<td class="TitleCell"><span class="LabelText">Account schema&nbsp;</span></td>
-		<td class="Combo_ContentCell" colspan="2">
-			<select class="ComboKey Combo_TwoCells_width" name="inpcAcctSchemaId" id="inpcAcctSchemaId" onChange="refreshAccounts();return false;">
-				<option value=""></option>
-				<DIV id="reportC_ACCTSCHEMA_ID"></DIV>
-			</select>
-		</td>
-	</tr>
+	<tr id="selEliminarOrg" style="display:none;">
+		<td class="TitleCell"><span class="LabelText">Organization&nbsp;</span></td>
+		<td class="Combo_ContentCell" colspan="2">
+			<select class="ComboKey Combo_TwoCells_width" name="inpadOrgId" id="inpadOrgId">
+				<option value=""></option>
+				<DIV id="reportAD_ORG"></DIV>
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td class="TitleCell"><span class="LabelText">Account schema&nbsp;</span></td>
+		<td class="Combo_ContentCell" colspan="2">
+			<select class="ComboKey Combo_TwoCells_width" name="inpcAcctSchemaId" id="inpcAcctSchemaId" onChange="refreshAccounts();return false;">
+				<option value=""></option>
+				<DIV id="reportC_ACCTSCHEMA_ID"></DIV>
+			</select>
+		</td>
+	</tr>
 	<tr id="selEliminarPeriod">
 		<td class="TitleCell"><span class="LabelText">Period&nbsp;</span></td>
 		<td class="Combo_ContentCell">
@@ -334,82 +334,82 @@
 			</select>
 		</td>
     <td/>
-	</tr>
-          
-          <tr>
-            <td colspan="6" height="5px"></td>
-          </tr>
-          <tr>
-            <td class="TitleCell"></td>
-            <td class="ContentCell" colspan="2"><SPAN class="LabelText" id="question">&nbsp;</SPAN></td>
-            <td class="ContentCell"></td>
-            <td class="TitleCell"></td>
-            <td class="ContentCell"></td>
-          </tr>
-          <tr>
-            <td colspan="6" height="5px"></td>
-          </tr>
-          <tr>
-            <td class="TitleCell"></td>
-            <td class="Button_RightAlign_ContentCell">
-              <div>
-                <a class="ButtonLink" href="#"
-                  onfocus="setWindowElementFocus(this); window.status='Accept'; return true;"
-                  onblur="window.status=''; return true;"
-                  onkeypress="this.className='ButtonLink_active'; return true;"
-                  onkeyup="this.className='ButtonLink_focus'; return true;"
+	</tr>
+          
+          <tr>
+            <td colspan="6" height="5px"></td>
+          </tr>
+          <tr>
+            <td class="TitleCell"></td>
+            <td class="ContentCell" colspan="2"><SPAN class="LabelText" id="question">&nbsp;</SPAN></td>
+            <td class="ContentCell"></td>
+            <td class="TitleCell"></td>
+            <td class="ContentCell"></td>
+          </tr>
+          <tr>
+            <td colspan="6" height="5px"></td>
+          </tr>
+          <tr>
+            <td class="TitleCell"></td>
+            <td class="Button_RightAlign_ContentCell">
+              <div>
+                <a class="ButtonLink" href="#"
+                  onfocus="setWindowElementFocus(this); window.status='Accept'; return true;"
+                  onblur="window.status=''; return true;"
+                  onkeypress="this.className='ButtonLink_active'; return true;"
+                  onkeyup="this.className='ButtonLink_focus'; return true;"
                   onclick="openServletNewWindow('FIND', false, 'CreateAccountingReport.html', 'CreateAccountingReport', null, false, '700', '1000', true)"
-                  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='Accept'; return true;"
-                    onmouseout="this.className='Button'; window.status=''; return true;"
-                    id="fieldTable">
-                    <tr>
-                      <td class="Button_left"><img class="Button_Icon Button_Icon_ok" alt="Accept" title="Accept" src="../../../../../web/images/blank.gif" border=0 id="fieldButton"/></td>
-                      <td class="Button_text Button_width">OK</td>
-                      <td class="Button_right"></td>
-                    </tr>
-                  </table>
-                </a>
-              </div>
-            </td>
-            <td class="Button_LeftAlign_ContentCell">
-             
-            </td>
-            <td class="ContentCell"></td>
-            <td class="TitleCell"></td>
-            <td class="ContentCell"></td>
-          </tr>
-              </TABLE>
- 
-
-                      <!-- USER CONTROLS -->
-                </TD>
-              </TR>
-              </TABLE>
-              </TD>
-            </TR>
-          </TABLE>
-        </div>
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Menu_ContentPane_Bottom" id="tdbottomSeparator">
-          <TR>
-            <TD class="Main_Bottom_bg"><IMG src="../../../../../web/images/blank.gif" border="0"></TD>
-          </TR>
-        </TABLE></td>
-      <td valign="top">
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Right" id="tdrightSeparator">
-          <TR><TD class="Main_NavBar_bg_right"></TD></TR>
-          <TR><TD class="Main_ToolBar_bg_right" valign="top"></TD></TR>
-          <TR><TD class="Main_Client_bg_right"></TD></TR>
-          <TR><TD class="Main_Bottom_bg_right"></TD></TR>
-        </TABLE>
-      </td>
-    </tr>
-  </table>
-  
- 
-</FORM>
-</BODY>
-</HTML>
+                  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='Accept'; return true;"
+                    onmouseout="this.className='Button'; window.status=''; return true;"
+                    id="fieldTable">
+                    <tr>
+                      <td class="Button_left"><img class="Button_Icon Button_Icon_ok" alt="Accept" title="Accept" src="../../../../../web/images/blank.gif" border=0 id="fieldButton"/></td>
+                      <td class="Button_text Button_width">OK</td>
+                      <td class="Button_right"></td>
+                    </tr>
+                  </table>
+                </a>
+              </div>
+            </td>
+            <td class="Button_LeftAlign_ContentCell">
+             
+            </td>
+            <td class="ContentCell"></td>
+            <td class="TitleCell"></td>
+            <td class="ContentCell"></td>
+          </tr>
+              </TABLE>
+ 
+
+                      <!-- USER CONTROLS -->
+                </TD>
+              </TR>
+              </TABLE>
+              </TD>
+            </TR>
+          </TABLE>
+        </div>
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Menu_ContentPane_Bottom" id="tdbottomSeparator">
+          <TR>
+            <TD class="Main_Bottom_bg"><IMG src="../../../../../web/images/blank.gif" border="0"></TD>
+          </TR>
+        </TABLE></td>
+      <td valign="top">
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Right" id="tdrightSeparator">
+          <TR><TD class="Main_NavBar_bg_right"></TD></TR>
+          <TR><TD class="Main_ToolBar_bg_right" valign="top"></TD></TR>
+          <TR><TD class="Main_Client_bg_right"></TD></TR>
+          <TR><TD class="Main_Bottom_bg_right"></TD></TR>
+        </TABLE>
+      </td>
+    </tr>
+  </table>
+  
+ 
+</FORM>
+</BODY>
+</HTML>
--- a/src/org/openbravo/erpCommon/ad_process/CreateTaxReport.html	Tue Apr 22 09:17:07 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_process/CreateTaxReport.html	Tue Apr 22 09:19:30 2008 +0000
@@ -1,80 +1,80 @@
-<!--
- *************************************************************************
- * 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>Accounting report</TITLE>
-
-<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico" type="image/x-icon"/>
-<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"/>
-<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Main/Main_Manual.css" id="paramCSS2"/>
-
-<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" type="text/javascript" id="paramAlertMsg">ALERT_MSG = "Are you sure?";</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/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/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/messages.js" type="text/javascript"></script>
-<SCRIPT language="JavaScript" src="../utility/MessagesJS.js" type="text/javascript"></SCRIPT>
-<SCRIPT language="JavaScript" src="../../../../../web/js/String.js" type="text/javascript"></SCRIPT>
-<SCRIPT language="JavaScript" src="../../../../../web/js/TypeAheadCombo.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 type="text/javascript"> 
-      //all dojo.require above this line
-      dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
-</script> 
-
-
-<!--SCRIPT language="JavaScript" type="text/javascript" id="paramArray">var array=null;</SCRIPT-->
-<!--SCRIPT language="JavaScript" type="text/javascript">
-function depurarCombo(){
-  var frm = document.frmMain;
-  var id = frm.inpTaxReportId.value;
-  var value = null;
-  var arrayCombo = new Array();
-  var count = 0;
-  for (i = 0; i<array.length; i++) {
-    if (id == array[i][0]) {
-      value = array[i][2];
-    }
-  }
-  for (j = 0; j<combo.length; j++) {
-    if (value == combo[j][0]) {
-      arrayCombo[count] = new Array(combo[j][1], combo[j][2]);
-      count = count+1;
-    }
-  }
-  return true;
-}
+<!--
+ *************************************************************************
+ * 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>Accounting report</TITLE>
+
+<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico" type="image/x-icon"/>
+<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"/>
+<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Main/Main_Manual.css" id="paramCSS2"/>
+
+<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" type="text/javascript" id="paramAlertMsg">ALERT_MSG = "Are you sure?";</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/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/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/messages.js" type="text/javascript"></script>
+<SCRIPT language="JavaScript" src="../utility/MessagesJS.js" type="text/javascript"></SCRIPT>
+<SCRIPT language="JavaScript" src="../../../../../web/js/String.js" type="text/javascript"></SCRIPT>
+<SCRIPT language="JavaScript" src="../../../../../web/js/TypeAheadCombo.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 type="text/javascript"> 
+      //all dojo.require above this line
+      dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
+</script> 
+
+
+<!--SCRIPT language="JavaScript" type="text/javascript" id="paramArray">var array=null;</SCRIPT-->
+<!--SCRIPT language="JavaScript" type="text/javascript">
+function depurarCombo(){
+  var frm = document.frmMain;
+  var id = frm.inpTaxReportId.value;
+  var value = null;
+  var arrayCombo = new Array();
+  var count = 0;
+  for (i = 0; i<array.length; i++) {
+    if (id == array[i][0]) {
+      value = array[i][2];
+    }
+  }
+  for (j = 0; j<combo.length; j++) {
+    if (value == combo[j][0]) {
+      arrayCombo[count] = new Array(combo[j][1], combo[j][2]);
+      count = count+1;
+    }
+  }
+  return true;
+}
 </SCRIPT-->
 
 <SCRIPT language="JavaScript" type="text/javascript">
@@ -89,7 +89,7 @@
 	return true;
 }
 
-</SCRIPT>
+</SCRIPT>
 	<SCRIPT language="JavaScript" type="text/javascript">
 	function onLoadDo(){
 		this.windowTables = new Array(
@@ -112,306 +112,306 @@
 		resizeArea();
 	}
 	</SCRIPT>
-</HEAD>
-<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
-<FORM id="form" method="POST" action="CreateTaxReport.html" name="frmMain">
-  <INPUT type="hidden" name="Command">
-<INPUT type="hidden" name="IsPopUpCall" value="1"></INPUT>
-  
-  
-  <table height="100%" border="0" cellpadding="0" cellspacing="0" id="main">
-    <tr>
-      <td valign="top" id="tdleftTabs"></td>
-      <td valign="top">
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Left">
-          <TR><TD class="Main_NavBar_bg_left" id="tdleftSeparator"></TD></TR>
-          <TR><TD class="Main_ToolBar_bg_left" valign="top"></TD></TR>
-          <TR><TD class="Main_Client_bg_left"></TD></TR>
-          <TR><TD class="Main_Bottom_bg_left"></TD></TR>
-        </TABLE>
-      </td>
-      <td valign="top">
-        <div class="Main_ContentPane_NavBar" id="tdtopButtons"></div>
-        <div class="Main_ContentPane_ToolBar" id="paramToolBar"></div>
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_TabPane" id="tdtopTabs">
-          <TR id="paramParentTabContainer"></TR>
-          <TR id="paramMainTabContainer"></TR>
-          <TR id="paramChildTabContainer"></TR>
-        </TABLE>
-        <DIV class="Main_ContentPane_Client" style="overflow: auto;" id="client">
-                <table class="dojoTabContainer" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
-                  <tr>
-                    <td>
-                      <table class="dojoTabPaneWrapper" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
-                        <tr>
-                          <td>
-                            <!-- MessageBox -->
-
-                            <table cellpadding="0" cellspacing="0" id="messageBoxID" class="MessageBoxyy">
-                              <TBODY>
-                              <tr class="MessageBox_TopMargin">
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td></td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              <tr>
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td>
-
-                                  <table cellpadding="0" cellspacing="0" style="width: 100%;">
-                                    <TBODY>
-                                    <tr>
-                                      <td>
-                                        <div class="MessageBox_TopLeft"></div>
-                                        <div class="MessageBox_Left"></div>
-                                      </td>
-                                      <td class="MessageBox_bg">
-
-                                        <table class="MessageBox_Top">
-                                        <TBODY>
-                                          <tr>
-                                            <td>
-                                              <span>
-                                              <table cellpadding="0" cellspacing="0" class="MessageBox_Body_ContentCell">
-                                                <TBODY>
-                                                <tr>
-                                                  <td class="MessageBox_Icon_ContentCell">
-                                                    <div class="MessageBox_Icon"></div>
-                                                  </td>
-                                                  <td style="vertical-align: top;" id="messageBoxIDContent">
-                                                    <span>
-                                                      <div class="MessageBox_TextTitle" id="messageBoxIDTitle">
-                                                        xxInfo: AccessTableWithNoView
-                                                      </div>
-                                                      <div class="MessageBox_TextDescription" id="messageBoxIDMessage">
-                                                        xxThe current information is empty.
-                                                      </div>
-                                                      <div class="MessageBox_TextSeparator"></div>
-                                                    </span>
-                                                  </td>
-                                                </tr>
-                                                </TBODY>
-                                              </table>
-                                              </span>
-                                            </td>
-                                          </tr>
-                                          </TBODY>
-                                        </table>
-
-                                      </td>
-                                      <td class="MessageBox_RightTrans">
-                                        <div class="MessageBox_TopRight"></div>
-                                        <div class="MessageBox_Right"></div>
-                                      </td>
-                                    </tr>
-                                    <tr>
-                                      <td rowspan="2" class="MessageBox_BottomLeft">
-                                      </td>
-                                      <td class="MessageBox_BottomTrans MessageBox_bg">
-                                      </td>
-                                      <td rowspan="2" class="MessageBox_BottomRight">
-                                      </td>
-                                    </tr>
-                                    <tr>
-                                      <td class="MessageBox_Bottom">
-                                      </td>
-                                    </tr>
-                                    </TBODY>
-                                  </table>
-
-                                </td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              <tr class="MessageBox_BottomMargin">
-                                <td class="MessageBox_LeftMargin"></td>
-                                <td></td>
-                                <td class="MessageBox_RightMargin"></td>
-                              </tr>
-                              </TBODY>
-                            </table>
-        <!-- USER CONTROLS -->
-              <TABLE class="Main_Client_TableEdition">
-                <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>
-                  <td class="TableEdition_OneCell_width"></td>
-                  <td class="TableEdition_OneCell_width"></td>
-                </tr>
-  <tr>
-    <td colspan="6">
-      <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_InfoBar">
-        <tr>
-          <td class="Popup_InfoBar_Icon_cell"><IMG src="../../../../../web/images/blank.gif" border="0" class="Popup_InfoBar_Icon_info" /></td>
-          <td class="Popup_InfoBar_text_table">
-            <table>
-              <tr>
-                <td class="Popup_InfoBar_text" id="helpDiscard"><SPAN id="paramHelp">&nbsp;</SPAN></td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="6" height="15px"></td>
-  </tr>
-  
-  
-  
-  
-      <TR> 
-      <TD class="TitleCell"><span class="LabelText">From Date</SPAN></TD>
-      <TD class="TextBox_btn_ContentCell">
-
-              <TABLE border="0" cellspacing="0" cellpadding="0" summary="" style="padding-top: 0px;">
-                <TR>
-                  <TD class="TextBox_ContentCell">
-                    <INPUT dojotype="openbravo:DateTextbox" displayformat="xx" saveformat="yy" class="TextBox_btn_OneCell_width"  type="text" name="inpDateFrom" id="paramDateFrom" size="10" maxlength="10" value="" onkeyup="auto_complete_date(this.textbox, this.displayFormat);return true;"></INPUT><SCRIPT>djConfig.searchIds.push("paramDateFrom");</SCRIPT>
-                  </TD>
-                  <TD class="FieldButton_ContentCell">
-                    <a class="FieldButtonLink" href="#"  onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;"  onblur="window.status=''; return true;"  onkeypress="this.className='FieldButtonLink_active'; return true;"  onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpDateFrom', document.frmMain.inpDateFrom.value, false);return false;"  >
-                    <table class="FieldButton"onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
-                      <TR>
-
-                        <TD class="FieldButton_bg">
-                          <IMG alt="Calendar" class="FieldButton_Icon FieldButton_Icon_Calendar" title="Calendar" src="../../../../../web/images/blank.gif" border="0"></IMG>
-                        </TD>
-                      </TR>
-                    </TABLE>
-                    </a>
-                  </TD>
-                </TR>
-              </TABLE>
-            </TD>
-      
-      <td/>
- 
-      <TD class="TitleCell"><span class="LabelText">To Date</SPAN></TD>
-      
-      <TD class="TextBox_btn_ContentCell">
-                    <TABLE border="0" cellspacing="0" cellpadding="0" summary="" style="padding-top: 0px;">
-                      <TR>
-                        <TD class="TextBox_ContentCell">
-                          <INPUT dojotype="openbravo:DateTextbox" displayformat="xx" saveformat="yy" class="TextBox_btn_OneCell_width" type="text" name="inpDateTo" id="paramDateTo" size="10" maxlength="10" value="" onkeyup="auto_complete_date(this.textbox, this.displayFormat);return true;"></INPUT><SCRIPT>djConfig.searchIds.push("paramDateTo");</SCRIPT>
-                        </TD>
-                        <TD class="FieldButton_ContentCell">
-                          <a class="FieldButtonLink" href="#"
-  onfocus="setWindowElementFocus(this); window.status='xx'; return true;"
-  onblur="window.status=''; return true;"
-  onkeypress="this.className='FieldButtonLink_active'; return true;"
-  onkeyup="this.className='FieldButtonLink_focus'; return true;">
-  <table class="FieldButton" onclick="showCalendar('frmMain.inpDateTo', document.frmMain.inpDateTo.value, false);return false;" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
-
-                            <TR>
-                              <TD class="FieldButton_bg">
-                                <IMG alt="Calendar" class="FieldButton_Icon FieldButton_Icon_Calendar" title="Calendar" src="../../../../../web/images/blank.gif" border="0"></IMG>
-                              </TD>
-                            </TR>
-                          </TABLE>
-                          </a>
-                        </TD>
-                      </TR>
-                    </TABLE>
-
-                  </TD>
-             <td/>
-
-    </TR>
-
-	<tr>
-		<td class="TitleCell"><span class="LabelText">Tax report</span></td>
-
-		<td class="Combo_ContentCell" colspan="2">
-			<select class="ComboKey Combo_TwoCells_width required" required="true" name="inpTaxReportId" id="inpTaxReportId">
-				<DIV id="reportC_TAX_REPORT"></DIV>
-			</select>
-		</td>
-
-		<td class="TitleCell"><span class="LabelText">Organization</span></td>
-		<td class="Combo_ContentCell">
-			<select class="Combo Combo_OneCell_width" name="inpadOrgId" id="inpadOrgId">
-				<option value=""></option>
-				<DIV id="reportAD_ORG"></DIV>
-			</select>
-		</td>
-    <td/>
-	</tr>
-          <tr>
-            <td colspan="6" height="5px"></td>
-          </tr>
-          <tr>
-            <td class="TitleCell"></td>
-            <td class="ContentCell" colspan="2"><SPAN class="LabelText" id="question">&nbsp;</SPAN></td>
-            <td class="ContentCell"></td>
-            <td class="TitleCell"></td>
-            <td class="ContentCell"></td>
-          </tr>
-          <tr>
-            <td colspan="6" height="5px"></td>
-          </tr>
-          <tr>
-            <td class="TitleCell"></td>
-            <td class="Button_RightAlign_ContentCell">
-              <div>
-                <a class="ButtonLink" href="#"
-                  onfocus="setWindowElementFocus(this); window.status='Accept'; return true;"
-                  onblur="window.status=''; return true;"
-                  onkeypress="this.className='ButtonLink_active'; return true;"
-                  onkeyup="this.className='ButtonLink_focus'; return true;"
+</HEAD>
+<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
+<FORM id="form" method="POST" action="CreateTaxReport.html" name="frmMain">
+  <INPUT type="hidden" name="Command">
+<INPUT type="hidden" name="IsPopUpCall" value="1"></INPUT>
+  
+  
+  <table height="100%" border="0" cellpadding="0" cellspacing="0" id="main">
+    <tr>
+      <td valign="top" id="tdleftTabs"></td>
+      <td valign="top">
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Left">
+          <TR><TD class="Main_NavBar_bg_left" id="tdleftSeparator"></TD></TR>
+          <TR><TD class="Main_ToolBar_bg_left" valign="top"></TD></TR>
+          <TR><TD class="Main_Client_bg_left"></TD></TR>
+          <TR><TD class="Main_Bottom_bg_left"></TD></TR>
+        </TABLE>
+      </td>
+      <td valign="top">
+        <div class="Main_ContentPane_NavBar" id="tdtopButtons"></div>
+        <div class="Main_ContentPane_ToolBar" id="paramToolBar"></div>
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_TabPane" id="tdtopTabs">
+          <TR id="paramParentTabContainer"></TR>
+          <TR id="paramMainTabContainer"></TR>
+          <TR id="paramChildTabContainer"></TR>
+        </TABLE>
+        <DIV class="Main_ContentPane_Client" style="overflow: auto;" id="client">
+                <table class="dojoTabContainer" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
+                  <tr>
+                    <td>
+                      <table class="dojoTabPaneWrapper" border="0" cellpadding="0" cellspacing="0" width="100%" summary="">
+                        <tr>
+                          <td>
+                            <!-- MessageBox -->
+
+                            <table cellpadding="0" cellspacing="0" id="messageBoxID" class="MessageBoxyy">
+                              <TBODY>
+                              <tr class="MessageBox_TopMargin">
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td></td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              <tr>
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td>
+
+                                  <table cellpadding="0" cellspacing="0" style="width: 100%;">
+                                    <TBODY>
+                                    <tr>
+                                      <td>
+                                        <div class="MessageBox_TopLeft"></div>
+                                        <div class="MessageBox_Left"></div>
+                                      </td>
+                                      <td class="MessageBox_bg">
+
+                                        <table class="MessageBox_Top">
+                                        <TBODY>
+                                          <tr>
+                                            <td>
+                                              <span>
+                                              <table cellpadding="0" cellspacing="0" class="MessageBox_Body_ContentCell">
+                                                <TBODY>
+                                                <tr>
+                                                  <td class="MessageBox_Icon_ContentCell">
+                                                    <div class="MessageBox_Icon"></div>
+                                                  </td>
+                                                  <td style="vertical-align: top;" id="messageBoxIDContent">
+                                                    <span>
+                                                      <div class="MessageBox_TextTitle" id="messageBoxIDTitle">
+                                                        xxInfo: AccessTableWithNoView
+                                                      </div>
+                                                      <div class="MessageBox_TextDescription" id="messageBoxIDMessage">
+                                                        xxThe current information is empty.
+                                                      </div>
+                                                      <div class="MessageBox_TextSeparator"></div>
+                                                    </span>
+                                                  </td>
+                                                </tr>
+                                                </TBODY>
+                                              </table>
+                                              </span>
+                                            </td>
+                                          </tr>
+                                          </TBODY>
+                                        </table>
+
+                                      </td>
+                                      <td class="MessageBox_RightTrans">
+                                        <div class="MessageBox_TopRight"></div>
+                                        <div class="MessageBox_Right"></div>
+                                      </td>
+                                    </tr>
+                                    <tr>
+                                      <td rowspan="2" class="MessageBox_BottomLeft">
+                                      </td>
+                                      <td class="MessageBox_BottomTrans MessageBox_bg">
+                                      </td>
+                                      <td rowspan="2" class="MessageBox_BottomRight">
+                                      </td>
+                                    </tr>
+                                    <tr>
+                                      <td class="MessageBox_Bottom">
+                                      </td>
+                                    </tr>
+                                    </TBODY>
+                                  </table>
+
+                                </td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              <tr class="MessageBox_BottomMargin">
+                                <td class="MessageBox_LeftMargin"></td>
+                                <td></td>
+                                <td class="MessageBox_RightMargin"></td>
+                              </tr>
+                              </TBODY>
+                            </table>
+        <!-- USER CONTROLS -->
+              <TABLE class="Main_Client_TableEdition">
+                <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>
+                  <td class="TableEdition_OneCell_width"></td>
+                  <td class="TableEdition_OneCell_width"></td>
+                </tr>
+  <tr>
+    <td colspan="6">
+      <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_InfoBar">
+        <tr>
+          <td class="Popup_InfoBar_Icon_cell"><IMG src="../../../../../web/images/blank.gif" border="0" class="Popup_InfoBar_Icon_info" /></td>
+          <td class="Popup_InfoBar_text_table">
+            <table>
+              <tr>
+                <td class="Popup_InfoBar_text" id="helpDiscard"><SPAN id="paramHelp">&nbsp;</SPAN></td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td colspan="6" height="15px"></td>
+  </tr>
+  
+  
+  
+  
+      <TR> 
+      <TD class="TitleCell"><span class="LabelText">From Date</SPAN></TD>
+      <TD class="TextBox_btn_ContentCell">
+
+              <TABLE border="0" cellspacing="0" cellpadding="0" summary="" style="padding-top: 0px;">
+                <TR>
+                  <TD class="TextBox_ContentCell">
+                    <INPUT dojotype="openbravo:DateTextbox" displayformat="xx" saveformat="yy" class="TextBox_btn_OneCell_width"  type="text" name="inpDateFrom" id="paramDateFrom" size="10" maxlength="10" value="" onkeyup="auto_complete_date(this.textbox, this.displayFormat);return true;"></INPUT><SCRIPT>djConfig.searchIds.push("paramDateFrom");</SCRIPT>
+                  </TD>
+                  <TD class="FieldButton_ContentCell">
+                    <a class="FieldButtonLink" href="#"  onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;"  onblur="window.status=''; return true;"  onkeypress="this.className='FieldButtonLink_active'; return true;"  onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpDateFrom', document.frmMain.inpDateFrom.value, false);return false;"  >
+                    <table class="FieldButton"onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
+                      <TR>
+
+                        <TD class="FieldButton_bg">
+                          <IMG alt="Calendar" class="FieldButton_Icon FieldButton_Icon_Calendar" title="Calendar" src="../../../../../web/images/blank.gif" border="0"></IMG>
+                        </TD>
+                      </TR>
+                    </TABLE>
+                    </a>
+                  </TD>
+                </TR>
+              </TABLE>
+            </TD>
+      
+      <td/>
+ 
+      <TD class="TitleCell"><span class="LabelText">To Date</SPAN></TD>
+      
+      <TD class="TextBox_btn_ContentCell">
+                    <TABLE border="0" cellspacing="0" cellpadding="0" summary="" style="padding-top: 0px;">
+                      <TR>
+                        <TD class="TextBox_ContentCell">
+                          <INPUT dojotype="openbravo:DateTextbox" displayformat="xx" saveformat="yy" class="TextBox_btn_OneCell_width" type="text" name="inpDateTo" id="paramDateTo" size="10" maxlength="10" value="" onkeyup="auto_complete_date(this.textbox, this.displayFormat);return true;"></INPUT><SCRIPT>djConfig.searchIds.push("paramDateTo");</SCRIPT>
+                        </TD>
+                        <TD class="FieldButton_ContentCell">
+                          <a class="FieldButtonLink" href="#"
+  onfocus="setWindowElementFocus(this); window.status='xx'; return true;"
+  onblur="window.status=''; return true;"
+  onkeypress="this.className='FieldButtonLink_active'; return true;"
+  onkeyup="this.className='FieldButtonLink_focus'; return true;">
+  <table class="FieldButton" onclick="showCalendar('frmMain.inpDateTo', document.frmMain.inpDateTo.value, false);return false;" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
+
+                            <TR>
+                              <TD class="FieldButton_bg">
+                                <IMG alt="Calendar" class="FieldButton_Icon FieldButton_Icon_Calendar" title="Calendar" src="../../../../../web/images/blank.gif" border="0"></IMG>
+                              </TD>
+                            </TR>
+                          </TABLE>
+                          </a>
+                        </TD>
+                      </TR>
+                    </TABLE>
+
+                  </TD>
+             <td/>
+
+    </TR>
+
+	<tr>
+		<td class="TitleCell"><span class="LabelText">Tax report</span></td>
+
+		<td class="Combo_ContentCell" colspan="2">
+			<select class="ComboKey Combo_TwoCells_width required" required="true" name="inpTaxReportId" id="inpTaxReportId">
+				<DIV id="reportC_TAX_REPORT"></DIV>
+			</select>
+		</td>
+
+		<td class="TitleCell"><span class="LabelText">Organization</span></td>
+		<td class="Combo_ContentCell">
+			<select class="Combo Combo_OneCell_width" name="inpadOrgId" id="inpadOrgId">
+				<option value=""></option>
+				<DIV id="reportAD_ORG"></DIV>
+			</select>
+		</td>
+    <td/>
+	</tr>
+          <tr>
+            <td colspan="6" height="5px"></td>
+          </tr>
+          <tr>
+            <td class="TitleCell"></td>
+            <td class="ContentCell" colspan="2"><SPAN class="LabelText" id="question">&nbsp;</SPAN></td>
+            <td class="ContentCell"></td>
+            <td class="TitleCell"></td>
+            <td class="ContentCell"></td>
+          </tr>
+          <tr>
+            <td colspan="6" height="5px"></td>
+          </tr>
+          <tr>
+            <td class="TitleCell"></td>
+            <td class="Button_RightAlign_ContentCell">
+              <div>
+                <a class="ButtonLink" href="#"
+                  onfocus="setWindowElementFocus(this); window.status='Accept'; return true;"
+                  onblur="window.status=''; return true;"
+                  onkeypress="this.className='ButtonLink_active'; return true;"
+                  onkeyup="this.className='ButtonLink_focus'; return true;"
                   onclick="openServletNewWindow('FIND', true, 'CreateTaxReport.html', 'CreateTaxReport', null, false, '700', '1000', true);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='Accept'; return true;"
-                    onmouseout="this.className='Button'; window.status=''; return true;"
-                    id="fieldTable">
-                    <tr>
-                      <td class="Button_left"><img class="Button_Icon Button_Icon_ok" alt="Accept" title="Accept" src="../../../../../web/images/blank.gif" border=0 id="fieldButton"/></td>
-                      <td class="Button_text Button_width">OK</td>
-                      <td class="Button_right"></td>
-                    </tr>
-                  </table>
-                </a>
-              </div>
-            </td>
-            <td class="Button_LeftAlign_ContentCell">
-             
-            </td>
-            <td class="ContentCell"></td>
-            <td class="TitleCell"></td>
-            <td class="ContentCell"></td>
-          </tr>
-              </TABLE>
- 
-
-                      <!-- USER CONTROLS -->
-                </TD>
-              </TR>
-              </TABLE>
-              </TD>
-            </TR>
-          </TABLE>
-        </div>
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Menu_ContentPane_Bottom" id="tdbottomSeparator">
-          <TR>
-            <TD class="Main_Bottom_bg"><IMG src="../../../../../web/images/blank.gif" border="0"></TD>
-          </TR>
-        </TABLE></td>
-      <td valign="top">
-        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Right" id="tdrightSeparator">
-          <TR><TD class="Main_NavBar_bg_right"></TD></TR>
-          <TR><TD class="Main_ToolBar_bg_right" valign="top"></TD></TR>
-          <TR><TD class="Main_Client_bg_right"></TD></TR>
-          <TR><TD class="Main_Bottom_bg_right"></TD></TR>
-        </TABLE>
-      </td>
-    </tr>
-  </table>
-
-</FORM>
-</BODY>
-</HTML>
+                  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='Accept'; return true;"
+                    onmouseout="this.className='Button'; window.status=''; return true;"
+                    id="fieldTable">
+                    <tr>
+                      <td class="Button_left"><img class="Button_Icon Button_Icon_ok" alt="Accept" title="Accept" src="../../../../../web/images/blank.gif" border=0 id="fieldButton"/></td>
+                      <td class="Button_text Button_width">OK</td>
+                      <td class="Button_right"></td>
+                    </tr>
+                  </table>
+                </a>
+              </div>
+            </td>
+            <td class="Button_LeftAlign_ContentCell">
+             
+            </td>
+            <td class="ContentCell"></td>
+            <td class="TitleCell"></td>
+            <td class="ContentCell"></td>
+          </tr>
+              </TABLE>
+ 
+
+                      <!-- USER CONTROLS -->
+                </TD>
+              </TR>
+              </TABLE>
+              </TD>
+            </TR>
+          </TABLE>
+        </div>
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Menu_ContentPane_Bottom" id="tdbottomSeparator">
+          <TR>
+            <TD class="Main_Bottom_bg"><IMG src="../../../../../web/images/blank.gif" border="0"></TD>
+          </TR>
+        </TABLE></td>
+      <td valign="top">
+        <TABLE width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Right" id="tdrightSeparator">
+          <TR><TD class="Main_NavBar_bg_right"></TD></TR>
+          <TR><TD class="Main_ToolBar_bg_right" valign="top"></TD></TR>
+          <TR><TD class="Main_Client_bg_right"></TD></TR>
+          <TR><TD class="Main_Bottom_bg_right"></TD></TR>
+        </TABLE>
+      </td>
+    </tr>
+  </table>
+
+</FORM>
+</BODY>
+</HTML>
--- a/src/org/openbravo/erpCommon/ad_reports/PurchaseOrderDimensionalNoComparative.jrxml	Tue Apr 22 09:17:07 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/PurchaseOrderDimensionalNoComparative.jrxml	Tue Apr 22 09:19:30 2008 +0000
@@ -1,96 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"  ?>
-<!-- Created with iReport - A designer for JasperReports -->
-<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd">
-<jasperReport
-		 name="PurchaseOrderDimensionalNoComparative"
-		 columnCount="1"
-		 printOrder="Vertical"
-		 orientation="Portrait"
-		 pageWidth="595"
-		 pageHeight="842"
-		 columnWidth="535"
-		 columnSpacing="0"
-		 leftMargin="30"
-		 rightMargin="30"
-		 topMargin="20"
-		 bottomMargin="20"
-		 whenNoDataType="NoPages"
-		 isTitleNewPage="false"
-		 isSummaryNewPage="false">
-	<property name="ireport.scriptlethandling" value="0" />
-	<property name="ireport.encoding" value="UTF-8" />
-	<import value="java.util.*" />
-	<import value="net.sf.jasperreports.engine.*" />
-	<import value="net.sf.jasperreports.engine.data.*" />
-
-	<parameter name="USER_ORG" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["0,1000000"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="USER_CLIENT" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["0,1000000"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="DATEFROM" isForPrompting="true" class="java.util.Date">
-		<defaultValueExpression ><![CDATA[(new SimpleDateFormat("dd-MM-yyyy")).parse("01-01-1900")]]></defaultValueExpression>
-	</parameter>
-	<parameter name="DATETO" isForPrompting="true" class="java.util.Date">
-		<defaultValueExpression ><![CDATA[(new SimpleDateFormat("dd-MM-yyyy")).parse("31-12-3000")]]></defaultValueExpression>
-	</parameter>
-	<parameter name="cBpGroupId" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
-	</parameter>
-	<parameter name="cBpGroupId_Aux" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA[$P{cBpGroupId}.equals("") ? " " : (" AND C_BP_Group.C_BP_Group_ID = " + $P{cBpGroupId})]]></defaultValueExpression>
-	</parameter>
-	<parameter name="cBpartnerId" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
-	</parameter>
-	<parameter name="cBpartnerId_Aux" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA[($P{cBpartnerId}.equals(""))?"  ":" AND C_BPartner.C_BPartner_ID IN " + $P{cBpartnerId}]]></defaultValueExpression>
-	</parameter>
-	<parameter name="mProductCategoryId" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
-	</parameter>
-	<parameter name="mProductCategoryId_Aux" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA[($P{mProductCategoryId}.equals(""))?"  ":" AND M_Product_Category.M_Product_Category_Id = " + $P{mProductCategoryId}]]></defaultValueExpression>
-	</parameter>
-	<parameter name="mProductId" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
-	</parameter>
-	<parameter name="mProductId_Aux" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA[($P{mProductId}.equals(""))?" ":" AND M_Product.M_Product_ID IN " + $P{mProductId}]]></defaultValueExpression>
-	</parameter>
-	<parameter name="orderBy" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA[" ORDER BY 1 "]]></defaultValueExpression>
-	</parameter>
-	<parameter name="level1" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["C_BP_GROUP.NAME"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="level2" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["M_PRODUCT_CATEGORY.NAME"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="level3" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["AD_COLUMN_IDENTIFIER('M_Product', TO_CHAR(M_PRODUCT.M_PRODUCT_ID), 'es_ES')"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="level4" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["AD_COLUMN_IDENTIFIER('C_Bpartner', TO_CHAR(C_BPARTNER.C_BPARTNER_ID), 'es_ES')"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="level5" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["''"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="Title" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["Purchase Orders Report"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="PRODUCT_LEVEL" isForPrompting="false" class="java.lang.Integer">
-		<defaultValueExpression ><![CDATA[new Integer(6)]]></defaultValueExpression>
-	</parameter>
-	<parameter name="THEME" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["Default"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="BASE_WEB" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["/var/lib/tomcat-5.5/webapps/alerts/web"]]></defaultValueExpression>
-	</parameter>
-	<parameter name="NUMBERFORMAT" isForPrompting="false" class="java.text.DecimalFormat"/>
-	<parameter name="LOCALE" isForPrompting="false" class="java.util.Locale"/>
+<?xml version="1.0" encoding="UTF-8"  ?>
+<!-- Created with iReport - A designer for JasperReports -->
+<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd">
+<jasperReport
+		 name="PurchaseOrderDimensionalNoComparative"
+		 columnCount="1"
+		 printOrder="Vertical"
+		 orientation="Portrait"
+		 pageWidth="595"
+		 pageHeight="842"
+		 columnWidth="535"
+		 columnSpacing="0"
+		 leftMargin="30"
+		 rightMargin="30"
+		 topMargin="20"
+		 bottomMargin="20"
+		 whenNoDataType="NoPages"
+		 isTitleNewPage="false"
+		 isSummaryNewPage="false">
+	<property name="ireport.scriptlethandling" value="0" />
+	<property name="ireport.encoding" value="UTF-8" />
+	<import value="java.util.*" />
+	<import value="net.sf.jasperreports.engine.*" />
+	<import value="net.sf.jasperreports.engine.data.*" />
+
+	<parameter name="USER_ORG" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["0,1000000"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="USER_CLIENT" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["0,1000000"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="DATEFROM" isForPrompting="true" class="java.util.Date">
+		<defaultValueExpression ><![CDATA[(new SimpleDateFormat("dd-MM-yyyy")).parse("01-01-1900")]]></defaultValueExpression>
+	</parameter>
+	<parameter name="DATETO" isForPrompting="true" class="java.util.Date">
+		<defaultValueExpression ><![CDATA[(new SimpleDateFormat("dd-MM-yyyy")).parse("31-12-3000")]]></defaultValueExpression>
+	</parameter>
+	<parameter name="cBpGroupId" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
+	</parameter>
+	<parameter name="cBpGroupId_Aux" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA[$P{cBpGroupId}.equals("") ? " " : (" AND C_BP_Group.C_BP_Group_ID = " + $P{cBpGroupId})]]></defaultValueExpression>
+	</parameter>
+	<parameter name="cBpartnerId" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
+	</parameter>
+	<parameter name="cBpartnerId_Aux" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA[($P{cBpartnerId}.equals(""))?"  ":" AND C_BPartner.C_BPartner_ID IN " + $P{cBpartnerId}]]></defaultValueExpression>
+	</parameter>
+	<parameter name="mProductCategoryId" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
+	</parameter>
+	<parameter name="mProductCategoryId_Aux" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA[($P{mProductCategoryId}.equals(""))?"  ":" AND M_Product_Category.M_Product_Category_Id = " + $P{mProductCategoryId}]]></defaultValueExpression>
+	</parameter>
+	<parameter name="mProductId" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA[""]]></defaultValueExpression>
+	</parameter>
+	<parameter name="mProductId_Aux" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA[($P{mProductId}.equals(""))?" ":" AND M_Product.M_Product_ID IN " + $P{mProductId}]]></defaultValueExpression>
+	</parameter>
+	<parameter name="orderBy" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA[" ORDER BY 1 "]]></defaultValueExpression>
+	</parameter>
+	<parameter name="level1" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["C_BP_GROUP.NAME"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="level2" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["M_PRODUCT_CATEGORY.NAME"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="level3" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["AD_COLUMN_IDENTIFIER('M_Product', TO_CHAR(M_PRODUCT.M_PRODUCT_ID), 'es_ES')"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="level4" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["AD_COLUMN_IDENTIFIER('C_Bpartner', TO_CHAR(C_BPARTNER.C_BPARTNER_ID), 'es_ES')"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="level5" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["''"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="Title" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["Purchase Orders Report"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="PRODUCT_LEVEL" isForPrompting="false" class="java.lang.Integer">
+		<defaultValueExpression ><![CDATA[new Integer(6)]]></defaultValueExpression>
+	</parameter>
+	<parameter name="THEME" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["Default"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="BASE_WEB" isForPrompting="false" class="java.lang.String">
+		<defaultValueExpression ><![CDATA["/var/lib/tomcat-5.5/webapps/alerts/web"]]></defaultValueExpression>
+	</parameter>
+	<parameter name="NUMBERFORMAT" isForPrompting="false" class="java.text.DecimalFormat"/>
+	<parameter name="LOCALE" isForPrompting="false" class="java.util.Locale"/>
 	<queryString><![CDATA[SELECT NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5, SUM(LINENETAMT) AS LINENETAMT, SUM(QTYORDERED) AS QTYORDERED, SUM(LINENETREF) AS LINENETREF, SUM(QTYORDEREDREF) AS QTYORDEREDREF, UOMSYMBOL
 FROM (SELECT to_char($P!{level1}) AS NIVEL1, to_char($P!{level2}) AS NIVEL2, to_char($P!{level3}) AS NIVEL3, to_char($P!{level4}) AS NIVEL4, to_char($P!{level5}) AS NIVEL5, 
       C_ORDERLINE.LINENETAMT, C_ORDERLINE.QTYORDERED, 0 AS LINENETREF, 0 AS QTYORDEREDREF, C_UOM.UOMSYMBOL
@@ -113,60 +113,60 @@
         AND C_ORDER.DATEORDERED	< $P{DATETO}
       ) AA
 GROUP BY NIVEL1, NIVEL2, NIVEL3, NIVEL4, NIVEL5, UOMSYMBOL
-$P!{orderBy}]]></queryString>
-
-	<field name="NIVEL1" class="java.lang.String"/>
-	<field name="NIVEL2" class="java.lang.String"/>
-	<field name="NIVEL3" class="java.lang.String"/>
-	<field name="NIVEL4" class="java.lang.String"/>
-	<field name="NIVEL5" class="java.lang.String"/>
-	<field name="LINENETAMT" class="java.math.BigDecimal"/>
-	<field name="QTYORDERED" class="java.lang.Double"/>
-	<field name="LINENETREF" class="java.math.BigDecimal"/>
-	<field name="QTYORDEREDREF" class="java.math.BigDecimal"/>
-	<field name="UOMSYMBOL" class="java.lang.String"/>
-
-	<variable name="QTYORDERED_SUM5" class="java.lang.Double" resetType="Group" resetGroup="LEVEL5" calculation="Sum">
-		<variableExpression><![CDATA[$F{QTYORDERED}]]></variableExpression>
-		<initialValueExpression><![CDATA[new Double(0)]]></initialValueExpression>
-	</variable>
-	<variable name="QTYORDERED_SUM4" class="java.lang.Double" resetType="Group" resetGroup="NIVEL4" calculation="Sum">
-		<variableExpression><![CDATA[new Double($F{QTYORDERED}.doubleValue())]]></variableExpression>
-	</variable>
-	<variable name="QTYORDERED_SUM3" class="java.lang.Double" resetType="Group" resetGroup="NIVEL3" calculation="Sum">
-		<variableExpression><![CDATA[$F{QTYORDERED}]]></variableExpression>
-	</variable>
-	<variable name="QTYORDERED_SUM2" class="java.lang.Double" resetType="Group" resetGroup="NIVEL2" calculation="Sum">
-		<variableExpression><![CDATA[$F{QTYORDERED}]]></variableExpression>
-	</variable>
-	<variable name="QTYORDERED_SUM1" class="java.lang.Double" resetType="Group" resetGroup="LEVEL5" calculation="Sum">
-		<variableExpression><![CDATA[$F{QTYORDERED}]]></variableExpression>
-	</variable>
-	<variable name="QTYORDERED_TOTAL" class="java.math.BigDecimal" resetType="Report" calculation="Sum">
-		<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
-	</variable>
-	<variable name="LINENETAMT_SUM1" class="java.math.BigDecimal" resetType="Group" resetGroup="NIVEL1" calculation="Sum">
-		<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
-	</variable>
-	<variable name="LINENETAMT_SUM2" class="java.math.BigDecimal" resetType="Group" resetGroup="NIVEL2" calculation="Sum">
-		<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
-	</variable>
-	<variable name="LINENETAMT_SUM3" class="java.math.BigDecimal" resetType="Group" resetGroup="NIVEL3" calculation="Sum">
-		<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
-	</variable>
-	<variable name="LINENETAMT_SUM4" class="java.math.BigDecimal" resetType="Group" resetGroup="NIVEL4" calculation="Sum">
-		<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
-	</variable>
-	<variable name="LINENETAMT_SUM5" class="java.math.BigDecimal" resetType="Group" resetGroup="LEVEL5" calculation="Sum">
-		<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
-	</variable>
-
-		<group  name="NIVEL1" >
-			<groupExpression><![CDATA[$F{NIVEL1}]]></groupExpression>
-			<groupHeader>
-			<band height="18"  isSplitAllowed="true" >
-				<printWhenExpression><![CDATA[new Boolean(!$P{level1}.equals("''"))]]></printWhenExpression>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+$P!{orderBy}]]></queryString>
+
+	<field name="NIVEL1" class="java.lang.String"/>
+	<field name="NIVEL2" class="java.lang.String"/>
+	<field name="NIVEL3" class="java.lang.String"/>
+	<field name="NIVEL4" class="java.lang.String"/>
+	<field name="NIVEL5" class="java.lang.String"/>
+	<field name="LINENETAMT" class="java.math.BigDecimal"/>
+	<field name="QTYORDERED" class="java.lang.Double"/>
+	<field name="LINENETREF" class="java.math.BigDecimal"/>
+	<field name="QTYORDEREDREF" class="java.math.BigDecimal"/>
+	<field name="UOMSYMBOL" class="java.lang.String"/>
+
+	<variable name="QTYORDERED_SUM5" class="java.lang.Double" resetType="Group" resetGroup="LEVEL5" calculation="Sum">
+		<variableExpression><![CDATA[$F{QTYORDERED}]]></variableExpression>
+		<initialValueExpression><![CDATA[new Double(0)]]></initialValueExpression>
+	</variable>
+	<variable name="QTYORDERED_SUM4" class="java.lang.Double" resetType="Group" resetGroup="NIVEL4" calculation="Sum">
+		<variableExpression><![CDATA[new Double($F{QTYORDERED}.doubleValue())]]></variableExpression>
+	</variable>
+	<variable name="QTYORDERED_SUM3" class="java.lang.Double" resetType="Group" resetGroup="NIVEL3" calculation="Sum">
+		<variableExpression><![CDATA[$F{QTYORDERED}]]></variableExpression>
+	</variable>
+	<variable name="QTYORDERED_SUM2" class="java.lang.Double" resetType="Group" resetGroup="NIVEL2" calculation="Sum">
+		<variableExpression><![CDATA[$F{QTYORDERED}]]></variableExpression>
+	</variable>
+	<variable name="QTYORDERED_SUM1" class="java.lang.Double" resetType="Group" resetGroup="LEVEL5" calculation="Sum">
+		<variableExpression><![CDATA[$F{QTYORDERED}]]></variableExpression>
+	</variable>
+	<variable name="QTYORDERED_TOTAL" class="java.math.BigDecimal" resetType="Report" calculation="Sum">
+		<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
+	</variable>
+	<variable name="LINENETAMT_SUM1" class="java.math.BigDecimal" resetType="Group" resetGroup="NIVEL1" calculation="Sum">
+		<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
+	</variable>
+	<variable name="LINENETAMT_SUM2" class="java.math.BigDecimal" resetType="Group" resetGroup="NIVEL2" calculation="Sum">
+		<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
+	</variable>
+	<variable name="LINENETAMT_SUM3" class="java.math.BigDecimal" resetType="Group" resetGroup="NIVEL3" calculation="Sum">
+		<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
+	</variable>
+	<variable name="LINENETAMT_SUM4" class="java.math.BigDecimal" resetType="Group" resetGroup="NIVEL4" calculation="Sum">
+		<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
+	</variable>
+	<variable name="LINENETAMT_SUM5" class="java.math.BigDecimal" resetType="Group" resetGroup="LEVEL5" calculation="Sum">
+		<variableExpression><![CDATA[$F{LINENETAMT}]]></variableExpression>
+	</variable>
+
+		<group  name="NIVEL1" >
+			<groupExpression><![CDATA[$F{NIVEL1}]]></groupExpression>
+			<groupHeader>
+			<band height="18"  isSplitAllowed="true" >
+				<printWhenExpression><![CDATA[new Boolean(!$P{level1}.equals("''"))]]></printWhenExpression>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="0"
@@ -174,14 +174,14 @@
 						width="391"
 						height="18"
 						backcolor="#99FF99"
-						key="textField"/>
-					<box topBorder="Thin" topBorderColor="#000000" leftBorder="Thin" leftBorderColor="#000000" leftPadding="5" rightBorder="Thin" rightBorderColor="#000000" bottomBorder="Thin" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{NIVEL1}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField"/>
+					<box topBorder="Thin" topBorderColor="#000000" leftBorder="Thin" leftBorderColor="#000000" leftPadding="5" rightBorder="Thin" rightBorderColor="#000000" bottomBorder="Thin" bottomBorderColor="#000000"/>
+					<textElement verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{NIVEL1}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="509"
@@ -189,16 +189,16 @@
 						width="26"
 						height="18"
 						backcolor="#99FF99"
-						key="textField">
-							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=1)]]></printWhenExpression>
-						</reportElement>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{UOMSYMBOL}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="NIVEL1"  hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField">
+							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=1)]]></printWhenExpression>
+						</reportElement>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{UOMSYMBOL}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="NIVEL1"  hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="463"
@@ -206,16 +206,16 @@
 						width="46"
 						height="18"
 						backcolor="#99FF99"
-						key="textField">
-							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=1)]]></printWhenExpression>
-						</reportElement>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.Double"><![CDATA[$V{QTYORDERED_SUM1}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="NIVEL1"  hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField">
+							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=1)]]></printWhenExpression>
+						</reportElement>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.Double"><![CDATA[$V{QTYORDERED_SUM1}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="NIVEL1"  hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="391"
@@ -223,26 +223,26 @@
 						width="72"
 						height="18"
 						backcolor="#99FF99"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($V{LINENETAMT_SUM1}!=null)?$P{NUMBERFORMAT}.format($V{LINENETAMT_SUM1}):new String(" ")]]></textFieldExpression>
-				</textField>
-			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-			</groupFooter>
-		</group>
-		<group  name="NIVEL2" >
-			<groupExpression><![CDATA[$F{NIVEL2}]]></groupExpression>
-			<groupHeader>
-			<band height="18"  isSplitAllowed="true" >
-				<printWhenExpression><![CDATA[new Boolean(!$P{level2}.equals("''"))]]></printWhenExpression>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField"/>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($V{LINENETAMT_SUM1}!=null)?$P{NUMBERFORMAT}.format($V{LINENETAMT_SUM1}):new String(" ")]]></textFieldExpression>
+				</textField>
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+			</groupFooter>
+		</group>
+		<group  name="NIVEL2" >
+			<groupExpression><![CDATA[$F{NIVEL2}]]></groupExpression>
+			<groupHeader>
+			<band height="18"  isSplitAllowed="true" >
+				<printWhenExpression><![CDATA[new Boolean(!$P{level2}.equals("''"))]]></printWhenExpression>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="50"
@@ -250,14 +250,14 @@
 						width="341"
 						height="18"
 						backcolor="#66FF66"
-						key="textField"/>
-					<box topBorder="Thin" topBorderColor="#000000" leftBorder="Thin" leftBorderColor="#000000" leftPadding="5" rightBorder="Thin" rightBorderColor="#000000" bottomBorder="Thin" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{NIVEL2}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField"/>
+					<box topBorder="Thin" topBorderColor="#000000" leftBorder="Thin" leftBorderColor="#000000" leftPadding="5" rightBorder="Thin" rightBorderColor="#000000" bottomBorder="Thin" bottomBorderColor="#000000"/>
+					<textElement verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{NIVEL2}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="509"
@@ -265,16 +265,16 @@
 						width="26"
 						height="18"
 						backcolor="#66FF66"
-						key="textField">
-							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=2)]]></printWhenExpression>
-						</reportElement>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="3" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{UOMSYMBOL}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="NIVEL2"  hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField">
+							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=2)]]></printWhenExpression>
+						</reportElement>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="3" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{UOMSYMBOL}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="NIVEL2"  hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="463"
@@ -282,16 +282,16 @@
 						width="46"
 						height="18"
 						backcolor="#66FF66"
-						key="textField">
-							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=2)]]></printWhenExpression>
-						</reportElement>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.Double"><![CDATA[$V{QTYORDERED_SUM2}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="NIVEL2"  hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField">
+							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=2)]]></printWhenExpression>
+						</reportElement>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.Double"><![CDATA[$V{QTYORDERED_SUM2}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="NIVEL2"  hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="391"
@@ -299,26 +299,26 @@
 						width="72"
 						height="18"
 						backcolor="#66FF66"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($V{LINENETAMT_SUM2}!=null)?$P{NUMBERFORMAT}.format($V{LINENETAMT_SUM2}):new String(" ")]]></textFieldExpression>
-				</textField>
-			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-			</groupFooter>
-		</group>
-		<group  name="NIVEL3" >
-			<groupExpression><![CDATA[$F{NIVEL3}]]></groupExpression>
-			<groupHeader>
-			<band height="18"  isSplitAllowed="true" >
-				<printWhenExpression><![CDATA[new Boolean(!$P{level3}.equals("''"))]]></printWhenExpression>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField"/>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($V{LINENETAMT_SUM2}!=null)?$P{NUMBERFORMAT}.format($V{LINENETAMT_SUM2}):new String(" ")]]></textFieldExpression>
+				</textField>
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+			</groupFooter>
+		</group>
+		<group  name="NIVEL3" >
+			<groupExpression><![CDATA[$F{NIVEL3}]]></groupExpression>
+			<groupHeader>
+			<band height="18"  isSplitAllowed="true" >
+				<printWhenExpression><![CDATA[new Boolean(!$P{level3}.equals("''"))]]></printWhenExpression>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="100"
@@ -326,14 +326,14 @@
 						width="291"
 						height="18"
 						backcolor="#33FF33"
-						key="textField"/>
-					<box topBorder="Thin" topBorderColor="#000000" leftBorder="Thin" leftBorderColor="#000000" leftPadding="5" rightBorder="Thin" rightBorderColor="#000000" bottomBorder="Thin" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{NIVEL3}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField"/>
+					<box topBorder="Thin" topBorderColor="#000000" leftBorder="Thin" leftBorderColor="#000000" leftPadding="5" rightBorder="Thin" rightBorderColor="#000000" bottomBorder="Thin" bottomBorderColor="#000000"/>
+					<textElement verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{NIVEL3}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="509"
@@ -341,16 +341,16 @@
 						width="26"
 						height="18"
 						backcolor="#33FF33"
-						key="textField">
-							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=3)]]></printWhenExpression>
-						</reportElement>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="3" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{UOMSYMBOL}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="NIVEL3"  hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField">
+							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=3)]]></printWhenExpression>
+						</reportElement>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="3" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{UOMSYMBOL}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="NIVEL3"  hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="463"
@@ -358,16 +358,16 @@
 						width="46"
 						height="18"
 						backcolor="#33FF33"
-						key="textField">
-							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=3)]]></printWhenExpression>
-						</reportElement>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.Double"><![CDATA[$V{QTYORDERED_SUM3}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="NIVEL3"  hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField">
+							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=3)]]></printWhenExpression>
+						</reportElement>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.Double"><![CDATA[$V{QTYORDERED_SUM3}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="NIVEL3"  hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="391"
@@ -375,26 +375,26 @@
 						width="72"
 						height="18"
 						backcolor="#33FF33"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($V{LINENETAMT_SUM3}!=null)?$P{NUMBERFORMAT}.format($V{LINENETAMT_SUM3}):new String(" ")]]></textFieldExpression>
-				</textField>
-			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-			</groupFooter>
-		</group>
-		<group  name="NIVEL4" >
-			<groupExpression><![CDATA[$F{NIVEL4}]]></groupExpression>
-			<groupHeader>
-			<band height="18"  isSplitAllowed="true" >
-				<printWhenExpression><![CDATA[new Boolean(!$P{level4}.equals("''"))]]></printWhenExpression>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField"/>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($V{LINENETAMT_SUM3}!=null)?$P{NUMBERFORMAT}.format($V{LINENETAMT_SUM3}):new String(" ")]]></textFieldExpression>
+				</textField>
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+			</groupFooter>
+		</group>
+		<group  name="NIVEL4" >
+			<groupExpression><![CDATA[$F{NIVEL4}]]></groupExpression>
+			<groupHeader>
+			<band height="18"  isSplitAllowed="true" >
+				<printWhenExpression><![CDATA[new Boolean(!$P{level4}.equals("''"))]]></printWhenExpression>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="150"
@@ -402,14 +402,14 @@
 						width="241"
 						height="18"
 						backcolor="#00FF00"
-						key="textField"/>
-					<box topBorder="Thin" topBorderColor="#000000" leftBorder="Thin" leftBorderColor="#000000" leftPadding="5" rightBorder="Thin" rightBorderColor="#000000" bottomBorder="Thin" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{NIVEL4}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField"/>
+					<box topBorder="Thin" topBorderColor="#000000" leftBorder="Thin" leftBorderColor="#000000" leftPadding="5" rightBorder="Thin" rightBorderColor="#000000" bottomBorder="Thin" bottomBorderColor="#000000"/>
+					<textElement verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{NIVEL4}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="509"
@@ -417,16 +417,16 @@
 						width="26"
 						height="18"
 						backcolor="#00FF00"
-						key="textField">
-							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=4)]]></printWhenExpression>
-						</reportElement>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="3" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{UOMSYMBOL}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="NIVEL4"  hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField">
+							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=4)]]></printWhenExpression>
+						</reportElement>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="3" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{UOMSYMBOL}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="NIVEL4"  hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="463"
@@ -434,16 +434,16 @@
 						width="46"
 						height="18"
 						backcolor="#00FF00"
-						key="textField">
-							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=4)]]></printWhenExpression>
-						</reportElement>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.Double"><![CDATA[$V{QTYORDERED_SUM4}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="NIVEL4"  hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField">
+							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=4)]]></printWhenExpression>
+						</reportElement>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.Double"><![CDATA[$V{QTYORDERED_SUM4}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="NIVEL4"  hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="391"
@@ -451,26 +451,26 @@
 						width="72"
 						height="18"
 						backcolor="#00FF00"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($V{LINENETAMT_SUM4}!=null)?$P{NUMBERFORMAT}.format($V{LINENETAMT_SUM4}):new String(" ")]]></textFieldExpression>
-				</textField>
-			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-			</groupFooter>
-		</group>
-		<group  name="LEVEL5" >
-			<groupExpression><![CDATA[$F{NIVEL5}]]></groupExpression>
-			<groupHeader>
-			<band height="18"  isSplitAllowed="true" >
-				<printWhenExpression><![CDATA[new Boolean(!$P{level5}.equals("''"))]]></printWhenExpression>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField"/>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($V{LINENETAMT_SUM4}!=null)?$P{NUMBERFORMAT}.format($V{LINENETAMT_SUM4}):new String(" ")]]></textFieldExpression>
+				</textField>
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+			</groupFooter>
+		</group>
+		<group  name="LEVEL5" >
+			<groupExpression><![CDATA[$F{NIVEL5}]]></groupExpression>
+			<groupHeader>
+			<band height="18"  isSplitAllowed="true" >
+				<printWhenExpression><![CDATA[new Boolean(!$P{level5}.equals("''"))]]></printWhenExpression>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="200"
@@ -478,14 +478,14 @@
 						width="191"
 						height="18"
 						backcolor="#00CC00"
-						key="textField"/>
-					<box topBorder="Thin" topBorderColor="#000000" leftBorder="Thin" leftBorderColor="#000000" leftPadding="5" rightBorder="Thin" rightBorderColor="#000000" bottomBorder="Thin" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{NIVEL5}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField"/>
+					<box topBorder="Thin" topBorderColor="#000000" leftBorder="Thin" leftBorderColor="#000000" leftPadding="5" rightBorder="Thin" rightBorderColor="#000000" bottomBorder="Thin" bottomBorderColor="#000000"/>
+					<textElement verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{NIVEL5}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="509"
@@ -493,16 +493,16 @@
 						width="26"
 						height="18"
 						backcolor="#00CC00"
-						key="textField">
-							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=5)]]></printWhenExpression>
-						</reportElement>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="3" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$F{UOMSYMBOL}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="LEVEL5"  hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField">
+							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=5)]]></printWhenExpression>
+						</reportElement>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="3" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{UOMSYMBOL}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="LEVEL5"  hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="463"
@@ -510,16 +510,16 @@
 						width="46"
 						height="18"
 						backcolor="#00CC00"
-						key="textField">
-							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=5)]]></printWhenExpression>
-						</reportElement>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.Double"><![CDATA[$V{QTYORDERED_SUM5}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="LEVEL5"  hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField">
+							<printWhenExpression><![CDATA[new Boolean($P{PRODUCT_LEVEL}.intValue()<=5)]]></printWhenExpression>
+						</reportElement>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.Double"><![CDATA[$V{QTYORDERED_SUM5}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Group" evaluationGroup="LEVEL5"  hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						mode="Opaque"
 						x="391"
@@ -527,62 +527,62 @@
 						width="72"
 						height="18"
 						backcolor="#00CC00"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($V{LINENETAMT_SUM5}!=null)?$P{NUMBERFORMAT}.format($V{LINENETAMT_SUM5}):new String(" ")]]></textFieldExpression>
-				</textField>
-			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-			</groupFooter>
-		</group>
-		<background>
-			<band height="11"  isSplitAllowed="true" >
-			</band>
-		</background>
-		<title>
-			<band height="50"  isSplitAllowed="true" >
-				<textField isStretchWithOverflow="true" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField"/>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement textAlignment="Right" verticalAlignment="Middle">
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[($V{LINENETAMT_SUM5}!=null)?$P{NUMBERFORMAT}.format($V{LINENETAMT_SUM5}):new String(" ")]]></textFieldExpression>
+				</textField>
+			</band>
+			</groupHeader>
+			<groupFooter>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+			</groupFooter>
+		</group>
+		<background>
+			<band height="11"  isSplitAllowed="true" >
+			</band>
+		</background>
+		<title>
+			<band height="50"  isSplitAllowed="true" >
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						x="0"
 						y="0"
 						width="535"
 						height="26"
 						forecolor="#000099"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement>
-						<font size="14" isBold="true"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[$P{Title}]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Report" hyperlinkType="None"  hyperlinkTarget="Self" >
+						key="textField"/>
+					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<textElement>
+						<font size="14" isBold="true"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$P{Title}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" pattern="" isBlankWhenNull="false" evaluationTime="Report" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						x="0"
 						y="26"
 						width="246"
 						height="18"
-						key="textField"/>
-					<box topBorder="Thin" topBorderColor="#000000" leftBorder="Thin" leftBorderColor="#000000" rightBorder="Thin" rightBorderColor="#000000" bottomBorder="Thin" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font pdfFontName="Helvetica-Bold" isBold="true"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA["TOTAL AMOUNT: " + (($V{QTYORDERED_TOTAL}!=null)?$P{NUMBERFORMAT}.format($V{QTYORDERED_TOTAL}):new String(" "))]]></textFieldExpression>
-				</textField>
-			</band>
-		</title>
-		<pageHeader>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</pageHeader>
-		<columnHeader>
-			<band height="18"  isSplitAllowed="true" >
-				<staticText>
+						key="textField"/>
+					<box topBorder="Thin" topBorderColor="#000000" leftBorder="Thin" leftBorderColor="#000000" rightBorder="Thin" rightBorderColor="#000000" bottomBorder="Thin" bottomBorderColor="#000000"/>
+					<textElement verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold" isBold="true"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA["TOTAL AMOUNT: " + (($V{QTYORDERED_TOTAL}!=null)?$P{NUMBERFORMAT}.format($V{QTYORDERED_TOTAL}):new String(" "))]]></textFieldExpression>
+				</textField>
+			</band>
+		</title>
+		<pageHeader>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</pageHeader>
+		<columnHeader>
+			<band height="18"  isSplitAllowed="true" >
+				<staticText>
 					<reportElement
 						mode="Opaque"
 						x="463"
@@ -590,14 +590,14 @@
 						width="72"
 						height="18"
 						backcolor="#CCCCCC"
-						key="staticText-1"/>
-					<box topBorder="Thin" topBorderColor="#000000" leftBorder="Thin" leftBorderColor="#000000" leftPadding="5" rightBorder="Thin" rightBorderColor="#000000" bottomBorder="Thin" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font pdfFontName="Helvetica-Bold" isBold="true"/>
-					</textElement>
-				<text><![CDATA[Quantity]]></text>
-				</staticText>
-				<staticText>
+						key="staticText-1"/>
+					<box topBorder="Thin" topBorderColor="#000000" leftBorder="Thin" leftBorderColor="#000000" leftPadding="5" rightBorder="Thin" rightBorderColor="#000000" bottomBorder="Thin" bottomBorderColor="#000000"/>
+					<textElement verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold" isBold="true"/>
+					</textElement>
+				<text><![CDATA[Quantity]]></text>
+				</staticText>
+				<staticText>
 					<reportElement
 						mode="Opaque"
 						x="391"
@@ -605,29 +605,29 @@
 						width="72"
 						height="18"
 						backcolor="#CCCCCC"
-						key="staticText-3"/>
-					<box topBorder="Thin" topBorderColor="#000000" leftBorder="Thin" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="Thin" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font pdfFontName="Helvetica-Bold" isBold="true"/>
-					</textElement>
-				<text><![CDATA[Amount]]></text>
-				</staticText>
-			</band>
-		</columnHeader>
-		<detail>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</detail>
-		<columnFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</columnFooter>
-		<pageFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</pageFooter>
-		<summary>
-			<band height="20"  isSplitAllowed="true" >
-			</band>
-		</summary>
-</jasperReport>
+						key="staticText-3"/>
+					<box topBorder="Thin" topBorderColor="#000000" leftBorder="Thin" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="Thin" bottomBorderColor="#000000"/>
+					<textElement verticalAlignment="Middle">
+						<font pdfFontName="Helvetica-Bold" isBold="true"/>
+					</textElement>
+				<text><![CDATA[Amount]]></text>
+				</staticText>
+			</band>
+		</columnHeader>
+		<detail>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</detail>
+		<columnFooter>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</columnFooter>
+		<pageFooter>
+			<band height="0"  isSplitAllowed="true" >
+			</band>
+		</pageFooter>
+		<summary>
+			<band height="20"  isSplitAllowed="true" >
+			</band>
+		</summary>
+</jasperReport>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.html	Tue Apr 22 09:17:07 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.html	Tue Apr 22 09:19:30 2008 +0000
@@ -52,84 +52,84 @@
         dojo.hostenv.writeIncludes();
       </script>
 <SCRIPT language="JavaScript" type="text/javascript">
-function columnChange() {
-  var elemDiv;
-  var elemInput;
-  for (i=2; i<5; i++) {
-	iMinusOne = i - 1;
-	elemDiv = document.getElementById('spanCol'+i);
-	elemInput = document.getElementById('paramColumn'+iMinusOne);
-	if (elemInput.value=="") {
-	  elemDiv.innerHTML = "?";
-	} else {
-	  elemDiv.innerHTML = parseInt(elemInput.value)+parseInt(1);
-	}
-  }
-  elemDiv = document.getElementById('paramColumn4');
-  elemInput = document.getElementById('spanCol5');
-  elemInput.innerHTML = elemDiv.value;
-  return true;
-}
-</SCRIPT>
-<SCRIPT language="JavaScript" type="text/javascript">
-  function depurar() {
-	seleccionarListCompleto(document.frmMain.inpcBPartnerId_IN);
-    if (!esNumero(document.frmMain.paramColumn1.value,false,true) || document.frmMain.paramColumn1.value==""){
-  	  document.frmMain.paramColumn1.focus();
-  	  mensaje(4);
-  	  return false;
-    }
-    if (!esNumero(document.frmMain.paramColumn2.value,false,true) || document.frmMain.paramColumn2.value==""){
-  	  document.frmMain.paramColumn2.focus();
-  	  mensaje(4);
-  	  return false;
-    }
-    if (!esNumero(document.frmMain.paramColumn3.value,false,true) || document.frmMain.paramColumn3.value=="") {
-	  document.frmMain.paramColumn3.focus();
-  	  mensaje(4);
-  	  return false;
-    }
-    if (!esNumero(document.frmMain.paramColumn4.value,false,true) || document.frmMain.paramColumn4.value=="") {
-  	  document.frmMain.paramColumn4.focus();
-  	  mensaje(4);
-  	  return false;
-    }
-    if (Number(document.frmMain.paramColumn1.value)<0) {
-  	  document.frmMain.paramColumn1.focus();
-	  mensaje(9);
-	  return false;
-    }
-    if (Number(document.frmMain.paramColumn2.value)<=Number(document.frmMain.paramColumn1.value)) {
-  	  document.frmMain.paramColumn2.focus();
-	  mensaje(9);
-	  return false;
-    }
-    if (Number(document.frmMain.paramColumn3.value)<=Number(document.frmMain.paramColumn2.value)) {
-  	  document.frmMain.paramColumn3.focus();
-	  mensaje(9);
-	  return false;
-    }
-    if (Number(document.frmMain.paramColumn4.value)<=Number(document.frmMain.paramColumn3.value)) {
-  	  document.frmMain.paramColumn4.focus();
-	  mensaje(9);
-	  return false;
-    }
+function columnChange() {
+  var elemDiv;
+  var elemInput;
+  for (i=2; i<5; i++) {
+	iMinusOne = i - 1;
+	elemDiv = document.getElementById('spanCol'+i);
+	elemInput = document.getElementById('paramColumn'+iMinusOne);
+	if (elemInput.value=="") {
+	  elemDiv.innerHTML = "?";
+	} else {
+	  elemDiv.innerHTML = parseInt(elemInput.value)+parseInt(1);
+	}
+  }
+  elemDiv = document.getElementById('paramColumn4');
+  elemInput = document.getElementById('spanCol5');
+  elemInput.innerHTML = elemDiv.value;
+  return true;
+}
+</SCRIPT>
+<SCRIPT language="JavaScript" type="text/javascript">
+  function depurar() {
+	seleccionarListCompleto(document.frmMain.inpcBPartnerId_IN);
+    if (!esNumero(document.frmMain.paramColumn1.value,false,true) || document.frmMain.paramColumn1.value==""){
+  	  document.frmMain.paramColumn1.focus();
+  	  mensaje(4);
+  	  return false;
+    }
+    if (!esNumero(document.frmMain.paramColumn2.value,false,true) || document.frmMain.paramColumn2.value==""){
+  	  document.frmMain.paramColumn2.focus();
+  	  mensaje(4);
+  	  return false;
+    }
+    if (!esNumero(document.frmMain.paramColumn3.value,false,true) || document.frmMain.paramColumn3.value=="") {
+	  document.frmMain.paramColumn3.focus();
+  	  mensaje(4);
+  	  return false;
+    }
+    if (!esNumero(document.frmMain.paramColumn4.value,false,true) || document.frmMain.paramColumn4.value=="") {
+  	  document.frmMain.paramColumn4.focus();
+  	  mensaje(4);
+  	  return false;
+    }
+    if (Number(document.frmMain.paramColumn1.value)<0) {
+  	  document.frmMain.paramColumn1.focus();
+	  mensaje(9);
+	  return false;
+    }
+    if (Number(document.frmMain.paramColumn2.value)<=Number(document.frmMain.paramColumn1.value)) {
+  	  document.frmMain.paramColumn2.focus();
+	  mensaje(9);
+	  return false;
+    }
+    if (Number(document.frmMain.paramColumn3.value)<=Number(document.frmMain.paramColumn2.value)) {
+  	  document.frmMain.paramColumn3.focus();
+	  mensaje(9);
+	  return false;
+    }
+    if (Number(document.frmMain.paramColumn4.value)<=Number(document.frmMain.paramColumn3.value)) {
+  	  document.frmMain.paramColumn4.focus();
+	  mensaje(9);
+	  return false;
+    }
     if (inputValue(document.frmMain.inpOrg) == null || inputValue(document.frmMain.inpOrg) == "") {
       document.frmMain.inpOrg.focus();
       mensaje(7);
       return false;
-    }
-    return true;
-  }
-</SCRIPT>
+    }
+    return true;
+  }
+</SCRIPT>
 </HEAD>
     <body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="resizeArea();updateMenuIcon('buttonMenu');setFocusFirstControl();columnChange();" onresize="resizeArea();">
-	<FORM method="POST" action="ReportAgingBalance.html" name="frmMain" id="form">
-		<INPUT type="hidden" name="inpBpartnerId" id="paramBPartnerId" />
-		<INPUT type="hidden" name="inpDateFrom" id="paramDateFrom" />
-		<INPUT type="hidden" name="inpDateTo" id="paramDateTo" />
-        <INPUT type="hidden" name="inpFlagFromAging" id="paramFlagFromAging" value="Y" />
-		<INPUT type="hidden" name="inpPending" value="isPending" id="paramPending" checked="isPending" />
+	<FORM method="POST" action="ReportAgingBalance.html" name="frmMain" id="form">
+		<INPUT type="hidden" name="inpBpartnerId" id="paramBPartnerId" />
+		<INPUT type="hidden" name="inpDateFrom" id="paramDateFrom" />
+		<INPUT type="hidden" name="inpDateTo" id="paramDateTo" />
+        <INPUT type="hidden" name="inpFlagFromAging" id="paramFlagFromAging" value="Y" />
+		<INPUT type="hidden" name="inpPending" value="isPending" id="paramPending" checked="isPending" />
   <table height="100%" border="0" cellpadding="0" cellspacing="0" id="main">
     <tr>
       <td valign="top" id="tdleftTabs"></td>
@@ -243,8 +243,8 @@
                             <!-- USER CONTROLS -->
 		          <INPUT type="hidden" name="Command"></INPUT>
               <TABLE class="Main_Client_TableEdition">
-                <!-- Number of columns definition -->
-                <tr>
+                <!-- Number of columns definition -->
+                <tr>
                   <td class="TitleCell" width="17%"></td>
                   <td class="TitleCell" width="17%"></td>
                   <td class="TitleCell" width="16%"></td>
@@ -253,7 +253,7 @@
                   <td class="TitleCell" width="17%"></td>
                 </tr>
                 <TR>
-                <td colspan="6">
+                <td colspan="6">
                 <!-- Title Primary Filters -->
                   <table class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
                   <tbody>
@@ -269,154 +269,154 @@
                   </table>
                 </td>
                 </TR>
-                <tr>
-                  <TD class="TitleCell"> <SPAN class="LabelText">Organization</SPAN></TD>
-                  <TD class="Combo_ContentCell"> 
-                    <SELECT  name="inpOrg" id="inpOrg" class="ComboKey Combo_OneCell_width" required="true">
-                    <OPTION value=""> <DIV id="reportAD_ORGID"></DIV></OPTION>
-                  </SELECT></TD>
-							    <TD class="TitleCell"></TD>
-							    <TD class="TitleCell"></TD>
-                  <TD class="TitleCell" align="center"><SPAN class="LabelText">Date Ranges</SPAN></TD>
-                  <TD class="TitleCell"></TD>
-                </tr>
-                <TR>
-                  <TD class="TitleCell"> <SPAN class="LabelText">Receivable</SPAN></TD>
-                  <TD class="Radio_Check_ContentCell"> <INPUT type="radio" name="inpReceipt" value="Y" checked="" id="paramReceipt"></INPUT> </TD>
-                  <TD class="TitleCell"> <SPAN class="LabelText">Payable</SPAN></TD>
-                  <TD class="Radio_Check_ContentCell"> <INPUT type="radio" name="inpReceipt" value="N" checked="" id="paramPayable"></INPUT></TD>
-                  <TD class="TitleCell">
-                    <INPUT dojotype="openbravo:RealNumberTextbox" type="hidden" name="inpColumn0" id="paramColumn0" value="0" />
-							      <SCRIPT>djConfig.searchIds.push("paramColumn0");</SCRIPT>
-                    <SPAN class="LabelText">0</SPAN> - </TD>
-							    <TD class="TitleCell">
-							      <INPUT dojotype="openbravo:RealNumberTextbox" class="required TextBox_btn_OneCell_width" greaterThan="paramColumn0" type="text" name="inpColumn1" id="paramColumn1" maxlength="4" size=4 onchange="columnChange();" value="xxx7" width="4"/>
-							      <SCRIPT>djConfig.searchIds.push("paramColumn1");</SCRIPT></TD></TR>
-
-						  	<TR>
-                  <TD class="TitleCell"><SPAN class="LabelText">
-								    Business Partners
-                  </SPAN></TD>
-							    <TD ROWSPAN="3" COLSPAN="2">
-                  <TABLE border="0" cellspacing="0" cellpadding="0">
-                    <TR>
-                      <TD rowspan="5">
-                        <SELECT class="List_width List_height" name="inpcBPartnerId_IN" multiple="" id="reportCBPartnerId_IN"></SELECT>
-                      </TD>
-                      <TD class="List_Button_ContentCell">
-                        <TABLE border="0" cellspacing="0" cellpadding="0">
-                          <TR>
-                            <TD>
-                              <A class="List_Button_TopLink" href="#"
-                                onclick="openMultiSearch(null, null, '../info/BusinessPartnerMultiple_FS.html', 'SELECTOR_BUSINESS', false, 'frmMain', 'inpcBPartnerId_IN');return false;"
-                                onfocus="this.className='List_Button_TopLink_hover'; window.status='Add'; return true;"
-                                onblur="this.className='List_Button_TopLink'; window.status=''; return true;"
-                                onkeypress="this.className='List_Button_TopLink_active'; return true;"
-                                onkeyup="this.className='List_Button_TopLink_hover'; return true;">
-                                <table class="List_Button_Top"
-                                  onmousedown="this.className='List_Button_Top_active'; return true;"
-                                  onmouseup="this.className='List_Button_Top'; return true;"
-                                  onmouseover="this.className='List_Button_Top_hover'; window.status='Add'; return true;"
-                                  onmouseout="this.className='List_Button_Top'; window.status=''; return true;">
-                                  <tr>
-                                    <td class="List_Button_Top_bg">
-                                      <IMG class="List_Button_Icon List_Button_Icon_Add" src="../../../../../web/images/blank.gif" alt="Add" title="Add"/>
-                                    </td>
-                                  </tr>
-                                </table>
-                              </A>
-                            </TD>
-                          </TR>
-                          <TR>
-                            <TD class="List_Button_Separator">
-                            </TD>
-                          </TR>
-                          <TR>
-                            <TD>
-                              <A class="List_Button_MiddleLink" href="#"
-                                onclick="eliminarElementosList(document.frmMain.inpcBPartnerId_IN);return false;"
-                                onfocus="this.className='List_Button_MiddleLink_hover'; window.status='Delete selected elements'; return true;"
-                                onblur="this.className='List_Button_MiddleLink'; window.status=''; return true;"
-                                onkeypress="this.className='List_Button_MiddleLink_active'; return true;"
-                                onkeyup="this.className='List_Button_MiddleLink_hover'; return true;">
-                                <table class="List_Button_Middle"
-                                  onmousedown="this.className='List_Button_Middle_active'; return true;"
-                                  onmouseup="this.className='List_Button_Middle'; return true;"
-                                  onmouseover="this.className='List_Button_Middle_hover'; window.status='Delete selected elements'; return true;"
-                                  onmouseout="this.className='List_Button_Middle'; window.status=''; return true;">
-                                  <tr>
-                                    <td class="List_Button_Middle_bg">
-                                      <IMG class="List_Button_Icon List_Button_Icon_Delete" src="../../../../../web/images/blank.gif" alt="Delete selected elements" title="Delete selected elements"/>
-                                    </td>
-                                  </tr>
-                                </table>
-                              </A>
-                            </TD>
-                          </TR>
-                          <TR>
-                            <TD class="List_Button_Separator">
-                            </TD>
-                          </TR>
-                          <TR>
-                            <TD>
-                              <A class="List_Button_BottomLink" href="#"
-                                onclick="limpiarLista(document.frmMain.inpcBPartnerId_IN);return false;"
-                                onfocus="this.className='List_Button_BottomLink_hover'; window.status='Delete all elements'; return true;"
-                                onblur="this.className='List_Button_BottomLink'; window.status=''; return true;"
-                                onkeypress="this.className='List_Button_BottomLink_active'; return true;"
-                                onkeyup="this.className='List_Button_BottomLink_hover'; return true;">
-                                <table class="List_Button_Bottom"
-                                  onmousedown="this.className='List_Button_Bottom_active'; return true;"
-                                  onmouseup="this.className='List_Button_Bottom'; return true;"
-                                  onmouseover="this.className='List_Button_Bottom_hover'; window.status='Delete all elements'; return true;"
-                                  onmouseout="this.className='List_Button_Bottom'; window.status=''; return true;">
-                                  <tr>
-                                    <td class="List_Button_Bottom_bg">
-                                      <IMG class="List_Button_Icon List_Button_Icon_DeleteAll" src="../../../../../web/images/blank.gif" alt="Delete all elements" title="Delete all elements"/>
-                                    </td>
-                                  </tr>
-                                </table>
-                              </A>
-                            </TD>
-                          </TR>
-                        </TABLE>
-                      </TD>
-                    </TR>
-                  </TABLE>
-							  </TD>
-							  <TD class="TitleCell"></TD>
-						  	  <TD class="TitleCell">
-						  	  <SPAN id="spanCol2" class="LabelText" name="inpLabelColumn2">xx7</SPAN> - </TD>
-                              <TD class="TitleCell">
-                              <INPUT dojoType="openbravo:RealNumberTextbox" class="required TextBox_btn_OneCell_width" greaterThan="paramColumn1" lowerThan="paramColumn3" type="text" name="inpColumn2" id="paramColumn2" maxlength="4" size=4 onchange="columnChange();" value="xxx7"  width="4"/>
-							  <SCRIPT>djConfig.searchIds.push("paramColumn2");</SCRIPT></TD></TR>
-
-						    <TR>
-							  <TD class="TitleCell"></TD>
-							  <TD class="TitleCell"></TD>
-						      <TD class="TitleCell">
-						  	  <SPAN class="LabelText" id="spanCol3" name="inpLabelColumn3">xx7</SPAN> - </TD>
-							 <TD class="TitleCell">
-							  <INPUT dojoType="openbravo:RealNumberTextbox" greaterThan="paramColumn2" lowerThan="paramColumn4" class="required TextBox_btn_OneCell_width" type="text" name="inpColumn3" id="paramColumn3" maxlength="4"  size=4 onchange="columnChange();" value="xxx7" width="4"/>
-							  <SCRIPT>djConfig.searchIds.push("paramColumn3");</SCRIPT></TD></TR>
-
-						    <TR>
-							  <TD class="TitleCell"></TD>
-							  <TD class="TitleCell"></TD>
-						      <TD class="TitleCell">
-						  	  <SPAN class="LabelText" id="spanCol4" name="inpLabelColumn4">xx7</SPAN> - </TD>
-							  <TD class="TitleCell">
-							  <INPUT dojoType="openbravo:RealNumberTextbox" greaterThan="paramColumn3" class="required TextBox_btn_OneCell_width" type="text" name="inpColumn4" id="paramColumn4" maxlength="4"  size=4 onchange="columnChange();" value="xxx7" width="4"/>
-							  <SCRIPT>djConfig.searchIds.push("paramColumn4");</SCRIPT></TD></TR>
-
-						    <TR>
-							  <TD class="TitleCell"></TD>
-							  <TD class="TitleCell"></TD>
-							  <TD class="TitleCell"></TD>
-							  <TD class="TitleCell"></TD>
-						      <TD class="TitleCell">&gt; 
-						      <SPAN class="LabelText" id="spanCol5" name="inpLabelColumn5">xx7</SPAN></TD>
-							  <TD class="TitleCell"></TD></TR>
+                <tr>
+                  <TD class="TitleCell"> <SPAN class="LabelText">Organization</SPAN></TD>
+                  <TD class="Combo_ContentCell"> 
+                    <SELECT  name="inpOrg" id="inpOrg" class="ComboKey Combo_OneCell_width" required="true">
+                    <OPTION value=""> <DIV id="reportAD_ORGID"></DIV></OPTION>
+                  </SELECT></TD>
+							    <TD class="TitleCell"></TD>
+							    <TD class="TitleCell"></TD>
+                  <TD class="TitleCell" align="center"><SPAN class="LabelText">Date Ranges</SPAN></TD>
+                  <TD class="TitleCell"></TD>
+                </tr>
+                <TR>
+                  <TD class="TitleCell"> <SPAN class="LabelText">Receivable</SPAN></TD>
+                  <TD class="Radio_Check_ContentCell"> <INPUT type="radio" name="inpReceipt" value="Y" checked="" id="paramReceipt"></INPUT> </TD>
+                  <TD class="TitleCell"> <SPAN class="LabelText">Payable</SPAN></TD>
+                  <TD class="Radio_Check_ContentCell"> <INPUT type="radio" name="inpReceipt" value="N" checked="" id="paramPayable"></INPUT></TD>
+                  <TD class="TitleCell">
+                    <INPUT dojotype="openbravo:RealNumberTextbox" type="hidden" name="inpColumn0" id="paramColumn0" value="0" />
+							      <SCRIPT>djConfig.searchIds.push("paramColumn0");</SCRIPT>
+                    <SPAN class="LabelText">0</SPAN> - </TD>
+							    <TD class="TitleCell">
+							      <INPUT dojotype="openbravo:RealNumberTextbox" class="required TextBox_btn_OneCell_width" greaterThan="paramColumn0" type="text" name="inpColumn1" id="paramColumn1" maxlength="4" size=4 onchange="columnChange();" value="xxx7" width="4"/>
+							      <SCRIPT>djConfig.searchIds.push("paramColumn1");</SCRIPT></TD></TR>
+
+						  	<TR>
+                  <TD class="TitleCell"><SPAN class="LabelText">
+								    Business Partners
+                  </SPAN></TD>
+							    <TD ROWSPAN="3" COLSPAN="2">
+                  <TABLE border="0" cellspacing="0" cellpadding="0">
+                    <TR>
+                      <TD rowspan="5">
+                        <SELECT class="List_width List_height" name="inpcBPartnerId_IN" multiple="" id="reportCBPartnerId_IN"></SELECT>
+                      </TD>
+                      <TD class="List_Button_ContentCell">
+                        <TABLE border="0" cellspacing="0" cellpadding="0">
+                          <TR>
+                            <TD>
+                              <A class="List_Button_TopLink" href="#"
+                                onclick="openMultiSearch(null, null, '../info/BusinessPartnerMultiple_FS.html', 'SELECTOR_BUSINESS', false, 'frmMain', 'inpcBPartnerId_IN');return false;"
+                                onfocus="this.className='List_Button_TopLink_hover'; window.status='Add'; return true;"
+                                onblur="this.className='List_Button_TopLink'; window.status=''; return true;"
+                                onkeypress="this.className='List_Button_TopLink_active'; return true;"
+                                onkeyup="this.className='List_Button_TopLink_hover'; return true;">
+                                <table class="List_Button_Top"
+                                  onmousedown="this.className='List_Button_Top_active'; return true;"
+                                  onmouseup="this.className='List_Button_Top'; return true;"
+                                  onmouseover="this.className='List_Button_Top_hover'; window.status='Add'; return true;"
+                                  onmouseout="this.className='List_Button_Top'; window.status=''; return true;">
+                                  <tr>
+                                    <td class="List_Button_Top_bg">
+                                      <IMG class="List_Button_Icon List_Button_Icon_Add" src="../../../../../web/images/blank.gif" alt="Add" title="Add"/>
+                                    </td>
+                                  </tr>
+                                </table>
+                              </A>
+                            </TD>
+                          </TR>
+                          <TR>
+                            <TD class="List_Button_Separator">
+                            </TD>
+                          </TR>
+                          <TR>
+                            <TD>
+                              <A class="List_Button_MiddleLink" href="#"
+                                onclick="eliminarElementosList(document.frmMain.inpcBPartnerId_IN);return false;"
+                                onfocus="this.className='List_Button_MiddleLink_hover'; window.status='Delete selected elements'; return true;"
+                                onblur="this.className='List_Button_MiddleLink'; window.status=''; return true;"
+                                onkeypress="this.className='List_Button_MiddleLink_active'; return true;"
+                                onkeyup="this.className='List_Button_MiddleLink_hover'; return true;">
+                                <table class="List_Button_Middle"
+                                  onmousedown="this.className='List_Button_Middle_active'; return true;"
+                                  onmouseup="this.className='List_Button_Middle'; return true;"
+                                  onmouseover="this.className='List_Button_Middle_hover'; window.status='Delete selected elements'; return true;"
+                                  onmouseout="this.className='List_Button_Middle'; window.status=''; return true;">
+                                  <tr>
+                                    <td class="List_Button_Middle_bg">
+                                      <IMG class="List_Button_Icon List_Button_Icon_Delete" src="../../../../../web/images/blank.gif" alt="Delete selected elements" title="Delete selected elements"/>
+                                    </td>
+                                  </tr>
+                                </table>
+                              </A>
+                            </TD>
+                          </TR>
+                          <TR>
+                            <TD class="List_Button_Separator">
+                            </TD>
+                          </TR>
+                          <TR>
+                            <TD>
+                              <A class="List_Button_BottomLink" href="#"
+                                onclick="limpiarLista(document.frmMain.inpcBPartnerId_IN);return false;"
+                                onfocus="this.className='List_Button_BottomLink_hover'; window.status='Delete all elements'; return true;"
+                                onblur="this.className='List_Button_BottomLink'; window.status=''; return true;"
+                                onkeypress="this.className='List_Button_BottomLink_active'; return true;"
+                                onkeyup="this.className='List_Button_BottomLink_hover'; return true;">
+                                <table class="List_Button_Bottom"
+                                  onmousedown="this.className='List_Button_Bottom_active'; return true;"
+                                  onmouseup="this.className='List_Button_Bottom'; return true;"
+                                  onmouseover="this.className='List_Button_Bottom_hover'; window.status='Delete all elements'; return true;"
+                                  onmouseout="this.className='List_Button_Bottom'; window.status=''; return true;">
+                                  <tr>
+                                    <td class="List_Button_Bottom_bg">
+                                      <IMG class="List_Button_Icon List_Button_Icon_DeleteAll" src="../../../../../web/images/blank.gif" alt="Delete all elements" title="Delete all elements"/>
+                                    </td>
+                                  </tr>
+                                </table>
+                              </A>
+                            </TD>
+                          </TR>
+                        </TABLE>
+                      </TD>
+                    </TR>
+                  </TABLE>
+							  </TD>
+							  <TD class="TitleCell"></TD>
+						  	  <TD class="TitleCell">
+						  	  <SPAN id="spanCol2" class="LabelText" name="inpLabelColumn2">xx7</SPAN> - </TD>
+                              <TD class="TitleCell">
+                              <INPUT dojoType="openbravo:RealNumberTextbox" class="required TextBox_btn_OneCell_width" greaterThan="paramColumn1" lowerThan="paramColumn3" type="text" name="inpColumn2" id="paramColumn2" maxlength="4" size=4 onchange="columnChange();" value="xxx7"  width="4"/>
+							  <SCRIPT>djConfig.searchIds.push("paramColumn2");</SCRIPT></TD></TR>
+
+						    <TR>
+							  <TD class="TitleCell"></TD>
+							  <TD class="TitleCell"></TD>
+						      <TD class="TitleCell">
+						  	  <SPAN class="LabelText" id="spanCol3" name="inpLabelColumn3">xx7</SPAN> - </TD>
+							 <TD class="TitleCell">
+							  <INPUT dojoType="openbravo:RealNumberTextbox" greaterThan="paramColumn2" lowerThan="paramColumn4" class="required TextBox_btn_OneCell_width" type="text" name="inpColumn3" id="paramColumn3" maxlength="4"  size=4 onchange="columnChange();" value="xxx7" width="4"/>
+							  <SCRIPT>djConfig.searchIds.push("paramColumn3");</SCRIPT></TD></TR>
+
+						    <TR>
+							  <TD class="TitleCell"></TD>
+							  <TD class="TitleCell"></TD>
+						      <TD class="TitleCell">
+						  	  <SPAN class="LabelText" id="spanCol4" name="inpLabelColumn4">xx7</SPAN> - </TD>
+							  <TD class="TitleCell">
+							  <INPUT dojoType="openbravo:RealNumberTextbox" greaterThan="paramColumn3" class="required TextBox_btn_OneCell_width" type="text" name="inpColumn4" id="paramColumn4" maxlength="4"  size=4 onchange="columnChange();" value="xxx7" width="4"/>
+							  <SCRIPT>djConfig.searchIds.push("paramColumn4");</SCRIPT></TD></TR>
+
+						    <TR>
+							  <TD class="TitleCell"></TD>
+							  <TD class="TitleCell"></TD>
+							  <TD class="TitleCell"></TD>
+							  <TD class="TitleCell"></TD>
+						      <TD class="TitleCell">&gt; 
+						      <SPAN class="LabelText" id="spanCol5" name="inpLabelColumn5">xx7</SPAN></TD>
+							  <TD class="TitleCell"></TD></TR>
                   <TR>
                     <td colspan="6">
                       <table class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
@@ -459,67 +459,67 @@
                 <br>
                 <DIV align="center" id="sectionDocType">
 					      <TABLE width="95%" border="1" class="DataGrid_Header_Table DataGrid_Body_Table">
-					        <TR class="DataGrid_Body_Row">
-					          <TH class="DataGrid_Header_Cell" width="35%">Business partner</TH>
-					          <TH class="DataGrid_Header_Cell" width="9%" id="paramTitleColumn0">Previous</TH>
-					          <TH class="DataGrid_Header_Cell" width="9%" id="paramTitleColumn1">xx0-10</TH>
-					          <TH class="DataGrid_Header_Cell" width="9%" id="paramTitleColumn2">xx11-20</TH>
-					          <TH class="DataGrid_Header_Cell" width="9%" id="paramTitleColumn3">xx21-30</TH>
-					          <TH class="DataGrid_Header_Cell" width="9%" id="paramTitleColumn4">xx31-60</TH>
-					          <TH class="DataGrid_Header_Cell" width="9%" id="paramTitleColumn5">xx60</TH>
-					          <TH class="DataGrid_Header_Cell" width="11%" >Total</TH>
-					        </TR>
-					        
-					        <DIV id="sectionDetail">
-					        <TR class="DataGrid_Body_Row">
-					        <TD class="DataGrid_Body_Cell" width="35%" id="fieldBpartner">xxGoofy</TD>
-									<TD class="DataGrid_Body_Cell" width="9%">
-									  <A href="#" onclick="document.frmMain.paramDateTo.value=document.frmMain.paramDateFromPrevious.value;submitCommandFormParameter('DIRECT', document.frmMain.inpBpartnerId, xx, false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idCellCol0">
-										<span title="xx" id="fieldZero">xx100</span></A></TD>
-							        <TD class="DataGrid_Body_Cell" width="9%">
-							          <A href="#" onclick="document.frmMain.inpDateFrom.value=document.frmMain.paramDateFromCol1.value;document.frmMain.inpDateTo.value=document.frmMain.paramDateToCol1.value;submitCommandFormParameter('DIRECT', document.frmMain.inpBpartnerId, xx, false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idCellCol1">
-							            <span title="xx" id="fieldOne">xx100</span></A></TD>
-							        <TD class="DataGrid_Body_Cell" width="9%">
-							          <A href="#" onclick="document.frmMain.inpDateFrom.value=document.frmMain.paramDateFromCol2.value;document.frmMain.inpDateTo.value=document.frmMain.paramDateToCol2.value;submitCommandFormParameter('DIRECT', document.frmMain.inpBpartnerId, xx, false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idCellCol2">
-							            <span title="xx" id="fieldTwo">xx100</span></A></TD>
-							        <TD class="DataGrid_Body_Cell" width="9%" >
-							          <A href="#" onclick="document.frmMain.inpDateFrom.value=document.frmMain.paramDateFromCol3.value;document.frmMain.inpDateTo.value=document.frmMain.paramDateToCol3.value;submitCommandFormParameter('DIRECT', document.frmMain.inpBpartnerId, xx, false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idCellCol3">
-							            <span title="xx" id="fieldThree">xx100</span></A></TD>
-							        <TD class="DataGrid_Body_Cell" width="9%" >
-							          <A href="#" onclick="document.frmMain.inpDateFrom.value=document.frmMain.paramDateFromCol4.value;document.frmMain.inpDateTo.value=document.frmMain.paramDateToCol4.value;submitCommandFormParameter('DIRECT', document.frmMain.inpBpartnerId, xx, false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idCellCol4">
-							            <span title="xx" id="fieldFour">xx100</span></A></TD>
-							
-									<TD class="DataGrid_Body_Cell" width="9%" ><A href="#" onclick="document.frmMain.paramDateFrom.value=document.frmMain.paramDateFromCol5.value;submitCommandFormParameter('DIRECT', document.frmMain.inpBpartnerId, xx, false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idCellCol5">
-									  <span id="fieldFive" title="xx">xx100</span></A></TD>
-									<TD class="DataGrid_Body_Cell" width="11%" >
-									  <A href="#" onclick="submitCommandFormParameter('DIRECT', document.frmMain.inpBpartnerId, xx, false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idCellColT">
-										<span id="fieldTotal" title="xx">xx100</span></A></TD>
-							  </TR>
-							</div>
-			        <TR class="DataGrid_Body_Row">
-			          <TH class="DataGrid_Header_Cell" width="35%"  id="fieldSumBpartner">Total</TH>
-			          <TH class="DataGrid_Header_Cell" width="9%">
-			            <A href="#" onclick="document.frmMain.paramDateTo.value=document.frmMain.paramDateFromPrevious.value;document.frmMain.inpBpartnerId.value='';submitCommandForm('DIRECT', false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idTotalCol0">
-			              <span id="fieldSumZero" title="xx">xxTot100</SPAN></A></TH>
-			          <TH class="DataGrid_Header_Cell" width="9%" >
-			            <A href="#" onclick="document.frmMain.paramDateFrom.value=document.frmMain.paramDateFromCol2.value;document.frmMain.paramDateTo.value=document.frmMain.paramDateToCol2.value;document.frmMain.inpBpartnerId.value='';submitCommandForm('DIRECT', false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idTotalCol1">
-			              <span id="fieldSumOne" title="xx">xxTot100</SPAN></A></TH>
-			          <TH class="DataGrid_Header_Cell" width="9%" >
-			            <A href="#" onclick="document.frmMain.paramDateFrom.value=document.frmMain.paramDateFromCol2.value;document.frmMain.paramDateTo.value=document.frmMain.paramDateToCol2.value;document.frmMain.inpBpartnerId.value='';submitCommandForm('DIRECT', false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idTotalCol2">
-			              <span id="fieldSumTwo" title="xx">xxTot100</span></A></TH>
-			          <TH class="DataGrid_Header_Cell" width="9%" >
-			            <A href="#" onclick="document.frmMain.paramDateFrom.value=document.frmMain.paramDateFromCol3.value;document.frmMain.paramDateTo.value=document.frmMain.paramDateToCol3.value;document.frmMain.inpBpartnerId.value='';submitCommandForm('DIRECT', false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idTotalCol3">
-			              <span id="fieldSumThree" title="xx">xxTot100</span></A></TH>
-			          <TH class="DataGrid_Header_Cell" width="9%" >
-			            <A href="#" onclick="document.frmMain.paramDateFrom.value=document.frmMain.paramDateFromCol4.value;document.frmMain.paramDateTo.value=document.frmMain.paramDateToCol4.value;document.frmMain.inpBpartnerId.value='';submitCommandForm('DIRECT', false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idTotalCol4">
-			              <span id="fieldSumFour" title="xx">xxTot100</span></A></TH>
-			          <TH class="DataGrid_Header_Cell" width="9%" >
-			            <A href="#" onclick="document.frmMain.paramDateFrom.value=document.frmMain.paramDateFromCol5.value;document.frmMain.inpBpartnerId.value='';submitCommandForm('DIRECT', false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idTotalCol5">
-			              <span id="fieldSumFive" title="xx">xxTot100</span></A></TH>
-			          <TH class="DataGrid_Header_Cell" width="11%">
-			            <A href="#" onclick="document.frmMain.inpBpartnerId.value='';submitCommandForm('DIRECT', false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idTotalCol5">
-			              <span title="xx" id="fieldSumTotal">xxTot100</span></A></TH>
-			        </TR>
+					        <TR class="DataGrid_Body_Row">
+					          <TH class="DataGrid_Header_Cell" width="35%">Business partner</TH>
+					          <TH class="DataGrid_Header_Cell" width="9%" id="paramTitleColumn0">Previous</TH>
+					          <TH class="DataGrid_Header_Cell" width="9%" id="paramTitleColumn1">xx0-10</TH>
+					          <TH class="DataGrid_Header_Cell" width="9%" id="paramTitleColumn2">xx11-20</TH>
+					          <TH class="DataGrid_Header_Cell" width="9%" id="paramTitleColumn3">xx21-30</TH>
+					          <TH class="DataGrid_Header_Cell" width="9%" id="paramTitleColumn4">xx31-60</TH>
+					          <TH class="DataGrid_Header_Cell" width="9%" id="paramTitleColumn5">xx60</TH>
+					          <TH class="DataGrid_Header_Cell" width="11%" >Total</TH>
+					        </TR>
+					        
+					        <DIV id="sectionDetail">
+					        <TR class="DataGrid_Body_Row">
+					        <TD class="DataGrid_Body_Cell" width="35%" id="fieldBpartner">xxGoofy</TD>
+									<TD class="DataGrid_Body_Cell" width="9%">
+									  <A href="#" onclick="document.frmMain.paramDateTo.value=document.frmMain.paramDateFromPrevious.value;submitCommandFormParameter('DIRECT', document.frmMain.inpBpartnerId, xx, false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idCellCol0">
+										<span title="xx" id="fieldZero">xx100</span></A></TD>
+							        <TD class="DataGrid_Body_Cell" width="9%">
+							          <A href="#" onclick="document.frmMain.inpDateFrom.value=document.frmMain.paramDateFromCol1.value;document.frmMain.inpDateTo.value=document.frmMain.paramDateToCol1.value;submitCommandFormParameter('DIRECT', document.frmMain.inpBpartnerId, xx, false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idCellCol1">
+							            <span title="xx" id="fieldOne">xx100</span></A></TD>
+							        <TD class="DataGrid_Body_Cell" width="9%">
+							          <A href="#" onclick="document.frmMain.inpDateFrom.value=document.frmMain.paramDateFromCol2.value;document.frmMain.inpDateTo.value=document.frmMain.paramDateToCol2.value;submitCommandFormParameter('DIRECT', document.frmMain.inpBpartnerId, xx, false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idCellCol2">
+							            <span title="xx" id="fieldTwo">xx100</span></A></TD>
+							        <TD class="DataGrid_Body_Cell" width="9%" >
+							          <A href="#" onclick="document.frmMain.inpDateFrom.value=document.frmMain.paramDateFromCol3.value;document.frmMain.inpDateTo.value=document.frmMain.paramDateToCol3.value;submitCommandFormParameter('DIRECT', document.frmMain.inpBpartnerId, xx, false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idCellCol3">
+							            <span title="xx" id="fieldThree">xx100</span></A></TD>
+							        <TD class="DataGrid_Body_Cell" width="9%" >
+							          <A href="#" onclick="document.frmMain.inpDateFrom.value=document.frmMain.paramDateFromCol4.value;document.frmMain.inpDateTo.value=document.frmMain.paramDateToCol4.value;submitCommandFormParameter('DIRECT', document.frmMain.inpBpartnerId, xx, false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idCellCol4">
+							            <span title="xx" id="fieldFour">xx100</span></A></TD>
+							
+									<TD class="DataGrid_Body_Cell" width="9%" ><A href="#" onclick="document.frmMain.paramDateFrom.value=document.frmMain.paramDateFromCol5.value;submitCommandFormParameter('DIRECT', document.frmMain.inpBpartnerId, xx, false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idCellCol5">
+									  <span id="fieldFive" title="xx">xx100</span></A></TD>
+									<TD class="DataGrid_Body_Cell" width="11%" >
+									  <A href="#" onclick="submitCommandFormParameter('DIRECT', document.frmMain.inpBpartnerId, xx, false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idCellColT">
+										<span id="fieldTotal" title="xx">xx100</span></A></TD>
+							  </TR>
+							</div>
+			        <TR class="DataGrid_Body_Row">
+			          <TH class="DataGrid_Header_Cell" width="35%"  id="fieldSumBpartner">Total</TH>
+			          <TH class="DataGrid_Header_Cell" width="9%">
+			            <A href="#" onclick="document.frmMain.paramDateTo.value=document.frmMain.paramDateFromPrevious.value;document.frmMain.inpBpartnerId.value='';submitCommandForm('DIRECT', false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idTotalCol0">
+			              <span id="fieldSumZero" title="xx">xxTot100</SPAN></A></TH>
+			          <TH class="DataGrid_Header_Cell" width="9%" >
+			            <A href="#" onclick="document.frmMain.paramDateFrom.value=document.frmMain.paramDateFromCol2.value;document.frmMain.paramDateTo.value=document.frmMain.paramDateToCol2.value;document.frmMain.inpBpartnerId.value='';submitCommandForm('DIRECT', false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idTotalCol1">
+			              <span id="fieldSumOne" title="xx">xxTot100</SPAN></A></TH>
+			          <TH class="DataGrid_Header_Cell" width="9%" >
+			            <A href="#" onclick="document.frmMain.paramDateFrom.value=document.frmMain.paramDateFromCol2.value;document.frmMain.paramDateTo.value=document.frmMain.paramDateToCol2.value;document.frmMain.inpBpartnerId.value='';submitCommandForm('DIRECT', false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idTotalCol2">
+			              <span id="fieldSumTwo" title="xx">xxTot100</span></A></TH>
+			          <TH class="DataGrid_Header_Cell" width="9%" >
+			            <A href="#" onclick="document.frmMain.paramDateFrom.value=document.frmMain.paramDateFromCol3.value;document.frmMain.paramDateTo.value=document.frmMain.paramDateToCol3.value;document.frmMain.inpBpartnerId.value='';submitCommandForm('DIRECT', false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idTotalCol3">
+			              <span id="fieldSumThree" title="xx">xxTot100</span></A></TH>
+			          <TH class="DataGrid_Header_Cell" width="9%" >
+			            <A href="#" onclick="document.frmMain.paramDateFrom.value=document.frmMain.paramDateFromCol4.value;document.frmMain.paramDateTo.value=document.frmMain.paramDateToCol4.value;document.frmMain.inpBpartnerId.value='';submitCommandForm('DIRECT', false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idTotalCol4">
+			              <span id="fieldSumFour" title="xx">xxTot100</span></A></TH>
+			          <TH class="DataGrid_Header_Cell" width="9%" >
+			            <A href="#" onclick="document.frmMain.paramDateFrom.value=document.frmMain.paramDateFromCol5.value;document.frmMain.inpBpartnerId.value='';submitCommandForm('DIRECT', false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idTotalCol5">
+			              <span id="fieldSumFive" title="xx">xxTot100</span></A></TH>
+			          <TH class="DataGrid_Header_Cell" width="11%">
+			            <A href="#" onclick="document.frmMain.inpBpartnerId.value='';submitCommandForm('DIRECT', false, document.frmMain, 'ReportDebtPayment.html', '_self', false, true);return false;" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="idTotalCol5">
+			              <span title="xx" id="fieldSumTotal">xxTot100</span></A></TH>
+			        </TR>
 			    </table>
 			  </div>
                       <!-- USER CONTROLS -->
@@ -545,17 +545,17 @@
       </td>
     </tr>
   </table>
-	<INPUT type="hidden" id="paramDateFromPrevious" name="dateFromPrevious" value=""></INPUT>
-	<INPUT type="hidden" id="paramDateFromCol1" name="dateFromCol1" value=""></INPUT>
-	<INPUT type="hidden" id="paramDateToCol1" name="dateToCol1" value=""></INPUT>
-	<INPUT type="hidden" id="paramDateFromCol2" name="dateFromCol2" value=""></INPUT>
-	<INPUT type="hidden" id="paramDateToCol2" name="dateToCol2" value=""></INPUT>
-	<INPUT type="hidden" id="paramDateFromCol3" name="dateFromCol3" value=""></INPUT>
-	<INPUT type="hidden" id="paramDateToCol3" name="dateToCol3" value=""></INPUT>
-	<INPUT type="hidden" id="paramDateFromCol4" name="dateFromCol4" value=""></INPUT>
-	<INPUT type="hidden" id="paramDateToCol4" name="dateToCol4" value=""></INPUT>
-	<INPUT type="hidden" id="paramDateFromCol5" name="dateFromCol5" value=""></INPUT>
-	<INPUT type="hidden" id="paramDateToCol5" name="dateToCol5" value=""></INPUT>
+	<INPUT type="hidden" id="paramDateFromPrevious" name="dateFromPrevious" value=""></INPUT>
+	<INPUT type="hidden" id="paramDateFromCol1" name="dateFromCol1" value=""></INPUT>
+	<INPUT type="hidden" id="paramDateToCol1" name="dateToCol1" value=""></INPUT>
+	<INPUT type="hidden" id="paramDateFromCol2" name="dateFromCol2" value=""></INPUT>
+	<INPUT type="hidden" id="paramDateToCol2" name="dateToCol2" value=""></INPUT>
+	<INPUT type="hidden" id="paramDateFromCol3" name="dateFromCol3" value=""></INPUT>
+	<INPUT type="hidden" id="paramDateToCol3" name="dateToCol3" value=""></INPUT>
+	<INPUT type="hidden" id="paramDateFromCol4" name="dateFromCol4" value=""></INPUT>
+	<INPUT type="hidden" id="paramDateToCol4" name="dateToCol4" value=""></INPUT>
+	<INPUT type="hidden" id="paramDateFromCol5" name="dateFromCol5" value=""></INPUT>
+	<INPUT type="hidden" id="paramDateToCol5" name="dateToCol5" value=""></INPUT>
   </form>
 </body>
 </html>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.xml	Tue Apr 22 09:17:07 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance.xml	Tue Apr 22 09:19:30 2008 +0000
@@ -35,82 +35,82 @@
   <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="parameterConstantReceipt" name="constantReceipt" default="isReceipt"/>
-
-
-  <PARAMETER id="parameterConstantReceipt" name="constantReceipt" default="Y"/>
-  <PARAMETER id="paramReceipt" name="receipt" boolean="checked" withId="parameterConstantReceipt"/>
-  <PARAMETER id="parameterConstantPayable" name="constantPayable" default="N"/>
-  <PARAMETER id="paramPayable" name="payable" boolean="checked" withId="parameterConstantPayable"/>
-
-  <PARAMETER id="paramColumn1" name="column1" attribute="value"/>
-  <PARAMETER id="paramColumn2" name="column2" attribute="value"/>
-  <PARAMETER id="paramColumn3" name="column3" attribute="value"/>
-  <PARAMETER id="paramColumn4" name="column4" attribute="value"/>
-  <PARAMETER id="paramTitleColumn1" name="titleColumn1" default=""/>
-  <PARAMETER id="paramTitleColumn2" name="titleColumn2" default=""/>
-  <PARAMETER id="paramTitleColumn3" name="titleColumn3" default=""/>
-  <PARAMETER id="paramTitleColumn4" name="titleColumn4" default=""/>
-  <PARAMETER id="paramTitleColumn5" name="titleColumn5" default=""/>
-
-  <PARAMETER id="paramDateFromPrevious" name="dateFromPrevious" attribute="value"/>
-  <PARAMETER id="paramDateFromCol1" name="dateFromCol1" attribute="value"/>
-  <PARAMETER id="paramDateToCol1" name="dateToCol1" attribute="value"/>
-  <PARAMETER id="paramDateFromCol2" name="dateFromCol2" attribute="value"/>
-  <PARAMETER id="paramDateToCol2" name="dateToCol2" attribute="value"/>
-  <PARAMETER id="paramDateFromCol3" name="dateFromCol3" attribute="value"/>
-  <PARAMETER id="paramDateToCol3" name="dateToCol3" attribute="value"/>
-  <PARAMETER id="paramDateFromCol4" name="dateFromCol4" attribute="value"/>
-  <PARAMETER id="paramDateToCol4" name="dateToCol4" attribute="value"/>
-  <PARAMETER id="paramDateFromCol5" name="dateFromCol5" attribute="value"/>
-  <PARAMETER id="paramDateToCol5" name="dateToCol5" default="" attribute="value"/>
-
-  <SUBREPORT id="reportCBPartnerId_IN" name="reportCBPartnerId_IN" report="org/openbravo/erpCommon/reference/List">
-    <ARGUMENT name="parameterListSelected"/>
-  </SUBREPORT>
-
-  <PARAMETER id="paramAD_ORG_Id" name="paramAD_ORG_Id" attribute="value"/>
-  <SUBREPORT id="reportAD_ORGID" name="reportAD_ORGID" report="org/openbravo/erpCommon/reference/List">
-    <ARGUMENT name="parameterListSelected" withId="paramAD_ORG_Id"/>
-  </SUBREPORT>
-
+  <PARAMETER id="parameterConstantReceipt" name="constantReceipt" default="isReceipt"/>
+
+
+  <PARAMETER id="parameterConstantReceipt" name="constantReceipt" default="Y"/>
+  <PARAMETER id="paramReceipt" name="receipt" boolean="checked" withId="parameterConstantReceipt"/>
+  <PARAMETER id="parameterConstantPayable" name="constantPayable" default="N"/>
+  <PARAMETER id="paramPayable" name="payable" boolean="checked" withId="parameterConstantPayable"/>
+
+  <PARAMETER id="paramColumn1" name="column1" attribute="value"/>
+  <PARAMETER id="paramColumn2" name="column2" attribute="value"/>
+  <PARAMETER id="paramColumn3" name="column3" attribute="value"/>
+  <PARAMETER id="paramColumn4" name="column4" attribute="value"/>
+  <PARAMETER id="paramTitleColumn1" name="titleColumn1" default=""/>
+  <PARAMETER id="paramTitleColumn2" name="titleColumn2" default=""/>
+  <PARAMETER id="paramTitleColumn3" name="titleColumn3" default=""/>
+  <PARAMETER id="paramTitleColumn4" name="titleColumn4" default=""/>
+  <PARAMETER id="paramTitleColumn5" name="titleColumn5" default=""/>
+
+  <PARAMETER id="paramDateFromPrevious" name="dateFromPrevious" attribute="value"/>
+  <PARAMETER id="paramDateFromCol1" name="dateFromCol1" attribute="value"/>
+  <PARAMETER id="paramDateToCol1" name="dateToCol1" attribute="value"/>
+  <PARAMETER id="paramDateFromCol2" name="dateFromCol2" attribute="value"/>
+  <PARAMETER id="paramDateToCol2" name="dateToCol2" attribute="value"/>
+  <PARAMETER id="paramDateFromCol3" name="dateFromCol3" attribute="value"/>
+  <PARAMETER id="paramDateToCol3" name="dateToCol3" attribute="value"/>
+  <PARAMETER id="paramDateFromCol4" name="dateFromCol4" attribute="value"/>
+  <PARAMETER id="paramDateToCol4" name="dateToCol4" attribute="value"/>
+  <PARAMETER id="paramDateFromCol5" name="dateFromCol5" attribute="value"/>
+  <PARAMETER id="paramDateToCol5" name="dateToCol5" default="" attribute="value"/>
+
+  <SUBREPORT id="reportCBPartnerId_IN" name="reportCBPartnerId_IN" report="org/openbravo/erpCommon/reference/List">
+    <ARGUMENT name="parameterListSelected"/>
+  </SUBREPORT>
+
+  <PARAMETER id="paramAD_ORG_Id" name="paramAD_ORG_Id" attribute="value"/>
+  <SUBREPORT id="reportAD_ORGID" name="reportAD_ORGID" report="org/openbravo/erpCommon/reference/List">
+    <ARGUMENT name="parameterListSelected" withId="paramAD_ORG_Id"/>
+  </SUBREPORT>
+
   <structure name="structure1">
     <FIELD id="fieldBpartner">bpartner</FIELD>
-  	<FIELD id="fieldZero" format="euroInform">zero</FIELD>
-      <FIELD id="fieldZero" format="euroInform" attribute="title" replace="xx">zero</FIELD>
-    <FIELD id="fieldOne" format="euroInform">one</FIELD>
-      <FIELD id="fieldOne" format="euroInform" attribute="title" replace="xx">one</FIELD>
-    <FIELD id="fieldTwo" format="euroInform">two</FIELD>
-      <FIELD id="fieldTwo" format="euroInform" attribute="title" replace="xx">two</FIELD>
-    <FIELD id="fieldThree" format="euroInform">three</FIELD>
-      <FIELD id="fieldThree" format="euroInform" attribute="title" replace="xx">three</FIELD>
-    <FIELD id="fieldFour" format="euroInform">four</FIELD>
-      <FIELD id="fieldFour" format="euroInform" attribute="title" replace="xx">four</FIELD>
-    <FIELD id="fieldFive" format="euroInform">five</FIELD>
-      <FIELD id="fieldFive" format="euroInform" attribute="title" replace="xx">five</FIELD>
-    <FIELD id="fieldTotal" format="euroInform">total</FIELD>
-      <FIELD id="fieldTotal" format="euroInform" attribute="title" replace="xx">total</FIELD>
+  	<FIELD id="fieldZero" format="euroInform">zero</FIELD>
+      <FIELD id="fieldZero" format="euroInform" attribute="title" replace="xx">zero</FIELD>
+    <FIELD id="fieldOne" format="euroInform">one</FIELD>
+      <FIELD id="fieldOne" format="euroInform" attribute="title" replace="xx">one</FIELD>
+    <FIELD id="fieldTwo" format="euroInform">two</FIELD>
+      <FIELD id="fieldTwo" format="euroInform" attribute="title" replace="xx">two</FIELD>
+    <FIELD id="fieldThree" format="euroInform">three</FIELD>
+      <FIELD id="fieldThree" format="euroInform" attribute="title" replace="xx">three</FIELD>
+    <FIELD id="fieldFour" format="euroInform">four</FIELD>
+      <FIELD id="fieldFour" format="euroInform" attribute="title" replace="xx">four</FIELD>
+    <FIELD id="fieldFive" format="euroInform">five</FIELD>
+      <FIELD id="fieldFive" format="euroInform" attribute="title" replace="xx">five</FIELD>
+    <FIELD id="fieldTotal" format="euroInform">total</FIELD>
+      <FIELD id="fieldTotal" format="euroInform" attribute="title" replace="xx">total</FIELD>
     <FIELD id="idCellCol0" attribute="onclick" replace="xx">BPARTNER_ID</FIELD>
-    <FIELD id="idCellCol1" attribute="onclick" replace="xx">BPARTNER_ID</FIELD>
-    <FIELD id="idCellCol2" attribute="onclick" replace="xx">BPARTNER_ID</FIELD>
-    <FIELD id="idCellCol3" attribute="onclick" replace="xx">BPARTNER_ID</FIELD>
-    <FIELD id="idCellCol4" attribute="onclick" replace="xx">BPARTNER_ID</FIELD>
-    <FIELD id="idCellCol5" attribute="onclick" replace="xx">BPARTNER_ID</FIELD>
-    <FIELD id="idCellColT" attribute="onclick" replace="xx">BPARTNER_ID</FIELD>
-    <FUNCTION id="fieldSumZero" name="SUM" format="euroInform">zero</FUNCTION>
-      <FUNCTION id="fieldSumZero" attribute="title" replace="xx" format="euroInform">zero</FUNCTION>
-    <FUNCTION id="fieldSumOne" name="SUM" format="euroInform">one</FUNCTION>
-      <FUNCTION id="fieldSumOne" attribute="title" replace="xx" format="euroInform">one</FUNCTION>
-    <FUNCTION id="fieldSumTwo" name="SUM" format="euroInform">two</FUNCTION>
-      <FUNCTION id="fieldSumTwo" attribute="title" replace="xx" format="euroInform">two</FUNCTION>
-    <FUNCTION id="fieldSumThree" name="SUM" format="euroInform">three</FUNCTION>
-      <FUNCTION id="fieldSumThree" attribute="title" replace="xx" format="euroInform">three</FUNCTION>
-    <FUNCTION id="fieldSumFour" name="SUM" format="euroInform">four</FUNCTION>
-      <FUNCTION id="fieldSumFour" attribute="title" replace="xx" format="euroInform">four</FUNCTION>
-    <FUNCTION id="fieldSumFive" name="SUM" format="euroInform">five</FUNCTION>
-      <FUNCTION id="fieldSumFive" attribute="title" replace="xx" format="euroInform">five</FUNCTION>
-    <FUNCTION id="fieldSumTotal" name="SUM" format="euroInform">total</FUNCTION>
-      <FUNCTION id="fieldSumTotal" attribute="title" replace="xx" format="euroInform">total</FUNCTION>
+    <FIELD id="idCellCol1" attribute="onclick" replace="xx">BPARTNER_ID</FIELD>
+    <FIELD id="idCellCol2" attribute="onclick" replace="xx">BPARTNER_ID</FIELD>
+    <FIELD id="idCellCol3" attribute="onclick" replace="xx">BPARTNER_ID</FIELD>
+    <FIELD id="idCellCol4" attribute="onclick" replace="xx">BPARTNER_ID</FIELD>
+    <FIELD id="idCellCol5" attribute="onclick" replace="xx">BPARTNER_ID</FIELD>
+    <FIELD id="idCellColT" attribute="onclick" replace="xx">BPARTNER_ID</FIELD>
+    <FUNCTION id="fieldSumZero" name="SUM" format="euroInform">zero</FUNCTION>
+      <FUNCTION id="fieldSumZero" attribute="title" replace="xx" format="euroInform">zero</FUNCTION>
+    <FUNCTION id="fieldSumOne" name="SUM" format="euroInform">one</FUNCTION>
+      <FUNCTION id="fieldSumOne" attribute="title" replace="xx" format="euroInform">one</FUNCTION>
+    <FUNCTION id="fieldSumTwo" name="SUM" format="euroInform">two</FUNCTION>
+      <FUNCTION id="fieldSumTwo" attribute="title" replace="xx" format="euroInform">two</FUNCTION>
+    <FUNCTION id="fieldSumThree" name="SUM" format="euroInform">three</FUNCTION>
+      <FUNCTION id="fieldSumThree" attribute="title" replace="xx" format="euroInform">three</FUNCTION>
+    <FUNCTION id="fieldSumFour" name="SUM" format="euroInform">four</FUNCTION>
+      <FUNCTION id="fieldSumFour" attribute="title" replace="xx" format="euroInform">four</FUNCTION>
+    <FUNCTION id="fieldSumFive" name="SUM" format="euroInform">five</FUNCTION>
+      <FUNCTION id="fieldSumFive" attribute="title" replace="xx" format="euroInform">five</FUNCTION>
+    <FUNCTION id="fieldSumTotal" name="SUM" format="euroInform">total</FUNCTION>
+      <FUNCTION id="fieldSumTotal" attribute="title" replace="xx" format="euroInform">total</FUNCTION>
     <SECTION id="sectionDetail"/>
   </structure>
 
--- a/src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance_data.xsql	Tue Apr 22 09:17:07 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportAgingBalance_data.xsql	Tue Apr 22 09:19:30 2008 +0000
@@ -19,72 +19,72 @@
 -->
 <SqlClass name="ReportAgingBalanceData" package="org.openbravo.erpCommon.ad_reports">
   <SqlClassComment>Clase ReportAgingBalanceData</SqlClassComment>
-  <SqlMethod name="selectInitClassHeader" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT ' ' AS AD_ORG_ID, ' ' AS BPARTNER_ID, ' ' AS BPARTNER, ' ' AS ISRECEIPT, ' ' AS ZERO, ' ' AS ONE, ' ' AS TWO, ' ' AS THREE, ' ' AS FOUR, ' ' AS FIVE, ' ' AS TOTAL, ' ' AS ID, ' ' AS NAME, ' ' AS pagebreak , ' ' AS AD_TREE_ORG_ID
-      FROM DUAL
-     ]]></Sql>
-  </SqlMethod>
+  <SqlMethod name="selectInitClassHeader" type="preparedStatement" return="multiple">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+    <![CDATA[
+      SELECT ' ' AS AD_ORG_ID, ' ' AS BPARTNER_ID, ' ' AS BPARTNER, ' ' AS ISRECEIPT, ' ' AS ZERO, ' ' AS ONE, ' ' AS TWO, ' ' AS THREE, ' ' AS FOUR, ' ' AS FIVE, ' ' AS TOTAL, ' ' AS ID, ' ' AS NAME, ' ' AS pagebreak , ' ' AS AD_TREE_ORG_ID
+      FROM DUAL
+     ]]></Sql>
+  </SqlMethod>
   <SqlMethod name="select" type="preparedStatement" return="multiple">
     <SqlMethodComment>Select for relation</SqlMethodComment>
     <Sql>
     <![CDATA[
-        SELECT BPARTNER AS BPARTNER_ID, AD_COLUMN_IDENTIFIER('C_Bpartner',BPARTNER,'es_ES') AS BPARTNER, ISRECEIPT,
-        SUM(CASE(SCOPE) WHEN 0 THEN AMOUNT ELSE 0 END) AS ZERO,
-        SUM(CASE(SCOPE) WHEN 1 THEN AMOUNT ELSE 0 END) AS ONE,
-        SUM(CASE(SCOPE) WHEN 2 THEN AMOUNT ELSE 0 END) AS TWO,
-        SUM(CASE(SCOPE) WHEN 3 THEN AMOUNT ELSE 0 END) AS THREE,
-        SUM(CASE(SCOPE) WHEN 4 THEN AMOUNT ELSE 0 END) AS FOUR,
-        SUM(CASE(SCOPE) WHEN 5 THEN AMOUNT ELSE 0 END) AS FIVE,
-        SUM(AMOUNT) AS TOTAL, ? AS AD_ORG_ID
-        FROM(
-          SELECT C_BPARTNER_ID AS BPARTNER, AMOUNT, ISRECEIPT, DATEPLANNED,
-          AGING_GET_SCOPE(DATEPLANNED, ?, ?, ?, ?) AS SCOPE, C_DEBT_PAYMENT_ID
-          FROM  C_DEBT_PAYMENT
-          WHERE C_DEBT_PAYMENT_STATUS(C_SETTLEMENT_CANCEL_ID, CANCEL_PROCESSED, GENERATE_PROCESSED,ISPAID,ISVALID,C_CASHLINE_ID,C_BANKSTATEMENTLINE_ID) = 'P'
-          AND ISRECEIPT = ?
-          AND 1=1
-          AND AD_ORG_ID IN('2')
-          AND AD_CLIENT_ID IN ('1')
-          AND AD_ORG_ID IN ('1')
-          )
-        GROUP BY BPARTNER, ISRECEIPT
+        SELECT BPARTNER AS BPARTNER_ID, AD_COLUMN_IDENTIFIER('C_Bpartner',BPARTNER,'es_ES') AS BPARTNER, ISRECEIPT,
+        SUM(CASE(SCOPE) WHEN 0 THEN AMOUNT ELSE 0 END) AS ZERO,
+        SUM(CASE(SCOPE) WHEN 1 THEN AMOUNT ELSE 0 END) AS ONE,
+        SUM(CASE(SCOPE) WHEN 2 THEN AMOUNT ELSE 0 END) AS TWO,
+        SUM(CASE(SCOPE) WHEN 3 THEN AMOUNT ELSE 0 END) AS THREE,
+        SUM(CASE(SCOPE) WHEN 4 THEN AMOUNT ELSE 0 END) AS FOUR,
+        SUM(CASE(SCOPE) WHEN 5 THEN AMOUNT ELSE 0 END) AS FIVE,
+        SUM(AMOUNT) AS TOTAL, ? AS AD_ORG_ID
+        FROM(
+          SELECT C_BPARTNER_ID AS BPARTNER, AMOUNT, ISRECEIPT, DATEPLANNED,
+          AGING_GET_SCOPE(DATEPLANNED, ?, ?, ?, ?) AS SCOPE, C_DEBT_PAYMENT_ID
+          FROM  C_DEBT_PAYMENT
+          WHERE C_DEBT_PAYMENT_STATUS(C_SETTLEMENT_CANCEL_ID, CANCEL_PROCESSED, GENERATE_PROCESSED,ISPAID,ISVALID,C_CASHLINE_ID,C_BANKSTATEMENTLINE_ID) = 'P'
+          AND ISRECEIPT = ?
+          AND 1=1
+          AND AD_ORG_ID IN('2')
+          AND AD_CLIENT_ID IN ('1')
+          AND AD_ORG_ID IN ('1')
+          )
+        GROUP BY BPARTNER, ISRECEIPT
       ]]></Sql>
-    <Parameter name="orgTrx"></Parameter>
-    <Parameter name="one"></Parameter>
-    <Parameter name="two"></Parameter>
-    <Parameter name="three"></Parameter>
-    <Parameter name="four"></Parameter>
-    <Parameter name="isreceipt"></Parameter>
-    <Parameter name="cBpartnerId" optional="true" type="argument" after="AND 1=1"><![CDATA[ AND C_BPARTNER_ID IN ]]></Parameter>
-    <Parameter name="orgFamily" type="replace" optional="true" after="AD_ORG_ID IN(" text="'2'"/>
-    <Parameter name="adUserClient" type="replace" optional="true" after="AD_CLIENT_ID IN (" text="'1'"/>
-    <Parameter name="adUserOrg" type="replace" optional="true" after="AD_ORG_ID IN (" text="'1'"/>
+    <Parameter name="orgTrx"></Parameter>
+    <Parameter name="one"></Parameter>
+    <Parameter name="two"></Parameter>
+    <Parameter name="three"></Parameter>
+    <Parameter name="four"></Parameter>
+    <Parameter name="isreceipt"></Parameter>
+    <Parameter name="cBpartnerId" optional="true" type="argument" after="AND 1=1"><![CDATA[ AND C_BPARTNER_ID IN ]]></Parameter>
+    <Parameter name="orgFamily" type="replace" optional="true" after="AD_ORG_ID IN(" text="'2'"/>
+    <Parameter name="adUserClient" type="replace" optional="true" after="AD_CLIENT_ID IN (" text="'1'"/>
+    <Parameter name="adUserOrg" type="replace" optional="true" after="AD_ORG_ID IN (" text="'1'"/>
   </SqlMethod>
-  <SqlMethod name="treeOrg" type="preparedStatement" return="string">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-        SELECT AD_TREE_ORG_ID FROM AD_CLIENTINFO
-        WHERE AD_CLIENT_ID = TO_NUMBER(?)
-    </Sql>
-    <Parameter name="client"/>
-  </SqlMethod>
-  <SqlMethod name="selectCombo" type="preparedStatement" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql><![CDATA[
-        SELECT A_O.AD_ORG_ID AS ID, A_O.NAME, '' as pagebreak 
-        FROM AD_ORG A_O, AD_ROLE_ORGACCESS A_R_O, AD_ROLE R
-        WHERE A_R_O.AD_ORG_ID = A_O.AD_ORG_ID 
-        AND A_R_O.ISACTIVE = 'Y' 
-        AND A_R_O.AD_ROLE_ID = R.AD_ROLE_ID 
-        AND R.ISACTIVE = 'Y' 
-        AND A_R_O.AD_ROLE_ID = TO_NUMBER(?) 
-        ORDER BY A_O.NAME
-      ]]></Sql>
-        <Parameter name="rol"/>
-   </SqlMethod>
+  <SqlMethod name="treeOrg" type="preparedStatement" return="string">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+        SELECT AD_TREE_ORG_ID FROM AD_CLIENTINFO
+        WHERE AD_CLIENT_ID = TO_NUMBER(?)
+    </Sql>
+    <Parameter name="client"/>
+  </SqlMethod>
+  <SqlMethod name="selectCombo" type="preparedStatement" return="multiple">
+      <SqlMethodComment></SqlMethodComment>
+      <Sql><![CDATA[
+        SELECT A_O.AD_ORG_ID AS ID, A_O.NAME, '' as pagebreak 
+        FROM AD_ORG A_O, AD_ROLE_ORGACCESS A_R_O, AD_ROLE R
+        WHERE A_R_O.AD_ORG_ID = A_O.AD_ORG_ID 
+        AND A_R_O.ISACTIVE = 'Y' 
+        AND A_R_O.AD_ROLE_ID = R.AD_ROLE_ID 
+        AND R.ISACTIVE = 'Y' 
+        AND A_R_O.AD_ROLE_ID = TO_NUMBER(?) 
+        ORDER BY A_O.NAME
+      ]]></Sql>
+        <Parameter name="rol"/>
+   </SqlMethod>
   <SqlMethod name="set" type="constant" return="multiple">
       <SqlMethodComment>Create a registry</SqlMethodComment>
       <Sql></Sql>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportBankJR.jrxml	Tue Apr 22 09:17:07 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportBankJR.jrxml	Tue Apr 22 09:19:30 2008 +0000
@@ -1,195 +1,195 @@
-<?xml version="1.0" encoding="UTF-8"  ?>
-<!-- Created with iReport - A designer for JasperReports -->
-<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd">
-<jasperReport
-		 name="ReportBankJR"
-		 columnCount="1"
-		 printOrder="Vertical"
-		 orientation="Portrait"
-		 pageWidth="595"
-		 pageHeight="842"
-		 columnWidth="535"
-		 columnSpacing="0"
-		 leftMargin="30"
-		 rightMargin="30"
-		 topMargin="20"
-		 bottomMargin="20"
-		 whenNoDataType="NoPages"
-		 isTitleNewPage="false"
-		 isSummaryNewPage="false">
-	<property name="ireport.scriptlethandling" value="0" />
-	<property name="ireport.encoding" value="UTF-8" />
-	<import value="java.util.*" />
-	<import value="net.sf.jasperreports.engine.*" />
-	<import value="net.sf.jasperreports.engine.data.*" />
-
-	<style 
-		name="default"
-		isDefault="false"
-		vAlign="Middle"
-		fontName="Bitstream Vera Sans"
-		fontSize="11"
-	/>
-	<style 
-		name="Report_Title"
-		isDefault="false"
-		leftPadding="5"
-		fontName="Bitstream Vera Sans"
-		fontSize="18"
-	/>
-	<style 
-		name="Report_Subtitle"
-		isDefault="false"