Fixes bug 0004445 Clean-up related to Rpt_etiquetas done
authorAinhoa Pagola <ainhoa.pagola@openbravo.com>
Thu, 22 Jan 2009 10:44:35 +0000
changeset 2690 2d938fa5b497
parent 2689 0d2bf8f49130
child 2691 da4daa0dc851
Fixes bug 0004445 Clean-up related to Rpt_etiquetas done
lib/runtime/comm.jar
referencedata/sampledata/Accounting_Test.xml
referencedata/sampledata/BigBazaar.xml
src-core/.classpath
src-core/src/org/openbravo/utils/CommPortsOpen.java
src-db/database/sourcedata/AD_MENU.xml
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
src-db/database/sourcedata/AD_PROCESS.xml
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
src-db/database/sourcedata/AD_TREENODE.xml
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
src/org/openbravo/erpCommon/ad_reports/ABCbPartner.html
src/org/openbravo/erpCommon/ad_reports/ABCbPartner.java
src/org/openbravo/erpCommon/ad_reports/ABCbPartner.xml
src/org/openbravo/erpCommon/ad_reports/ABCbPartner_data.xsql
src/org/openbravo/erpCommon/ad_reports/ABCproduct.html
src/org/openbravo/erpCommon/ad_reports/ABCproduct.java
src/org/openbravo/erpCommon/ad_reports/ABCproduct.xml
src/org/openbravo/erpCommon/ad_reports/ABCproduct_data.xsql
src/org/openbravo/erpCommon/ad_reports/GenerateModel347.java
src/org/openbravo/erpCommon/ad_reports/RptM_Production.java
src/org/openbravo/erpCommon/ad_reports/RptM_Production_data.xsql
src/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.java
src/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.srpt
src/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.xml
src/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas_Config.html
src/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas_Config.xml
src/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas_data.xsql
Binary file lib/runtime/comm.jar has changed
--- a/referencedata/sampledata/Accounting_Test.xml	Thu Jan 22 09:54:57 2009 +0000
+++ b/referencedata/sampledata/Accounting_Test.xml	Thu Jan 22 10:44:35 2009 +0000
@@ -6696,15 +6696,6 @@
     <isActive>true</isActive>
     <isReadWrite>true</isReadWrite>
   </ADProcessAccess>
-  <ADProcessAccess id="5E4DB943A68916CFE040007F01002944" identifier="Rpt Labels Accounting Test User">
-    <id>5E4DB943A68916CFE040007F01002944</id>
-    <process id="800157" entity-name="ADProcess" identifier="Rpt Labels"/>
-    <role id="1000006" entity-name="ADRole" identifier="Accounting Test User"/>
-    <client id="1000001" entity-name="ADClient" identifier="Accounting Test"/>
-    <organization id="0" entity-name="Organization" identifier="*"/>
-    <isActive>true</isActive>
-    <isReadWrite>true</isReadWrite>
-  </ADProcessAccess>
   <ADProcessAccess id="5E4DB943A68A16CFE040007F01002944" identifier="Generate Material Requisitions Accounting Test User">
     <id>5E4DB943A68A16CFE040007F01002944</id>
     <process id="800159" entity-name="ADProcess" identifier="Generate Material Requisitions"/>
@@ -7380,15 +7371,6 @@
     <isActive>true</isActive>
     <isReadWrite>true</isReadWrite>
   </ADProcessAccess>
-  <ADProcessAccess id="5E4DB943A6D516CFE040007F01002944" identifier="Print Labels Accounting Test User">
-    <id>5E4DB943A6D516CFE040007F01002944</id>
-    <process id="800047" entity-name="ADProcess" identifier="Print Labels"/>
-    <role id="1000006" entity-name="ADRole" identifier="Accounting Test User"/>
-    <client id="1000001" entity-name="ADClient" identifier="Accounting Test"/>
-    <organization id="0" entity-name="Organization" identifier="*"/>
-    <isActive>true</isActive>
-    <isReadWrite>true</isReadWrite>
-  </ADProcessAccess>
   <ADProcessAccess id="5E4DB943A6D616CFE040007F01002944" identifier="Move a Storage Bin Accounting Test User">
     <id>5E4DB943A6D616CFE040007F01002944</id>
     <process id="800048" entity-name="ADProcess" identifier="Move a Storage Bin"/>
@@ -9324,15 +9306,6 @@
     <isActive>true</isActive>
     <isReadWrite>true</isReadWrite>
   </ADProcessAccess>
-  <ADProcessAccess id="5E4DB943A99E16CFE040007F01002944" identifier="Rpt Labels Accounting Test Admin">
-    <id>5E4DB943A99E16CFE040007F01002944</id>
-    <process id="800157" entity-name="ADProcess" identifier="Rpt Labels"/>
-    <role id="1000005" entity-name="ADRole" identifier="Accounting Test Admin"/>
-    <client id="1000001" entity-name="ADClient" identifier="Accounting Test"/>
-    <organization id="0" entity-name="Organization" identifier="*"/>
-    <isActive>true</isActive>
-    <isReadWrite>true</isReadWrite>
-  </ADProcessAccess>
   <ADProcessAccess id="5E4DB943A9A316CFE040007F01002944" identifier="Copy Client Accounting Test Admin">
     <id>5E4DB943A9A316CFE040007F01002944</id>
     <process id="800158" entity-name="ADProcess" identifier="Copy Client"/>
@@ -10017,15 +9990,6 @@
     <isActive>true</isActive>
     <isReadWrite>true</isReadWrite>
   </ADProcessAccess>
-  <ADProcessAccess id="5E4DB943AB1F16CFE040007F01002944" identifier="Print Labels Accounting Test Admin">
-    <id>5E4DB943AB1F16CFE040007F01002944</id>
-    <process id="800047" entity-name="ADProcess" identifier="Print Labels"/>
-    <role id="1000005" entity-name="ADRole" identifier="Accounting Test Admin"/>
-    <client id="1000001" entity-name="ADClient" identifier="Accounting Test"/>
-    <organization id="0" entity-name="Organization" identifier="*"/>
-    <isActive>true</isActive>
-    <isReadWrite>true</isReadWrite>
-  </ADProcessAccess>
   <ADProcessAccess id="5E4DB943AB2416CFE040007F01002944" identifier="Move a Storage Bin Accounting Test Admin">
     <id>5E4DB943AB2416CFE040007F01002944</id>
     <process id="800048" entity-name="ADProcess" identifier="Move a Storage Bin"/>
@@ -29167,30 +29131,6 @@
     <module id="0" entity-name="ADModule" identifier="core 2.50.10440 English (USA)"/>
     <uIPattern>M</uIPattern>
   </ADProcess>
-  <ADProcess id="800157" identifier="Rpt Labels" reference="true">
-    <id>800157</id>
-    <client id="0" entity-name="ADClient" identifier="System"/>
-    <organization id="0" entity-name="Organization" identifier="*"/>
-    <isActive>true</isActive>
-    <value>RptLabels</value>
-    <name>Rpt Labels</name>
-    <description>Rpt Labels</description>
-    <help>Rpt Labels</help>
-    <accessLevel>3</accessLevel>
-    <isUserStartable>false</isUserStartable>
-    <procedureName/>
-    <isReport>true</isReport>
-    <isDirectPrint>false</isDirectPrint>
-    <classname>/ad_reports/Rpt_Etiquetas.html</classname>
-    <isBackground>false</isBackground>
-    <isJasper>false</isJasper>
-    <jrname/>
-    <serviceType/>
-    <isexternalservice/>
-    <serviceSource/>
-    <module id="0" entity-name="ADModule" identifier="core 2.50.10440 English (USA)"/>
-    <uIPattern>M</uIPattern>
-  </ADProcess>
   <ADProcess id="800159" identifier="Generate Material Requisitions" reference="true">
     <id>800159</id>
     <client id="0" entity-name="ADClient" identifier="System"/>
@@ -30991,30 +30931,6 @@
     <module id="0" entity-name="ADModule" identifier="core 2.50.10440 English (USA)"/>
     <uIPattern>M</uIPattern>
   </ADProcess>
-  <ADProcess id="800047" identifier="Print Labels" reference="true">
-    <id>800047</id>
-    <client id="0" entity-name="ADClient" identifier="System"/>
-    <organization id="0" entity-name="Organization" identifier="*"/>
-    <isActive>true</isActive>
-    <value>RptM_ProductionLine</value>
-    <name>Print Labels</name>
-    <description>Print Labels</description>
-    <help>Print Labels</help>
-    <accessLevel>3</accessLevel>
-    <isUserStartable>false</isUserStartable>
-    <procedureName/>
-    <isReport>false</isReport>
-    <isDirectPrint>false</isDirectPrint>
-    <classname>ad_reports/RptM_Production.html</classname>
-    <isBackground>false</isBackground>
-    <isJasper>false</isJasper>
-    <jrname/>
-    <serviceType/>
-    <isexternalservice/>
-    <serviceSource/>
-    <module id="0" entity-name="ADModule" identifier="core 2.50.10440 English (USA)"/>
-    <uIPattern>M</uIPattern>
-  </ADProcess>
   <ADProcess id="800048" identifier="Move a Storage Bin" reference="true">
     <id>800048</id>
     <client id="0" entity-name="ADClient" identifier="System"/>
--- a/referencedata/sampledata/BigBazaar.xml	Thu Jan 22 09:54:57 2009 +0000
+++ b/referencedata/sampledata/BigBazaar.xml	Thu Jan 22 10:44:35 2009 +0000
@@ -47534,42 +47534,6 @@
     <isActive>true</isActive>
     <isReadWrite>true</isReadWrite>
   </ADProcessAccess>
-  <ADProcessAccess id="5E4DB943A99D16CFE040007F01002944" identifier="Rpt Labels Openbravo Admin">
-    <id>5E4DB943A99D16CFE040007F01002944</id>
-    <process id="800157" entity-name="ADProcess" identifier="Rpt Labels"/>
-    <role id="1000004" entity-name="ADRole" identifier="Openbravo Admin"/>
-    <client id="1000000" entity-name="ADClient" identifier="BigBazaar"/>
-    <organization id="0" entity-name="Organization" identifier="*"/>
-    <isActive>true</isActive>
-    <isReadWrite>true</isReadWrite>
-  </ADProcessAccess>
-  <ADProcessAccess id="5E4DB943A99F16CFE040007F01002944" identifier="Rpt Labels RoleA">
-    <id>5E4DB943A99F16CFE040007F01002944</id>
-    <process id="800157" entity-name="ADProcess" identifier="Rpt Labels"/>
-    <role id="1000007" entity-name="ADRole" identifier="RoleA"/>
-    <client id="1000000" entity-name="ADClient" identifier="BigBazaar"/>
-    <organization id="0" entity-name="Organization" identifier="*"/>
-    <isActive>true</isActive>
-    <isReadWrite>true</isReadWrite>
-  </ADProcessAccess>
-  <ADProcessAccess id="5E4DB943A9A016CFE040007F01002944" identifier="Rpt Labels RoleB">
-    <id>5E4DB943A9A016CFE040007F01002944</id>
-    <process id="800157" entity-name="ADProcess" identifier="Rpt Labels"/>
-    <role id="1000008" entity-name="ADRole" identifier="RoleB"/>
-    <client id="1000000" entity-name="ADClient" identifier="BigBazaar"/>
-    <organization id="0" entity-name="Organization" identifier="*"/>
-    <isActive>true</isActive>
-    <isReadWrite>true</isReadWrite>
-  </ADProcessAccess>
-  <ADProcessAccess id="5E4DB943A9A116CFE040007F01002944" identifier="Rpt Labels RoleB11">
-    <id>5E4DB943A9A116CFE040007F01002944</id>
-    <process id="800157" entity-name="ADProcess" identifier="Rpt Labels"/>
-    <role id="1000009" entity-name="ADRole" identifier="RoleB11"/>
-    <client id="1000000" entity-name="ADClient" identifier="BigBazaar"/>
-    <organization id="0" entity-name="Organization" identifier="*"/>
-    <isActive>true</isActive>
-    <isReadWrite>true</isReadWrite>
-  </ADProcessAccess>
   <ADProcessAccess id="5E4DB943A9A216CFE040007F01002944" identifier="Copy Client Openbravo Admin">
     <id>5E4DB943A9A216CFE040007F01002944</id>
     <process id="800158" entity-name="ADProcess" identifier="Copy Client"/>
@@ -50306,42 +50270,6 @@
     <isActive>true</isActive>
     <isReadWrite>true</isReadWrite>
   </ADProcessAccess>
-  <ADProcessAccess id="5E4DB943AB1E16CFE040007F01002944" identifier="Print Labels Openbravo Admin">
-    <id>5E4DB943AB1E16CFE040007F01002944</id>
-    <process id="800047" entity-name="ADProcess" identifier="Print Labels"/>
-    <role id="1000004" entity-name="ADRole" identifier="Openbravo Admin"/>
-    <client id="1000000" entity-name="ADClient" identifier="BigBazaar"/>
-    <organization id="0" entity-name="Organization" identifier="*"/>
-    <isActive>true</isActive>
-    <isReadWrite>true</isReadWrite>
-  </ADProcessAccess>
-  <ADProcessAccess id="5E4DB943AB2016CFE040007F01002944" identifier="Print Labels RoleA">
-    <id>5E4DB943AB2016CFE040007F01002944</id>
-    <process id="800047" entity-name="ADProcess" identifier="Print Labels"/>
-    <role id="1000007" entity-name="ADRole" identifier="RoleA"/>
-    <client id="1000000" entity-name="ADClient" identifier="BigBazaar"/>
-    <organization id="0" entity-name="Organization" identifier="*"/>
-    <isActive>true</isActive>
-    <isReadWrite>true</isReadWrite>
-  </ADProcessAccess>
-  <ADProcessAccess id="5E4DB943AB2116CFE040007F01002944" identifier="Print Labels RoleB">
-    <id>5E4DB943AB2116CFE040007F01002944</id>
-    <process id="800047" entity-name="ADProcess" identifier="Print Labels"/>
-    <role id="1000008" entity-name="ADRole" identifier="RoleB"/>
-    <client id="1000000" entity-name="ADClient" identifier="BigBazaar"/>
-    <organization id="0" entity-name="Organization" identifier="*"/>
-    <isActive>true</isActive>
-    <isReadWrite>true</isReadWrite>
-  </ADProcessAccess>
-  <ADProcessAccess id="5E4DB943AB2216CFE040007F01002944" identifier="Print Labels RoleB11">
-    <id>5E4DB943AB2216CFE040007F01002944</id>
-    <process id="800047" entity-name="ADProcess" identifier="Print Labels"/>
-    <role id="1000009" entity-name="ADRole" identifier="RoleB11"/>
-    <client id="1000000" entity-name="ADClient" identifier="BigBazaar"/>
-    <organization id="0" entity-name="Organization" identifier="*"/>
-    <isActive>true</isActive>
-    <isReadWrite>true</isReadWrite>
-  </ADProcessAccess>
   <ADProcessAccess id="5E4DB943AB2316CFE040007F01002944" identifier="Move a Storage Bin Openbravo Admin">
     <id>5E4DB943AB2316CFE040007F01002944</id>
     <process id="800048" entity-name="ADProcess" identifier="Move a Storage Bin"/>
@@ -135278,30 +135206,6 @@
     <module id="0" entity-name="ADModule" identifier="core 2.50.10440 English (USA)"/>
     <uIPattern>M</uIPattern>
   </ADProcess>
-  <ADProcess id="800157" identifier="Rpt Labels" reference="true">
-    <id>800157</id>
-    <client id="0" entity-name="ADClient" identifier="System"/>
-    <organization id="0" entity-name="Organization" identifier="*"/>
-    <isActive>true</isActive>
-    <value>RptLabels</value>
-    <name>Rpt Labels</name>
-    <description>Rpt Labels</description>
-    <help>Rpt Labels</help>
-    <accessLevel>3</accessLevel>
-    <isUserStartable>false</isUserStartable>
-    <procedureName/>
-    <isReport>true</isReport>
-    <isDirectPrint>false</isDirectPrint>
-    <classname>/ad_reports/Rpt_Etiquetas.html</classname>
-    <isBackground>false</isBackground>
-    <isJasper>false</isJasper>
-    <jrname/>
-    <serviceType/>
-    <isexternalservice/>
-    <serviceSource/>
-    <module id="0" entity-name="ADModule" identifier="core 2.50.10440 English (USA)"/>
-    <uIPattern>M</uIPattern>
-  </ADProcess>
   <ADProcess id="800158" identifier="Copy Client" reference="true">
     <id>800158</id>
     <client id="0" entity-name="ADClient" identifier="System"/>
@@ -137126,30 +137030,6 @@
     <module id="0" entity-name="ADModule" identifier="core 2.50.10440 English (USA)"/>
     <uIPattern>M</uIPattern>
   </ADProcess>
-  <ADProcess id="800047" identifier="Print Labels" reference="true">
-    <id>800047</id>
-    <client id="0" entity-name="ADClient" identifier="System"/>
-    <organization id="0" entity-name="Organization" identifier="*"/>
-    <isActive>true</isActive>
-    <value>RptM_ProductionLine</value>
-    <name>Print Labels</name>
-    <description>Print Labels</description>
-    <help>Print Labels</help>
-    <accessLevel>3</accessLevel>
-    <isUserStartable>false</isUserStartable>
-    <procedureName/>
-    <isReport>false</isReport>
-    <isDirectPrint>false</isDirectPrint>
-    <classname>ad_reports/RptM_Production.html</classname>
-    <isBackground>false</isBackground>
-    <isJasper>false</isJasper>
-    <jrname/>
-    <serviceType/>
-    <isexternalservice/>
-    <serviceSource/>
-    <module id="0" entity-name="ADModule" identifier="core 2.50.10440 English (USA)"/>
-    <uIPattern>M</uIPattern>
-  </ADProcess>
   <ADProcess id="800048" identifier="Move a Storage Bin" reference="true">
     <id>800048</id>
     <client id="0" entity-name="ADClient" identifier="System"/>
--- a/src-core/.classpath	Thu Jan 22 09:54:57 2009 +0000
+++ b/src-core/.classpath	Thu Jan 22 10:44:35 2009 +0000
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/servlet-api.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/runtime/comm.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/commons-dbcp.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/commons-pool.jar"/>
 	<classpathentry kind="lib" path="/openbravo/lib/runtime/fop.jar"/>
--- a/src-core/src/org/openbravo/utils/CommPortsOpen.java	Thu Jan 22 09:54:57 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-/*
- ************************************************************************************
- * Copyright (C) 2001-2006 Openbravo S.L.
- * Licensed under the Apache Software License version 2.0
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to  in writing,  software  distributed
- * under the License is distributed  on  an  "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR
- * CONDITIONS OF ANY KIND, either  express  or  implied.  See  the  License  for  the
- * specific language governing permissions and limitations under the License.
- ************************************************************************************
- */
-package org.openbravo.utils;
-
-import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Enumeration;
-
-import javax.comm.CommPort;
-import javax.comm.CommPortIdentifier;
-import javax.comm.NoSuchPortException;
-import javax.comm.ParallelPort;
-import javax.comm.PortInUseException;
-import javax.comm.SerialPort;
-import javax.comm.UnsupportedCommOperationException;
-
-public class CommPortsOpen {
-    /** How long to wait for the open to finish up. */
-    public static final int TIMEOUTSECONDS = 30;
-    /** The baud rate to use. */
-    public static final int BAUD = 9600;
-    /** The input stream */
-    protected DataInputStream is;
-    /** The output stream */
-    protected PrintStream os;
-    /** The chosen Port Identifier */
-    CommPortIdentifier thePortID;
-    /** The chosen Port itself */
-    CommPort thePort;
-
-    public static void main(String[] args) throws Exception, IOException,
-            NoSuchPortException, PortInUseException,
-            UnsupportedCommOperationException {
-        if (args.length != 1) {
-            System.err.println("Usage: CommPortsOpen filename");
-            System.exit(1);
-        }
-        String inputFileName = args[0];
-        CommPortsOpen cpo = new CommPortsOpen();
-        cpo.transmit_data(inputFileName);
-        cpo.close();
-        System.exit(0);
-    }
-
-    public CommPortsOpen() throws Exception, IOException, NoSuchPortException,
-            PortInUseException, UnsupportedCommOperationException {
-        choosePort(CommPortIdentifier.PORT_PARALLEL);
-
-        System.out.println("Trying to open " + thePortID.getName() + "...");
-        switch (thePortID.getPortType()) {
-        case CommPortIdentifier.PORT_SERIAL:
-            thePort = thePortID.open("Openbravo CommData",
-                    TIMEOUTSECONDS * 1000);
-            SerialPort myPort = (SerialPort) thePort;
-            // set up the serial port
-            myPort.setSerialPortParams(BAUD, SerialPort.DATABITS_8,
-                    SerialPort.STOPBITS_1, SerialPort.PARITY_NONE);
-            break;
-        case CommPortIdentifier.PORT_PARALLEL:
-            thePort = thePortID.open("Openbravo Printing",
-                    TIMEOUTSECONDS * 1000);
-            ParallelPort pPort = (ParallelPort) thePort;
-            int mode = pPort.getMode();
-            switch (mode) {
-            case ParallelPort.LPT_MODE_ECP:
-                System.out.println("Mode is: ECP");
-                break;
-            case ParallelPort.LPT_MODE_EPP:
-                System.out.println("Mode is: EPP");
-                break;
-            case ParallelPort.LPT_MODE_NIBBLE:
-                System.out.println("Mode is: Nibble Mode.");
-                break;
-            case ParallelPort.LPT_MODE_PS2:
-                System.out.println("Mode is: Byte mode.");
-                break;
-            case ParallelPort.LPT_MODE_SPP:
-                System.out.println("Mode is: Compatibility mode.");
-                break;
-            // ParallelPort.LPT_MODE_ANY is a "set only" mode;
-            // tells the API to pick "best mode"; will report the
-            // actual mode it selected.
-            default:
-                throw new IllegalStateException("Parallel mode " + mode
-                        + " invalid.");
-            }
-            break;
-        default:// Neither parallel nor serial??
-            throw new IllegalStateException("Unknown port type " + thePortID);
-        }
-        // Get the input and output streams
-        // Printers can be write-only
-        try {
-            is = new DataInputStream(thePort.getInputStream());
-        } catch (IOException e) {
-            System.err.println("Can't open input stream: write-only");
-            is = null;
-        }
-        os = new PrintStream(thePort.getOutputStream(), true);
-    }
-
-    private void choosePort(int portType) throws Exception {
-        Enumeration<?> listaPort = CommPortIdentifier.getPortIdentifiers();
-        if (portType == 0)
-            portType = CommPortIdentifier.PORT_PARALLEL;
-        while (listaPort.hasMoreElements()) {
-            thePortID = (CommPortIdentifier) listaPort.nextElement();
-            if (thePortID.getPortType() == portType) {
-                if (thePortID.isCurrentlyOwned())
-                    throw new Exception("The port is use now by: "
-                            + thePortID.getCurrentOwner());
-                return;
-            }
-        }
-        thePortID = null;
-        throw new Exception("port not found for type: " + portType);
-    }
-
-    public void transmit(String data) throws IOException {
-        os.write(data.getBytes());
-    }
-
-    public void close() throws IOException {
-        System.out.println("Closing port.");
-        if (is != null)
-            is.close();
-        os.close();
-        thePort.close();
-        thePort = null;
-        thePortID = null;
-    }
-
-    protected void transmit_data(String inputFileName) throws IOException {
-        BufferedReader file = new BufferedReader(new FileReader(inputFileName));
-        String line;
-        StringBuffer sb = new StringBuffer();
-        while ((line = file.readLine()) != null)
-            sb.append(line).append("\r\n");
-        System.out.println(sb.toString());
-        transmit(sb.toString());
-        // Finally, clean up.
-        file.close();
-    }
-}
--- a/src-db/database/sourcedata/AD_MENU.xml	Thu Jan 22 09:54:57 2009 +0000
+++ b/src-db/database/sourcedata/AD_MENU.xml	Thu Jan 22 10:44:35 2009 +0000
@@ -7550,37 +7550,6 @@
 <!--800054-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800054**************--></AD_MENU>
 
-<!--800057**************--><AD_MENU>
-<!--800057 AD_MENU_ID-->
-<!--800057-->              <AD_MENU_ID><![CDATA[800057]]></AD_MENU_ID>
-<!--800057 AD_CLIENT_ID-->
-<!--800057-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--800057 AD_ORG_ID-->
-<!--800057-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--800057 ISACTIVE-->
-<!--800057-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800057 CREATED-->
-<!--800057-->              <CREATED><![CDATA[2004-10-01 12:43:35.0]]></CREATED>
-<!--800057 CREATEDBY-->
-<!--800057-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
-<!--800057 UPDATED-->
-<!--800057-->              <UPDATED><![CDATA[2007-01-31 15:39:41.0]]></UPDATED>
-<!--800057 NAME-->
-<!--800057-->              <NAME><![CDATA[Rpt Labels]]></NAME>
-<!--800057 UPDATEDBY-->
-<!--800057-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
-<!--800057 DESCRIPTION-->
-<!--800057-->              <DESCRIPTION><![CDATA[Rpt Labels]]></DESCRIPTION>
-<!--800057 ISSUMMARY-->
-<!--800057-->              <ISSUMMARY><![CDATA[N]]></ISSUMMARY>
-<!--800057 ACTION-->
-<!--800057-->              <ACTION><![CDATA[P]]></ACTION>
-<!--800057 AD_PROCESS_ID-->
-<!--800057-->              <AD_PROCESS_ID><![CDATA[800157]]></AD_PROCESS_ID>
-<!--800057 AD_MODULE_ID-->
-<!--800057-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--800057**************--></AD_MENU>
-
 <!--800060**************--><AD_MENU>
 <!--800060 AD_MENU_ID-->
 <!--800060-->              <AD_MENU_ID><![CDATA[800060]]></AD_MENU_ID>
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Thu Jan 22 09:54:57 2009 +0000
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Thu Jan 22 10:44:35 2009 +0000
@@ -3683,35 +3683,6 @@
 <!--800747-->              <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
 <!--800747**************--></AD_MODEL_OBJECT>
 
-<!--800748**************--><AD_MODEL_OBJECT>
-<!--800748 AD_MODEL_OBJECT_ID-->
-<!--800748-->              <AD_MODEL_OBJECT_ID><![CDATA[800748]]></AD_MODEL_OBJECT_ID>
-<!--800748 AD_CLIENT_ID-->
-<!--800748-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--800748 AD_ORG_ID-->
-<!--800748-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--800748 ISACTIVE-->
-<!--800748-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800748 CREATED-->
-<!--800748-->              <CREATED><![CDATA[2006-05-22 12:12:41.0]]></CREATED>
-<!--800748 CREATEDBY-->
-<!--800748-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
-<!--800748 UPDATED-->
-<!--800748-->              <UPDATED><![CDATA[2006-05-22 12:12:41.0]]></UPDATED>
-<!--800748 UPDATEDBY-->
-<!--800748-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
-<!--800748 ACTION-->
-<!--800748-->              <ACTION><![CDATA[P]]></ACTION>
-<!--800748 CLASSNAME-->
-<!--800748-->              <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_reports.RptM_Production]]></CLASSNAME>
-<!--800748 ISDEFAULT-->
-<!--800748-->              <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
-<!--800748 AD_PROCESS_ID-->
-<!--800748-->              <AD_PROCESS_ID><![CDATA[800047]]></AD_PROCESS_ID>
-<!--800748 OBJECT_TYPE-->
-<!--800748-->              <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
-<!--800748**************--></AD_MODEL_OBJECT>
-
 <!--800779**************--><AD_MODEL_OBJECT>
 <!--800779 AD_MODEL_OBJECT_ID-->
 <!--800779-->              <AD_MODEL_OBJECT_ID><![CDATA[800779]]></AD_MODEL_OBJECT_ID>
@@ -6902,35 +6873,6 @@
 <!--801297-->              <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
 <!--801297**************--></AD_MODEL_OBJECT>
 
-<!--801298**************--><AD_MODEL_OBJECT>
-<!--801298 AD_MODEL_OBJECT_ID-->
-<!--801298-->              <AD_MODEL_OBJECT_ID><![CDATA[801298]]></AD_MODEL_OBJECT_ID>
-<!--801298 AD_CLIENT_ID-->
-<!--801298-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--801298 AD_ORG_ID-->
-<!--801298-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--801298 ISACTIVE-->
-<!--801298-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801298 CREATED-->
-<!--801298-->              <CREATED><![CDATA[2006-12-17 19:57:45.0]]></CREATED>
-<!--801298 CREATEDBY-->
-<!--801298-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
-<!--801298 UPDATED-->
-<!--801298-->              <UPDATED><![CDATA[2007-06-03 20:11:27.0]]></UPDATED>
-<!--801298 UPDATEDBY-->
-<!--801298-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
-<!--801298 ACTION-->
-<!--801298-->              <ACTION><![CDATA[R]]></ACTION>
-<!--801298 CLASSNAME-->
-<!--801298-->              <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_reports.Rpt_Etiquetas]]></CLASSNAME>
-<!--801298 ISDEFAULT-->
-<!--801298-->              <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
-<!--801298 AD_PROCESS_ID-->
-<!--801298-->              <AD_PROCESS_ID><![CDATA[800157]]></AD_PROCESS_ID>
-<!--801298 OBJECT_TYPE-->
-<!--801298-->              <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
-<!--801298**************--></AD_MODEL_OBJECT>
-
 <!--801305**************--><AD_MODEL_OBJECT>
 <!--801305 AD_MODEL_OBJECT_ID-->
 <!--801305-->              <AD_MODEL_OBJECT_ID><![CDATA[801305]]></AD_MODEL_OBJECT_ID>
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Thu Jan 22 09:54:57 2009 +0000
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Thu Jan 22 10:44:35 2009 +0000
@@ -3150,31 +3150,6 @@
 <!--800953-->              <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--800953**************--></AD_MODEL_OBJECT_MAPPING>
 
-<!--800954**************--><AD_MODEL_OBJECT_MAPPING>
-<!--800954 AD_MODEL_OBJECT_MAPPING_ID-->
-<!--800954-->              <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[800954]]></AD_MODEL_OBJECT_MAPPING_ID>
-<!--800954 AD_CLIENT_ID-->
-<!--800954-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--800954 AD_ORG_ID-->
-<!--800954-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--800954 ISACTIVE-->
-<!--800954-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800954 CREATED-->
-<!--800954-->              <CREATED><![CDATA[2006-05-22 12:12:41.0]]></CREATED>
-<!--800954 CREATEDBY-->
-<!--800954-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
-<!--800954 UPDATED-->
-<!--800954-->              <UPDATED><![CDATA[2006-12-16 11:23:11.0]]></UPDATED>
-<!--800954 UPDATEDBY-->
-<!--800954-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
-<!--800954 AD_MODEL_OBJECT_ID-->
-<!--800954-->              <AD_MODEL_OBJECT_ID><![CDATA[800748]]></AD_MODEL_OBJECT_ID>
-<!--800954 MAPPINGNAME-->
-<!--800954-->              <MAPPINGNAME><![CDATA[/ad_reports/RptM_Production.html]]></MAPPINGNAME>
-<!--800954 ISDEFAULT-->
-<!--800954-->              <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
-<!--800954**************--></AD_MODEL_OBJECT_MAPPING>
-
 <!--801020**************--><AD_MODEL_OBJECT_MAPPING>
 <!--801020 AD_MODEL_OBJECT_MAPPING_ID-->
 <!--801020-->              <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[801020]]></AD_MODEL_OBJECT_MAPPING_ID>
@@ -7425,56 +7400,6 @@
 <!--801899-->              <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--801899**************--></AD_MODEL_OBJECT_MAPPING>
 
-<!--801900**************--><AD_MODEL_OBJECT_MAPPING>
-<!--801900 AD_MODEL_OBJECT_MAPPING_ID-->
-<!--801900-->              <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[801900]]></AD_MODEL_OBJECT_MAPPING_ID>
-<!--801900 AD_CLIENT_ID-->
-<!--801900-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--801900 AD_ORG_ID-->
-<!--801900-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--801900 ISACTIVE-->
-<!--801900-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801900 CREATED-->
-<!--801900-->              <CREATED><![CDATA[2006-12-17 19:57:51.0]]></CREATED>
-<!--801900 CREATEDBY-->
-<!--801900-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
-<!--801900 UPDATED-->
-<!--801900-->              <UPDATED><![CDATA[2006-12-17 19:57:51.0]]></UPDATED>
-<!--801900 UPDATEDBY-->
-<!--801900-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
-<!--801900 AD_MODEL_OBJECT_ID-->
-<!--801900-->              <AD_MODEL_OBJECT_ID><![CDATA[801298]]></AD_MODEL_OBJECT_ID>
-<!--801900 MAPPINGNAME-->
-<!--801900-->              <MAPPINGNAME><![CDATA[/ad_reports/Rpt_Etiquetas.html]]></MAPPINGNAME>
-<!--801900 ISDEFAULT-->
-<!--801900-->              <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
-<!--801900**************--></AD_MODEL_OBJECT_MAPPING>
-
-<!--801901**************--><AD_MODEL_OBJECT_MAPPING>
-<!--801901 AD_MODEL_OBJECT_MAPPING_ID-->
-<!--801901-->              <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[801901]]></AD_MODEL_OBJECT_MAPPING_ID>
-<!--801901 AD_CLIENT_ID-->
-<!--801901-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--801901 AD_ORG_ID-->
-<!--801901-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--801901 ISACTIVE-->
-<!--801901-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801901 CREATED-->
-<!--801901-->              <CREATED><![CDATA[2006-12-17 19:58:25.0]]></CREATED>
-<!--801901 CREATEDBY-->
-<!--801901-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
-<!--801901 UPDATED-->
-<!--801901-->              <UPDATED><![CDATA[2006-12-17 19:58:25.0]]></UPDATED>
-<!--801901 UPDATEDBY-->
-<!--801901-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
-<!--801901 AD_MODEL_OBJECT_ID-->
-<!--801901-->              <AD_MODEL_OBJECT_ID><![CDATA[801298]]></AD_MODEL_OBJECT_ID>
-<!--801901 MAPPINGNAME-->
-<!--801901-->              <MAPPINGNAME><![CDATA[/ad_reports/Rpt_Etiquetas_Config.html]]></MAPPINGNAME>
-<!--801901 ISDEFAULT-->
-<!--801901-->              <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
-<!--801901**************--></AD_MODEL_OBJECT_MAPPING>
-
 <!--801918**************--><AD_MODEL_OBJECT_MAPPING>
 <!--801918 AD_MODEL_OBJECT_MAPPING_ID-->
 <!--801918-->              <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[801918]]></AD_MODEL_OBJECT_MAPPING_ID>
--- a/src-db/database/sourcedata/AD_PROCESS.xml	Thu Jan 22 09:54:57 2009 +0000
+++ b/src-db/database/sourcedata/AD_PROCESS.xml	Thu Jan 22 10:44:35 2009 +0000
@@ -6410,51 +6410,6 @@
 <!--800046-->              <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--800046**************--></AD_PROCESS>
 
-<!--800047**************--><AD_PROCESS>
-<!--800047 AD_PROCESS_ID-->
-<!--800047-->              <AD_PROCESS_ID><![CDATA[800047]]></AD_PROCESS_ID>
-<!--800047 AD_CLIENT_ID-->
-<!--800047-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--800047 AD_ORG_ID-->
-<!--800047-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--800047 ISACTIVE-->
-<!--800047-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800047 CREATED-->
-<!--800047-->              <CREATED><![CDATA[2004-08-06 14:07:32.0]]></CREATED>
-<!--800047 CREATEDBY-->
-<!--800047-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
-<!--800047 UPDATED-->
-<!--800047-->              <UPDATED><![CDATA[2004-08-06 14:07:32.0]]></UPDATED>
-<!--800047 UPDATEDBY-->
-<!--800047-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
-<!--800047 VALUE-->
-<!--800047-->              <VALUE><![CDATA[RptM_ProductionLine]]></VALUE>
-<!--800047 NAME-->
-<!--800047-->              <NAME><![CDATA[Print Labels]]></NAME>
-<!--800047 DESCRIPTION-->
-<!--800047-->              <DESCRIPTION><![CDATA[Print Labels]]></DESCRIPTION>
-<!--800047 HELP-->
-<!--800047-->              <HELP><![CDATA[Print Labels]]></HELP>
-<!--800047 ACCESSLEVEL-->
-<!--800047-->              <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
-<!--800047 ISUSERSTARTABLE-->
-<!--800047-->              <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
-<!--800047 ISREPORT-->
-<!--800047-->              <ISREPORT><![CDATA[N]]></ISREPORT>
-<!--800047 ISDIRECTPRINT-->
-<!--800047-->              <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
-<!--800047 CLASSNAME-->
-<!--800047-->              <CLASSNAME><![CDATA[ad_reports/RptM_Production.html]]></CLASSNAME>
-<!--800047 ISBACKGROUND-->
-<!--800047-->              <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
-<!--800047 ISJASPER-->
-<!--800047-->              <ISJASPER><![CDATA[N]]></ISJASPER>
-<!--800047 AD_MODULE_ID-->
-<!--800047-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--800047 UIPATTERN-->
-<!--800047-->              <UIPATTERN><![CDATA[M]]></UIPATTERN>
-<!--800047**************--></AD_PROCESS>
-
 <!--800048**************--><AD_PROCESS>
 <!--800048 AD_PROCESS_ID-->
 <!--800048-->              <AD_PROCESS_ID><![CDATA[800048]]></AD_PROCESS_ID>
@@ -10153,51 +10108,6 @@
 <!--800156-->              <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--800156**************--></AD_PROCESS>
 
-<!--800157**************--><AD_PROCESS>
-<!--800157 AD_PROCESS_ID-->
-<!--800157-->              <AD_PROCESS_ID><![CDATA[800157]]></AD_PROCESS_ID>
-<!--800157 AD_CLIENT_ID-->
-<!--800157-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--800157 AD_ORG_ID-->
-<!--800157-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--800157 ISACTIVE-->
-<!--800157-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800157 CREATED-->
-<!--800157-->              <CREATED><![CDATA[2006-12-17 19:57:17.0]]></CREATED>
-<!--800157 CREATEDBY-->
-<!--800157-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
-<!--800157 UPDATED-->
-<!--800157-->              <UPDATED><![CDATA[2007-06-05 12:45:38.0]]></UPDATED>
-<!--800157 UPDATEDBY-->
-<!--800157-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
-<!--800157 VALUE-->
-<!--800157-->              <VALUE><![CDATA[RptLabels]]></VALUE>
-<!--800157 NAME-->
-<!--800157-->              <NAME><![CDATA[Rpt Labels]]></NAME>
-<!--800157 DESCRIPTION-->
-<!--800157-->              <DESCRIPTION><![CDATA[Rpt Labels]]></DESCRIPTION>
-<!--800157 HELP-->
-<!--800157-->              <HELP><![CDATA[Rpt Labels]]></HELP>
-<!--800157 ACCESSLEVEL-->
-<!--800157-->              <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
-<!--800157 ISUSERSTARTABLE-->
-<!--800157-->              <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
-<!--800157 ISREPORT-->
-<!--800157-->              <ISREPORT><![CDATA[Y]]></ISREPORT>
-<!--800157 ISDIRECTPRINT-->
-<!--800157-->              <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
-<!--800157 CLASSNAME-->
-<!--800157-->              <CLASSNAME><![CDATA[/ad_reports/Rpt_Etiquetas.html]]></CLASSNAME>
-<!--800157 ISBACKGROUND-->
-<!--800157-->              <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
-<!--800157 ISJASPER-->
-<!--800157-->              <ISJASPER><![CDATA[N]]></ISJASPER>
-<!--800157 AD_MODULE_ID-->
-<!--800157-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--800157 UIPATTERN-->
-<!--800157-->              <UIPATTERN><![CDATA[M]]></UIPATTERN>
-<!--800157**************--></AD_PROCESS>
-
 <!--800158**************--><AD_PROCESS>
 <!--800158 AD_PROCESS_ID-->
 <!--800158-->              <AD_PROCESS_ID><![CDATA[800158]]></AD_PROCESS_ID>
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Thu Jan 22 09:54:57 2009 +0000
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Thu Jan 22 10:44:35 2009 +0000
@@ -12763,7 +12763,7 @@
 <!--804263 FILENAME-->
 <!--804263-->              <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas_Config.html]]></FILENAME>
 <!--804263 ISUSED-->
-<!--804263-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--804263-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--804263 AD_MODULE_ID-->
 <!--804263-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804263**************--></AD_TEXTINTERFACES>
@@ -13519,7 +13519,7 @@
 <!--804911 FILENAME-->
 <!--804911-->              <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.srpt]]></FILENAME>
 <!--804911 ISUSED-->
-<!--804911-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--804911-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--804911 AD_MODULE_ID-->
 <!--804911-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804911**************--></AD_TEXTINTERFACES>
@@ -13546,7 +13546,7 @@
 <!--804912 FILENAME-->
 <!--804912-->              <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.srpt]]></FILENAME>
 <!--804912 ISUSED-->
-<!--804912-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--804912-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--804912 AD_MODULE_ID-->
 <!--804912-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804912**************--></AD_TEXTINTERFACES>
@@ -13573,7 +13573,7 @@
 <!--804913 FILENAME-->
 <!--804913-->              <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.srpt]]></FILENAME>
 <!--804913 ISUSED-->
-<!--804913-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--804913-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--804913 AD_MODULE_ID-->
 <!--804913-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804913**************--></AD_TEXTINTERFACES>
@@ -13600,7 +13600,7 @@
 <!--804914 FILENAME-->
 <!--804914-->              <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.srpt]]></FILENAME>
 <!--804914 ISUSED-->
-<!--804914-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--804914-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--804914 AD_MODULE_ID-->
 <!--804914-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804914**************--></AD_TEXTINTERFACES>
@@ -13627,7 +13627,7 @@
 <!--804915 FILENAME-->
 <!--804915-->              <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.srpt]]></FILENAME>
 <!--804915 ISUSED-->
-<!--804915-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--804915-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--804915 AD_MODULE_ID-->
 <!--804915-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804915**************--></AD_TEXTINTERFACES>
@@ -13654,7 +13654,7 @@
 <!--804916 FILENAME-->
 <!--804916-->              <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.srpt]]></FILENAME>
 <!--804916 ISUSED-->
-<!--804916-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--804916-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--804916 AD_MODULE_ID-->
 <!--804916-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804916**************--></AD_TEXTINTERFACES>
@@ -13681,7 +13681,7 @@
 <!--804917 FILENAME-->
 <!--804917-->              <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.srpt]]></FILENAME>
 <!--804917 ISUSED-->
-<!--804917-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--804917-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--804917 AD_MODULE_ID-->
 <!--804917-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804917**************--></AD_TEXTINTERFACES>
@@ -13708,7 +13708,7 @@
 <!--804918 FILENAME-->
 <!--804918-->              <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.srpt]]></FILENAME>
 <!--804918 ISUSED-->
-<!--804918-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--804918-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--804918 AD_MODULE_ID-->
 <!--804918-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804918**************--></AD_TEXTINTERFACES>
@@ -13735,7 +13735,7 @@
 <!--804919 FILENAME-->
 <!--804919-->              <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.srpt]]></FILENAME>
 <!--804919 ISUSED-->
-<!--804919-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--804919-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--804919 AD_MODULE_ID-->
 <!--804919-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804919**************--></AD_TEXTINTERFACES>
@@ -13762,7 +13762,7 @@
 <!--804920 FILENAME-->
 <!--804920-->              <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.srpt]]></FILENAME>
 <!--804920 ISUSED-->
-<!--804920-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--804920-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--804920 AD_MODULE_ID-->
 <!--804920-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804920**************--></AD_TEXTINTERFACES>
@@ -13789,7 +13789,7 @@
 <!--804921 FILENAME-->
 <!--804921-->              <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.srpt]]></FILENAME>
 <!--804921 ISUSED-->
-<!--804921-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--804921-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--804921 AD_MODULE_ID-->
 <!--804921-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804921**************--></AD_TEXTINTERFACES>
@@ -13816,7 +13816,7 @@
 <!--804922 FILENAME-->
 <!--804922-->              <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.srpt]]></FILENAME>
 <!--804922 ISUSED-->
-<!--804922-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--804922-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--804922 AD_MODULE_ID-->
 <!--804922-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804922**************--></AD_TEXTINTERFACES>
@@ -18943,7 +18943,7 @@
 <!--806470 TEXT-->
 <!--806470-->              <TEXT><![CDATA[Partner]]></TEXT>
 <!--806470 ISUSED-->
-<!--806470-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--806470-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--806470 AD_MODULE_ID-->
 <!--806470-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--806470**************--></AD_TEXTINTERFACES>
@@ -18970,7 +18970,7 @@
 <!--806471 FILENAME-->
 <!--806471-->              <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ABCbPartner.html]]></FILENAME>
 <!--806471 ISUSED-->
-<!--806471-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--806471-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--806471 AD_MODULE_ID-->
 <!--806471-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--806471**************--></AD_TEXTINTERFACES>
@@ -18997,7 +18997,7 @@
 <!--806474 FILENAME-->
 <!--806474-->              <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ABCbPartner.html]]></FILENAME>
 <!--806474 ISUSED-->
-<!--806474-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--806474-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--806474 AD_MODULE_ID-->
 <!--806474-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--806474**************--></AD_TEXTINTERFACES>
@@ -25228,7 +25228,7 @@
 <!--807208 TEXT-->
 <!--807208-->              <TEXT><![CDATA[MEDIUM PRICE]]></TEXT>
 <!--807208 ISUSED-->
-<!--807208-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--807208-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--807208 AD_MODULE_ID-->
 <!--807208-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--807208**************--></AD_TEXTINTERFACES>
@@ -30519,7 +30519,7 @@
 <!--807511 FILENAME-->
 <!--807511-->              <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ABCbPartner.html]]></FILENAME>
 <!--807511 ISUSED-->
-<!--807511-->              <ISUSED><![CDATA[Y]]></ISUSED>
+<!--807511-->              <ISUSED><![CDATA[N]]></ISUSED>
 <!--807511 AD_MODULE_ID-->
 <!--807511-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--807511**************--></AD_TEXTINTERFACES>
--- a/src-db/database/sourcedata/AD_TREENODE.xml	Thu Jan 22 09:54:57 2009 +0000
+++ b/src-db/database/sourcedata/AD_TREENODE.xml	Thu Jan 22 10:44:35 2009 +0000
@@ -6370,33 +6370,6 @@
 <!--52118BF1A2D34D84E040007F01005FEC-->              <SEQNO><![CDATA[20]]></SEQNO>
 <!--52118BF1A2D34D84E040007F01005FEC**************--></AD_TREENODE>
 
-<!--52118BF1A2D44D84E040007F01005FEC**************--><AD_TREENODE>
-<!--52118BF1A2D44D84E040007F01005FEC AD_TREENODE_ID-->
-<!--52118BF1A2D44D84E040007F01005FEC-->              <AD_TREENODE_ID><![CDATA[52118BF1A2D44D84E040007F01005FEC]]></AD_TREENODE_ID>
-<!--52118BF1A2D44D84E040007F01005FEC AD_TREE_ID-->
-<!--52118BF1A2D44D84E040007F01005FEC-->              <AD_TREE_ID><![CDATA[10]]></AD_TREE_ID>
-<!--52118BF1A2D44D84E040007F01005FEC NODE_ID-->
-<!--52118BF1A2D44D84E040007F01005FEC-->              <NODE_ID><![CDATA[800057]]></NODE_ID>
-<!--52118BF1A2D44D84E040007F01005FEC AD_CLIENT_ID-->
-<!--52118BF1A2D44D84E040007F01005FEC-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--52118BF1A2D44D84E040007F01005FEC AD_ORG_ID-->
-<!--52118BF1A2D44D84E040007F01005FEC-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--52118BF1A2D44D84E040007F01005FEC ISACTIVE-->
-<!--52118BF1A2D44D84E040007F01005FEC-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--52118BF1A2D44D84E040007F01005FEC CREATED-->
-<!--52118BF1A2D44D84E040007F01005FEC-->              <CREATED><![CDATA[2004-10-01 12:43:35.0]]></CREATED>
-<!--52118BF1A2D44D84E040007F01005FEC CREATEDBY-->
-<!--52118BF1A2D44D84E040007F01005FEC-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
-<!--52118BF1A2D44D84E040007F01005FEC UPDATED-->
-<!--52118BF1A2D44D84E040007F01005FEC-->              <UPDATED><![CDATA[2007-06-21 11:13:13.0]]></UPDATED>
-<!--52118BF1A2D44D84E040007F01005FEC UPDATEDBY-->
-<!--52118BF1A2D44D84E040007F01005FEC-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
-<!--52118BF1A2D44D84E040007F01005FEC PARENT_ID-->
-<!--52118BF1A2D44D84E040007F01005FEC-->              <PARENT_ID><![CDATA[800256]]></PARENT_ID>
-<!--52118BF1A2D44D84E040007F01005FEC SEQNO-->
-<!--52118BF1A2D44D84E040007F01005FEC-->              <SEQNO><![CDATA[50]]></SEQNO>
-<!--52118BF1A2D44D84E040007F01005FEC**************--></AD_TREENODE>
-
 <!--52118BF1A2D54D84E040007F01005FEC**************--><AD_TREENODE>
 <!--52118BF1A2D54D84E040007F01005FEC AD_TREENODE_ID-->
 <!--52118BF1A2D54D84E040007F01005FEC-->              <AD_TREENODE_ID><![CDATA[52118BF1A2D54D84E040007F01005FEC]]></AD_TREENODE_ID>
--- a/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java	Thu Jan 22 09:54:57 2009 +0000
+++ b/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java	Thu Jan 22 10:44:35 2009 +0000
@@ -563,11 +563,6 @@
         vars.setHistoryCommand(strCommand);
     }
 
-    public void advise(HttpServletResponse response, String strTitulo,
-            String strTexto) throws IOException {
-        advise(response, "INFO", strTitulo, strTexto);
-    }
-
     public void advise(HttpServletResponse response, String strTipo,
             String strTitulo, String strTexto) throws IOException {
         final XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
--- a/src/org/openbravo/erpCommon/ad_reports/ABCbPartner.html	Thu Jan 22 09:54:57 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,321 +0,0 @@
-<?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="stylesheet" type="text/css" href="../../../../../web/skins/Default/Openbravo_ERP_250.css" id="paramCSS"/>
-    <script language="JavaScript" type="text/javascript" id="paramDirectory">
-      var baseDirectory = "../../../../../web/";
-    </script>
-    <script language="JavaScript" type="text/javascript" id="paramLanguage">
-      var defaultLang = "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/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/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 onloadFunctions() {
-      }
-    </script>
-  	<script language="JavaScript" type="text/javascript">
-	function onLoadDo(){
-		this.windowTables = new Array(
-		  new windowTableId('client')
-		);
-		setWindowTableParentElement();
-		this.tabsTables = new Array(
-		  new tabTableId('tdtopTabs')
-		);
-		setTabTableParentElement();
-		enableShortcuts('edition');
-		setBrowserAutoComplete(false);
-		
-		resizeArea();
-		updateMenuIcon('buttonMenu');
-
-		setWindowElementFocus('firstElement');
-	}
-
-	function onResizeDo(){
-		resizeArea();
-	}
-	</script>
-</head>
-  <body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
-    <form method="post" action="ABCbPartner.html" name="frmMain"  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 border="0" cellspacing="0" cellpadding="0">
-                            <tr>
-                              <td ><span >Partner</span></td>
-
-                              <td ><input type="hidden" name="inpBpartnerId" value="" id="fieldBPartner" /><input type="text" name="inpBpartnerId_DES" size="40" value="" id="fieldBpartnerName" /><a href="#" onclick="openSearch(null, null, '../info/BusinessPartner.html', 'SELECTOR_BUSINESS', false, 'frmMain', 'inpBpartnerId', 'inpBpartnerId_DES', document.frmMain.inpBpartnerId_DES.value);return false;" onmouseout="window.status='';return true;" onmouseover="window.status='Search';return true;"><img width="20" height="20" alt="Business Partner" border="0" src="../../../../../web/images/BusinessPartner.jpg" /></a></td>
-                            </tr>
-
-                            <tr>
-                              <td ><span >Product</span></td>
-
-                              <td >
-                                <input type="hidden" name="inpmProductId" id="fieldProduct" value="xxV" />
-
-                                <table border="0" cellspacing="0" cellpadding="0" summary="">
-                                  <tr>
-                                    <td ><input type="text" size="40" name="inpmProductId_D" id="fieldProductName" value="xxV" /></td>
-
-                                    <td ><a href="#" onclick="openSearch(null, null, '../info/Product.html', null, true, 'frmMain', 'inpmProductId', 'inpmProductId_D', document.frmMain.inpmProductId_D.value, 'WindowID', 'Rpt_Etiquetas');return false;" onmouseout="window.status='';return true;" onmouseover="window.status='Search';return true;"><img alt="Product" width="20" height="20" border="0" src="../../../../../web/images/Product.jpg" /></a></td>
-                                  </tr>
-                                </table>
-                              </td>
-                            </tr>
-
-                            <tr>
-                              <td ><span >Attribute</span></td>
-
-                              <td >
-                                <input type="hidden" name="inpmAttributesetinstanceId" id="fieldAttribute" value="xxV" />
-
-                                <table border="0" cellspacing="0" cellpadding="0" summary="">
-                                  <tr>
-                                    <td ><input type="text" size="14"  name="inpmAttributesetinstanceId_D" id="fieldAttributeName" value="xxV" readonly="true" /></td>
-
-                                    <td ><a href="#" onclick="openPAttribute(null, null, '../info/AttributeSetInstance.html', null, false, 'frmMain', 'inpmAttributesetinstanceId', 'inpmAttributesetinstanceId_D', document.frmMain.inpmAttributesetinstanceId_D.value, 'WindowID', 'Rpt_Etiquetas', 'inpKeyValue', document.frmMain.inpmAttributesetinstanceId.value, 'inpwindowId', 'Rpt_Etiquetas', 'inpProduct', document.frmMain.inpmProductId.value);return false;" onmouseout="window.status='';return true;" onmouseover="window.status='Search';return true;"><img alt="Attribute Set Instance" width="20" height="20" border="0" src="../../../../../web/images/AttributeSetInstance.jpg" /></a></td>
-                                  </tr>
-                                </table>
-                              </td>
-                            </tr>
-
-                            <tr>
-                              <td ><span >Pages</span></td>
-
-                              <td ><input type="text" value="1" size="5"  id="fieldNumberPages" name="inpNumberPages" /></td>
-                            </tr>
-                          </table>
-                          <br />
-
-                          <table border="0" cellspacing="0" cellpadding="2" >
-                            <tr>
-                              <td ><a href="#" onclick="top.close();return false;" onmouseover="window.status='Cancel';return true;" onmouseout="window.status='';return true;"><img width="20" height="20" src="../../../../../web/images/Cancel.jpg" alt="Cancel" border="0" /></a></td>
-
-                              <td ><a href="#" onclick="submitCommandForm('PRINT_LABEL');return false;" onmouseover="window.status='Accept';return true;" onmouseout="window.status='';return true;"><img width="20" height="20" src="../../../../../web/images/Ok.jpg" alt="Accept" border="0" /></a></td>
-                            </tr>
-                          </table>
-                        </td>
-                      </tr>
-                    </table>
-
-                    <!-- USER CONTROLS -->
-                    <table width="90%" border="0">
-                      <tr> 
-                        <td width="13%" > <span >From</span></td>
-                        <td width="13%"> <input type="text" name="inpFrom" id="paramFrom" size="10" maxlength="10" value=""  onkeyup="auto_complete_date(this);return true;"></input> 
-                          <a href="#" onclick="showCalendar('frmMain.inpFrom', document.frmMain.inpFrom.value, false);return false;" onmouseout="window.status='';return true;" onmouseover="window.status='Show calendar';return true;" > 
-                            <img width="16" height="16" alt="Calendar" title="Calendar" border="0" src="../../../../../web/images/BtnCal.gif" id="buttonCalendar"></img></a></td>
-                        <td width="9%" > <span >Until</span></td>
-                        <td width="15%" > <input type="text" name="inpTo" id="paramTo" value="" size="10" maxlength="10"  onkeyup="auto_complete_date(this);return true;"></input> 
-                          <a href="#" onclick="showCalendar('frmMain.inpTo', document.frmMain.inpTo.value, false);return false;" onmouseout="window.status='';return true;" onmouseover="window.status='Show calendar';return true;" > 
-                            <img width="16" height="16" alt="Calendar" title="Calendar" border="0" src="../../../../../web/images/BtnCal.gif" id="buttonCalendar"></img></a></td>
-                        <td width="19%" > <span >Product family</span>&nbsp;</td>
-                        <td width="23%"> <select name="inpCategory" id="inpCategory">
-                            <option value=""> <div id="reportCategory"></div></option>
-                        </select></td>
-                        <td width="8%"> <a href="#" onclick="submitCommandForm('FIND');return false;" onmouseover="window.status='Results';return true;" onmouseout="window.status='';return true;" > 
-                            <img width="16" height="16" src="../../../../../web/images/Find.jpg" alt="Results" title="Results" border="0" id="buttonResults"></img></a></td>
-                      </tr>
-                    </table>
-                    <HR></HR>
-                    <div id="selEliminar"> 
-                      <table width="70%">
-                        <tr  border="1" cellspacing="0" cellpadding="0" width="100%"> 
-                          <td colspan="4">&nbsp;</td>
-                        </tr>
-                        <tr  class="Border TableDetailHeader" border="1" cellspacing="0" cellpadding="0" width="100%"> 
-                        <td width="41%" >Business Partner</td> 
-                        <td width="25%" >Quantity</td> 
-                        <td width="15%" >Medium Price</td> 
-                        <td width="19%" >Amount</td> 
-                        </tr>
-                        <div id="sectionDetail"> 
-                          <tr  class="Border TableDetailRowEven" border="1" cellspacing="0" cellpadding="0" width="100%"> 
-                            <td width="41%"  id="fieldCliente">xxcentral alemenia 
-                              tests</td>
-                            <td width="25%"  id="fieldCantidad">xx10<span>&nbsp;</span> 
-                              <span id="fieldUnidad">xxm2</span></td>
-                            <td width="15%"  id="fieldPrecioMedio">xx77<span>&nbsp;</span></td>
-                            <td width="19%"  id="fieldImporte">xx10002565<span>&nbsp;</span></td>
-                          </tr>
-                        </div>
-                      </table>
-                    </div>
-
-                      <!-- 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/ABCbPartner.java	Thu Jan 22 09:54:57 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-package org.openbravo.erpCommon.ad_reports;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.openbravo.base.secureApp.HttpSecureAppServlet;
-import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.businessUtility.WindowTabs;
-import org.openbravo.erpCommon.utility.ComboTableData;
-import org.openbravo.erpCommon.utility.LeftTabsBar;
-import org.openbravo.erpCommon.utility.NavigationBar;
-import org.openbravo.erpCommon.utility.OBError;
-import org.openbravo.erpCommon.utility.ToolBar;
-import org.openbravo.erpCommon.utility.Utility;
-import org.openbravo.xmlEngine.XmlDocument;
-
-public class ABCbPartner extends HttpSecureAppServlet {
-    private static final long serialVersionUID = 1L;
-
-    public void doPost(HttpServletRequest request, HttpServletResponse response)
-            throws IOException, ServletException {
-        VariablesSecureApp vars = new VariablesSecureApp(request);
-
-        if (vars.commandIn("DEFAULT")) {
-            String strFrom = vars.getGlobalVariable("inpFrom",
-                    "ABCbPartner|From", "");
-            String strTo = vars
-                    .getGlobalVariable("inpTo", "ABCbPartner|To", "");
-            String strCategory = vars.getGlobalVariable("inpCategory",
-                    "ABCbPartner|Category", "");
-            printPageDataSheet(response, vars, strFrom, strTo, strCategory);
-        } else if (vars.commandIn("FIND")) {
-            String strFrom = vars.getRequestGlobalVariable("inpFrom",
-                    "ABCbPartner|From");
-            String strTo = vars.getRequestGlobalVariable("inpTo",
-                    "ABCbPartner|To");
-            String strCategory = vars.getGlobalVariable("inpCategory",
-                    "ABCbPartner|Category", "");
-            printPageDataSheet(response, vars, strFrom, strTo, strCategory);
-        } else
-            pageError(response);
-    }
-
-    void printPageDataSheet(HttpServletResponse response,
-            VariablesSecureApp vars, String strFrom, String strTo,
-            String strCategory) throws IOException, ServletException {
-        if (log4j.isDebugEnabled())
-            log4j.debug("Output: dataSheet");
-        response.setContentType("text/html; charset=UTF-8");
-        PrintWriter out = response.getWriter();
-        XmlDocument xmlDocument = null;
-        ABCbPartnerData[] data = null;
-        if (strFrom.equals("") || strTo.equals("")) {
-            String discard[] = { "selEliminar" };
-            xmlDocument = xmlEngine.readXmlTemplate(
-                    "org/openbravo/erpCommon/ad_reports/ABCbPartner", discard)
-                    .createXmlDocument();
-            data = ABCbPartnerData.set("0", "0");
-        } else {
-            xmlDocument = xmlEngine.readXmlTemplate(
-                    "org/openbravo/erpCommon/ad_reports/ABCbPartner")
-                    .createXmlDocument();
-            data = ABCbPartnerData.select(this, strFrom, strTo, strCategory);
-        }
-
-        ToolBar toolbar = new ToolBar(this, vars.getLanguage(), "ABCbPartner",
-                false, "", "", "", false, "ad_reports", strReplaceWith, false,
-                true);
-        toolbar.prepareSimpleToolBarTemplate();
-        xmlDocument.setParameter("toolbar", toolbar.toString());
-        try {
-            WindowTabs tabs = new WindowTabs(this, vars,
-                    "org.openbravo.erpCommon.ad_reports.ABCbPartner");
-            xmlDocument.setParameter("parentTabContainer", tabs.parentTabs());
-            xmlDocument.setParameter("mainTabContainer", tabs.mainTabs());
-            xmlDocument.setParameter("childTabContainer", tabs.childTabs());
-            xmlDocument.setParameter("theme", vars.getTheme());
-            NavigationBar nav = new NavigationBar(this, vars.getLanguage(),
-                    "ABCbPartner.html", classInfo.id, classInfo.type,
-                    strReplaceWith, tabs.breadcrumb());
-            xmlDocument.setParameter("navigationBar", nav.toString());
-            LeftTabsBar lBar = new LeftTabsBar(this, vars.getLanguage(),
-                    "ABCbPartner.html", strReplaceWith);
-            xmlDocument.setParameter("leftTabs", lBar.manualTemplate());
-        } catch (Exception ex) {
-            throw new ServletException(ex);
-        }
-        {
-            OBError myMessage = vars.getMessage("ABCbPartner");
-            vars.removeMessage("ABCbPartner");
-            if (myMessage != null) {
-                xmlDocument.setParameter("messageType", myMessage.getType());
-                xmlDocument.setParameter("messageTitle", myMessage.getTitle());
-                xmlDocument.setParameter("messageMessage", myMessage
-                        .getMessage());
-            }
-        }
-
-        xmlDocument
-                .setParameter("calendar", vars.getLanguage().substring(0, 2));
-        xmlDocument.setParameter("directory", "var baseDirectory = \""
-                + strReplaceWith + "/\";\n");
-        xmlDocument.setParameter("paramLanguage", "defaultLang=\""
-                + vars.getLanguage() + "\";");
-        xmlDocument.setParameter("from", strFrom);
-        xmlDocument.setParameter("to", strTo);
-        xmlDocument.setParameter("category", strCategory);
-
-        try {
-            ComboTableData comboTableData = new ComboTableData(vars, this,
-                    "TABLEDIR", "M_Product_Category_ID", "", "",
-                    Utility.getContext(this, vars, "#User_Org", "ABCbPartner"),
-                    Utility.getContext(this, vars, "#User_Client",
-                            "ABCbPartner"), 0);
-            Utility.fillSQLParameters(this, vars, null, comboTableData,
-                    "ABCbPartner", strCategory);
-            xmlDocument.setData("reportCategory", "liststructure",
-                    comboTableData.select(false));
-            comboTableData = null;
-        } catch (Exception ex) {
-            throw new ServletException(ex);
-        }
-
-        xmlDocument.setData("structure", data);
-        out.println(xmlDocument.print());
-        out.close();
-    }
-
-    public String getServletInfo() {
-        return "Servlet ABCbPartner. This Servlet was made by Eduardo Argal";
-    } // end of getServletInfo() method
-}
--- a/src/org/openbravo/erpCommon/ad_reports/ABCbPartner.xml	Thu Jan 22 09:54:57 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-*************************************************************************
-* The contents of this file are subject to the Openbravo  Public  License
-* Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
-* Version 1.1  with a permitted attribution clause; you may not  use this
-* file except in compliance with the License. You  may  obtain  a copy of
-* the License at http://www.openbravo.com/legal/license.html 
-* Software distributed under the License  is  distributed  on  an "AS IS"
-* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-* License for the specific  language  governing  rights  and  limitations
-* under the License. 
-* The Original Code is Openbravo ERP. 
-* The Initial Developer of the Original Code is Openbravo SL 
-* All portions are Copyright (C) 2001-2006 Openbravo SL 
-* All Rights Reserved. 
-* Contributor(s):  ______________________________________.
-************************************************************************
--->
-<REPORT>
-  <template file="ABCbPartner.html"/>
-  <PARAMETER id="paramToolBar" name="toolbar" default=""/>
-  <PARAMETER id="fieldCalendar" name="calendar" attribute="src" replace="es" default="en"/>
-  <PARAMETER id="paramDirectory" name="directory" default=""/>
-  <PARAMETER id="paramLanguage" name="paramLanguage" default=""/>
-  <PARAMETER id="paramFrom" name="from" attribute="value"/>
-  <PARAMETER id="paramTo" name="to" attribute="value"/>
-  <PARAMETER id="paramCategory" name="category" default=""/>
-  <PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
-  <PARAMETER id="tdleftTabs" name="leftTabs" default=""/>
-  <PARAMETER id="paramParentTabContainer" name="parentTabContainer" default=" "/>
-  <PARAMETER id="paramMainTabContainer" name="mainTabContainer" default=" "/>
-  <PARAMETER id="paramChildTabContainer" name="childTabContainer" default=" "/>
-  <PARAMETER id="tdtopButtons" name="navigationBar" default=""/>
-  <PARAMETER id="messageBoxID" name="messageType" attribute="class" replace="yy" default="HIDDEN"/>
-  <PARAMETER id="messageBoxIDTitle" name="messageTitle" default=""/>
-  <PARAMETER id="messageBoxIDMessage" name="messageMessage" default=""/>
-  <structure name="structure">
-    <FIELD id="fieldCliente">cliente</FIELD>
-    <FIELD id="fieldCantidad" format="integerEdition" default="0">cantidad</FIELD>
-    <FIELD id="fieldUnidad">unidad</FIELD>
-    <FIELD id="fieldImporte" format="euroInform" default="0">importe</FIELD>
-    <SUBREPORT id="reportCategory" name="reportCategory" report="org/openbravo/erpCommon/reference/List">
-      <ARGUMENT name="parameterListSelected" withId="paramCategory"/>
-    </SUBREPORT>
-    <FUNCTION id="fieldPrecioMedio" name="DIVIDE" arg1="fieldImporte" arg2="fieldCantidad" format="euroInform"/>
-    <SECTION id="sectionDetail"/>
-  </structure>
-  <DISCARD id="discard"/>
-</REPORT>
--- a/src/org/openbravo/erpCommon/ad_reports/ABCbPartner_data.xsql	Thu Jan 22 09:54:57 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-
-
-
-
-
-<SqlClass name="ABCbPartnerData" package="org.openbravo.erpCommon.ad_reports">
-  <SqlClassComment></SqlClassComment>
-  <SqlMethod name="select" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT CLIENTE,CANTIDAD, UNIDAD, IMPORTE FROM
-      (SELECT C_BPARTNER.NAME AS CLIENTE, SUM(C_INVOICELINE.QTYINVOICED) AS CANTIDAD, C_UOM.NAME AS UNIDAD, 
-      SUM(C_INVOICELINE.LINENETAMT) AS IMPORTE 
-      FROM C_INVOICELINE, C_INVOICE, C_BPARTNER, C_UOM, M_PRODUCT
-      WHERE C_INVOICE.C_INVOICE_ID = C_INVOICELINE.C_INVOICE_ID
-      AND C_INVOICE.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
-      AND M_PRODUCT.M_PRODUCT_ID = C_INVOICELINE.M_PRODUCT_ID
-      AND C_UOM.C_UOM_ID = C_INVOICELINE.C_UOM_ID
-      AND C_INVOICE.DATEINVOICED BETWEEN TO_DATE(?) AND TO_DATE(?)
-      AND 1=1
-      GROUP BY C_BPARTNER.NAME, C_UOM.NAME,C_INVOICELINE.C_UOM_ID) A
-      ORDER BY IMPORTE DESC, CLIENTE
-     ]]></Sql>
-    <Parameter name="from"/>
-    <Parameter name="to"/>
-    <Parameter name="category" optional="true" after="AND 1=1" text=" AND M_PRODUCT.M_PRODUCT_CATEGORY_ID = ? "/>
-  </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-    <Parameter name="importe"/>
-    <Parameter name="cantidad"/>
-  </SqlMethod>
-</SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/ABCproduct.html	Thu Jan 22 09:54:57 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,267 +0,0 @@
-<?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/Openbravo_ERP_250.css" id="paramCSS" />
-     
-    <script language="JavaScript" type="text/javascript" id="paramDirectory">
-      var baseDirectory = "../../../../../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 defaultLang = "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/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/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 onloadFunctions() {
-}
-</script>
-	<script language="JavaScript" type="text/javascript">
-	function onLoadDo(){
-		this.windowTables = new Array(
-		  new windowTableId('client')
-		);
-		setWindowTableParentElement();
-		this.tabsTables = new Array(
-		  new tabTableId('tdtopTabs')
-		);
-		setTabTableParentElement();
-		enableShortcuts('edition');
-		setBrowserAutoComplete(false);
-		
-		resizeArea();
-		updateMenuIcon('buttonMenu');
-
-		setWindowElementFocus('firstElement');
-	}
-
-	function onResizeDo(){
-		resizeArea();
-	}
-	</script>
-</head>
-    <body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
-
-<form method="post" action="ABCproduct.html" name="frmMain" id="form">
-  <input type="hidden" name="Command"></input>
-       <input type="hidden" name="Command" /> <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 width="90%" border="0">
-    <tr> 
-      <td width="13%" > <span >From</span></td>
-      <td width="13%"> <input type="text" name="inpFrom" id="paramFrom" size="10" maxlength="10" value=""  onkeyup="auto_complete_date(this);return true;"></input> 
-        <a href="#" onclick="showCalendar('frmMain.inpFrom', document.frmMain.inpFrom.value, false);return false;" onmouseout="window.status='';return true;" onmouseover="window.status='Show calendar';return true;" > 
-        <img width="16" height="16" alt="Calendar" title="Calendar" border="0" src="../../../../../web/images/BtnCal.gif" id="buttonCalendar"></img></a></td>
-      <td width="9%" > <span >To</span></td>
-      <td width="15%" > <input type="text" name="inpTo" id="paramTo" value="" size="10" maxlength="10"  onkeyup="auto_complete_date(this);return true;"></input> 
-        <a href="#" onclick="showCalendar('frmMain.inpTo', document.frmMain.inpTo.value, false);return false;" onmouseout="window.status='';return true;" onmouseover="window.status='Show calendar';return true;" > 
-        <img width="16" height="16" alt="Calendar" title="Calendar" border="0" src="../../../../../web/images/BtnCal.gif" id="buttonCalendar"></img></a></td>
-      <td width="19%" > <span >Product Category</span>&nbsp;</td>
-      <td width="23%"> <select name="inpCategory" id="inpCategory">
-          <option value=""> <div id="reportCategory"></div></option>
-        </select></td>
-      <td width="8%"> <a href="#" onclick="submitCommandForm('FIND');return false;" onmouseover="window.status='Results';return true;" onmouseout="window.status='';return true;" > 
-        <img width="16" height="16" src="../../../../../web/images/Find.jpg" alt="Results" title="Results" border="0" id="buttonResults"></img></a></td>
-    </tr>
-  </table>
-  <HR></HR>
-  <div id="selEliminar"> 
-    <table width="70%">
-      <tr  border="1" cellspacing="0" cellpadding="0" width="100%"> 
-        <td colspan="4">&nbsp;</td>
-      </tr>
-      <tr class="Border TableDetailHeader" border="1" cellspacing="0" cellpadding="0" width="100%"> 
-        <td width="41%" >PRODUCT</td> 
-        <td width="25%" >QUANTITY</td> 
-        <td width="15%" >MEDIUM PRICE</td> 
-        <td width="19%" >AMOUNT</td> 
-      </tr>
-      <div id="sectionDetail"> 
-        <tr  class="Border TableDetailRowEven" border="1" cellspacing="0" cellpadding="0" width="100%"> 
-          <td width="41%"  id="fieldProducto">xxFortrac</td>
-          <td width="25%"  id="fieldCantidad">xx10<span>&nbsp;</span> 
-            <span id="fieldUnidad">xxm2</span></td>
-          <td width="15%"  id="fieldPrecioMedio">xx77<span>&nbsp;&euro;</span></td>
-          <td width="19%"  id="fieldImporte">xx10002565<span>&nbsp;&euro;</span></td>
-        </tr>
-      </div>
-    </table>
-  </div>
-
-                      <!-- 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/ABCproduct.java	Thu Jan 22 09:54:57 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-package org.openbravo.erpCommon.ad_reports;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.openbravo.base.secureApp.HttpSecureAppServlet;
-import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.businessUtility.WindowTabs;
-import org.openbravo.erpCommon.utility.ComboTableData;
-import org.openbravo.erpCommon.utility.LeftTabsBar;
-import org.openbravo.erpCommon.utility.NavigationBar;
-import org.openbravo.erpCommon.utility.OBError;
-import org.openbravo.erpCommon.utility.ToolBar;
-import org.openbravo.erpCommon.utility.Utility;
-import org.openbravo.xmlEngine.XmlDocument;
-
-public class ABCproduct extends HttpSecureAppServlet {
-    private static final long serialVersionUID = 1L;
-
-    public void doPost(HttpServletRequest request, HttpServletResponse response)
-            throws IOException, ServletException {
-        VariablesSecureApp vars = new VariablesSecureApp(request);
-
-        if (vars.commandIn("DEFAULT")) {
-            String strFrom = vars.getGlobalVariable("inpFrom",
-                    "ABCproduct|From", "");
-            String strTo = vars.getGlobalVariable("inpTo", "ABCproduct|To", "");
-            String strCategory = vars.getGlobalVariable("inpCategory",
-                    "ABCproduct|Category", "");
-            printPageDataSheet(response, vars, strFrom, strTo, strCategory);
-        } else if (vars.commandIn("FIND")) {
-            String strFrom = vars.getRequestGlobalVariable("inpFrom",
-                    "ABCproduct|From");
-            String strTo = vars.getRequestGlobalVariable("inpTo",
-                    "ABCproduct|To");
-            String strCategory = vars.getGlobalVariable("inpCategory",
-                    "ABCproduct|Category", "");
-            printPageDataSheet(response, vars, strFrom, strTo, strCategory);
-        } else
-            pageError(response);
-    }
-
-    void printPageDataSheet(HttpServletResponse response,
-            VariablesSecureApp vars, String strFrom, String strTo,
-            String strCategory) throws IOException, ServletException {
-        if (log4j.isDebugEnabled())
-            log4j.debug("Output: dataSheet");
-        response.setContentType("text/html; charset=UTF-8");
-        PrintWriter out = response.getWriter();
-        XmlDocument xmlDocument = null;
-        ABCproductData[] data = null;
-        if (strFrom.equals("") || strTo.equals("")) {
-            String discard[] = { "selEliminar" };
-            xmlDocument = xmlEngine.readXmlTemplate(
-                    "org/openbravo/erpCommon/ad_reports/ABCproduct", discard)
-                    .createXmlDocument();
-            data = ABCproductData.set("0", "0");
-        } else {
-            xmlDocument = xmlEngine.readXmlTemplate(
-                    "org/openbravo/erpCommon/ad_reports/ABCproduct")
-                    .createXmlDocument();
-            data = ABCproductData.select(this, strFrom, strTo, strCategory);
-        }
-
-        ToolBar toolbar = new ToolBar(this, vars.getLanguage(), "ABCproduct",
-                false, "", "", "", false, "ad_reports", strReplaceWith, false,
-                true);
-        toolbar.prepareSimpleToolBarTemplate();
-        xmlDocument.setParameter("toolbar", toolbar.toString());
-        try {
-            WindowTabs tabs = new WindowTabs(this, vars,
-                    "org.openbravo.erpCommon.ad_reports.ABCbproduct");
-            xmlDocument.setParameter("parentTabContainer", tabs.parentTabs());
-            xmlDocument.setParameter("mainTabContainer", tabs.mainTabs());
-            xmlDocument.setParameter("childTabContainer", tabs.childTabs());
-            xmlDocument.setParameter("theme", vars.getTheme());
-            NavigationBar nav = new NavigationBar(this, vars.getLanguage(),
-                    "ABCproduct.html", classInfo.id, classInfo.type,
-                    strReplaceWith, tabs.breadcrumb());
-            xmlDocument.setParameter("navigationBar", nav.toString());
-            LeftTabsBar lBar = new LeftTabsBar(this, vars.getLanguage(),
-                    "ABCproduct.html", strReplaceWith);
-            xmlDocument.setParameter("leftTabs", lBar.manualTemplate());
-        } catch (Exception ex) {
-            throw new ServletException(ex);
-        }
-        {
-            OBError myMessage = vars.getMessage("ABCproduct");
-            vars.removeMessage("ABCproduct");
-            if (myMessage != null) {
-                xmlDocument.setParameter("messageType", myMessage.getType());
-                xmlDocument.setParameter("messageTitle", myMessage.getTitle());
-                xmlDocument.setParameter("messageMessage", myMessage
-                        .getMessage());
-            }
-        }
-
-        xmlDocument
-                .setParameter("calendar", vars.getLanguage().substring(0, 2));
-        xmlDocument.setParameter("directory", "var baseDirectory = \""
-                + strReplaceWith + "/\";\n");
-        xmlDocument.setParameter("paramLanguage", "defaultLang=\""
-                + vars.getLanguage() + "\";");
-        xmlDocument.setParameter("from", strFrom);
-        xmlDocument.setParameter("to", strTo);
-        xmlDocument.setParameter("category", strCategory);
-
-        try {
-            ComboTableData comboTableData = new ComboTableData(vars, this,
-                    "TABLEDIR", "M_Product_Category_ID", "", "", Utility
-                            .getContext(this, vars, "#User_Org", "ABCproduct"),
-                    Utility
-                            .getContext(this, vars, "#User_Client",
-                                    "ABCproduct"), 0);
-            Utility.fillSQLParameters(this, vars, null, comboTableData,
-                    "ABCproduct", "");
-            xmlDocument.setData("reportCategory", "liststructure",
-                    comboTableData.select(false));
-            comboTableData = null;
-        } catch (Exception ex) {
-            throw new ServletException(ex);
-        }
-
-        xmlDocument.setData("structure", data);
-        out.println(xmlDocument.print());
-        out.close();
-    }
-
-    public String getServletInfo() {
-        return "Servlet ABCproduct. This Servlet was made by Eduardo Argal";
-    } // end of getServletInfo() method
-}
--- a/src/org/openbravo/erpCommon/ad_reports/ABCproduct.xml	Thu Jan 22 09:54:57 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-*************************************************************************
-* The contents of this file are subject to the Openbravo  Public  License
-* Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
-* Version 1.1  with a permitted attribution clause; you may not  use this
-* file except in compliance with the License. You  may  obtain  a copy of
-* the License at http://www.openbravo.com/legal/license.html 
-* Software distributed under the License  is  distributed  on  an "AS IS"
-* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-* License for the specific  language  governing  rights  and  limitations
-* under the License. 
-* The Original Code is Openbravo ERP. 
-* The Initial Developer of the Original Code is Openbravo SL 
-* All portions are Copyright (C) 2001-2006 Openbravo SL 
-* All Rights Reserved. 
-* Contributor(s):  ______________________________________.
-************************************************************************
--->
-<REPORT>
-  <template file="ABCproduct.html"/>
-  <PARAMETER id="paramToolBar" name="toolbar" default=""/>
-  <PARAMETER id="fieldCalendar" name="calendar" attribute="src" replace="es" default="en"/>
-  <PARAMETER id="paramDirectory" name="directory" default=""/>
-  <PARAMETER id="paramLanguage" name="paramLanguage" default=""/>
-  <PARAMETER id="paramFrom" name="from" attribute="value"/>
-  <PARAMETER id="paramTo" name="to" attribute="value"/>
-  <PARAMETER id="paramCategory" name="category" default=""/>
-  <PARAMETER id="keyMap" name="keyMap" default=""></PARAMETER>
-  <PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
-  <PARAMETER id="tdleftTabs" name="leftTabs" default=""/>
-  <PARAMETER id="paramParentTabContainer" name="parentTabContainer" default=" "/>
-  <PARAMETER id="paramMainTabContainer" name="mainTabContainer" default=" "/>
-  <PARAMETER id="paramChildTabContainer" name="childTabContainer" default=" "/>
-  <PARAMETER id="tdtopButtons" name="navigationBar" default=""/>
-  <PARAMETER id="messageBoxID" name="messageType" attribute="class" replace="yy" default="HIDDEN"/>
-  <PARAMETER id="messageBoxIDTitle" name="messageTitle" default=""/>
-  <PARAMETER id="messageBoxIDMessage" name="messageMessage" default=""/>
-  <structure name="structure">
-    <FIELD id="fieldProducto">product</FIELD>
-    <FIELD id="fieldCantidad" format="integerEdition" default="0">cantidad</FIELD>
-    <FIELD id="fieldUnidad">unidad</FIELD>
-    <FIELD id="fieldImporte" format="euroInform" default="0">importe</FIELD>
-    <SUBREPORT id="reportCategory" name="reportCategory" report="org/openbravo/erpCommon/reference/List">
-      <ARGUMENT name="parameterListSelected" withId="paramCategory"/>
-    </SUBREPORT>
-    <FUNCTION id="fieldPrecioMedio" name="DIVIDE" arg1="fieldImporte" arg2="fieldCantidad" format="euroInform"/>
-    <SECTION id="sectionDetail"/>
-  </structure>
-  <DISCARD id="discard"/>
-</REPORT>
--- a/src/org/openbravo/erpCommon/ad_reports/ABCproduct_data.xsql	Thu Jan 22 09:54:57 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-
-
-
-
-
-<SqlClass name="ABCproductData" package="org.openbravo.erpCommon.ad_reports">
-  <SqlClassComment></SqlClassComment>
-  <SqlMethod name="select" type="preparedStatement" return="multiple">
-    <SqlMethodComment></SqlMethodComment>
-    <Sql>
-    <![CDATA[
-      SELECT PRODUCT, CANTIDAD, UNIDAD, IMPORTE FROM(
-      SELECT M_PRODUCT.NAME AS PRODUCT, SUM(C_INVOICELINE.QTYINVOICED) AS CANTIDAD, C_UOM.NAME AS UNIDAD, 
-      SUM(C_INVOICELINE.LINENETAMT) AS IMPORTE 
-      FROM C_INVOICELINE, C_INVOICE, C_BPARTNER, M_PRODUCT, C_UOM
-      WHERE C_INVOICE.C_INVOICE_ID = C_INVOICELINE.C_INVOICE_ID
-      AND C_INVOICE.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
-      AND M_PRODUCT.M_PRODUCT_ID = C_INVOICELINE.M_PRODUCT_ID
-      AND C_UOM.C_UOM_ID = C_INVOICELINE.C_UOM_ID
-      AND C_INVOICE.DATEINVOICED BETWEEN TO_DATE(?) AND TO_DATE(?)
-      AND 1=1
-      GROUP BY M_PRODUCT.NAME, C_UOM.NAME) A
-      ORDER BY IMPORTE, PRODUCT
-     ]]></Sql>
-    <Parameter name="from"/>
-    <Parameter name="to"/>
-    <Parameter name="category" optional="true" after="AND 1=1" text=" AND M_PRODUCT.M_PRODUCT_CATEGORY_ID = ? "/>
-  </SqlMethod>
-  <SqlMethod name="set" type="constant" return="multiple">
-      <SqlMethodComment></SqlMethodComment>
-      <Sql></Sql>
-    <Parameter name="importe"/>
-    <Parameter name="cantidad"/>
-  </SqlMethod>
-</SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/GenerateModel347.java	Thu Jan 22 09:54:57 2009 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/GenerateModel347.java	Thu Jan 22 10:44:35 2009 +0000
@@ -92,7 +92,7 @@
                     strReplaceWith, tabs.breadcrumb());
             xmlDocument.setParameter("navigationBar", nav.toString());
             LeftTabsBar lBar = new LeftTabsBar(this, vars.getLanguage(),
-                    "ABCbPartner.html", strReplaceWith);
+                    "GenerateModel347.html", strReplaceWith);
             xmlDocument.setParameter("leftTabs", lBar.manualTemplate());
         } catch (Exception ex) {
             throw new ServletException(ex);
--- a/src/org/openbravo/erpCommon/ad_reports/RptM_Production.java	Thu Jan 22 09:54:57 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-package org.openbravo.erpCommon.ad_reports;
-
-import java.io.IOException;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.openbravo.base.secureApp.HttpSecureAppServlet;
-import org.openbravo.base.secureApp.VariablesSecureApp;
-
-public class RptM_Production extends HttpSecureAppServlet {
-    private static final long serialVersionUID = 1L;
-
-    public void init(ServletConfig config) {
-        super.init(config);
-        boolHist = false;
-    }
-
-    public void doPost(HttpServletRequest request, HttpServletResponse response)
-            throws IOException, ServletException {
-        VariablesSecureApp vars = new VariablesSecureApp(request);
-
-        if (vars.commandIn("DEFAULT")) {
-            String strId = vars.getStringParameter("inpmProductionlineId");
-            RptMProductionData[] data = RptMProductionData.select(this, strId);
-            vars.removeSessionValue("Rpt_Etiquetas|cBpartnerId");
-            vars.removeSessionValue("Rpt_Etiquetas|mProductId");
-            vars.removeSessionValue("Rpt_Etiquetas|mAttributesetinstanceId");
-            vars.removeSessionValue("Rpt_Etiquetas|qty");
-            if (data != null && data.length > 0) {
-                vars.setSessionValue("Rpt_Etiquetas|mProductId",
-                        data[0].mProductId);
-                vars.setSessionValue("Rpt_Etiquetas|mAttributesetinstanceId",
-                        data[0].mAttributesetinstanceId);
-                vars.setSessionValue("Rpt_Etiquetas|qty", data[0].qty);
-            }
-            response.sendRedirect(strDireccion
-                    + "/ad_reports/Rpt_Etiquetas.html");
-        } else
-            pageError(response);
-    }
-
-    public String getServletInfo() {
-        return "Servlet configuration";
-    } // end of the getServletInfo() method
-}
--- a/src/org/openbravo/erpCommon/ad_reports/RptM_Production_data.xsql	Thu Jan 22 09:54:57 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-
-
-<SqlClass name="RptMProductionData" package="org.openbravo.erpCommon.ad_reports">
-   <SqlClassComment>Clase RptMProductionData
-   autor@ Pablo Sarobe
-   version@ 3/11/2003
-   </SqlClassComment>
-   <SqlMethod name="select" type="preparedStatement" return="multiple">
-      <SqlMethodComment>Devuelve la cabecera de la organizaciĆ³n en la factura</SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT M_PRODUCT_ID, M_ATTRIBUTESETINSTANCE_ID, ABS(MOVEMENTQTY) AS QTY 
-        FROM M_PRODUCTIONLINE 
-        WHERE M_PRODUCTIONLINE_ID = ?
-        ]]>
-        </Sql>
-        <Parameter name="mProductionLineId"/>
-   </SqlMethod>
-</SqlClass>
--- a/src/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.java	Thu Jan 22 09:54:57 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-package org.openbravo.erpCommon.ad_reports;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.openbravo.base.secureApp.HttpSecureAppServlet;
-import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.businessUtility.WindowTabs;
-import org.openbravo.erpCommon.utility.LeftTabsBar;
-import org.openbravo.erpCommon.utility.NavigationBar;
-import org.openbravo.erpCommon.utility.OBError;
-import org.openbravo.erpCommon.utility.ToolBar;
-import org.openbravo.utils.CommPortsOpen;
-import org.openbravo.xmlEngine.XmlDocument;
-
-public class Rpt_Etiquetas extends HttpSecureAppServlet {
-    private static final long serialVersionUID = 1L;
-
-    public void init(ServletConfig config) {
-        super.init(config);
-        boolHist = false;
-    }
-
-    public void doPost(HttpServletRequest request, HttpServletResponse response)
-            throws IOException, ServletException {
-        VariablesSecureApp vars = new VariablesSecureApp(request);
-
-        if (vars.commandIn("DEFAULT")) {
-            vars.getGlobalVariable("inpwindowId", "Rpt_Etiquetas|windowID", "");
-            String strcBpartnerId = vars.getGlobalVariable("inpcBpartnerId",
-                    "Rpt_Etiquetas|cBpartnerId", "");
-            String strmProductId = vars.getGlobalVariable("inpmProductId",
-                    "Rpt_Etiquetas|mProductId", "");
-            String strmAttributesetinstanceId = vars.getGlobalVariable(
-                    "inpmAttributesetinstanceId",
-                    "Rpt_Etiquetas|mAttributesetinstanceId", "");
-            String strqty = vars.getGlobalVariable("inpqty",
-                    "Rpt_Etiquetas|qty", "");
-            printPage(response, vars, strcBpartnerId, strmProductId,
-                    strmAttributesetinstanceId, strqty);
-        } else if (vars.commandIn("PRINT_LABEL")) {
-            String strWindow = vars.getGlobalVariable("inpwindowId",
-                    "Rpt_Etiquetas|windowID", "");
-            String strBpartner = vars.getRequestGlobalVariable("inpBpartnerId",
-                    "Rpt_Etiquetas|cBpartnerId");
-            String strProduct = vars.getRequestGlobalVariable("inpmProductId",
-                    "Rpt_Etiquetas|mProductId");
-            String strAttribute = vars.getRequestGlobalVariable(
-                    "inpmAttributesetinstanceId",
-                    "Rpt_Etiquetas|mAttributesetinstanceId");
-            String strPageNumber = vars.getRequestGlobalVariable(
-                    "inpNumberPages", "Rpt_Etiquetas|qty");
-            String label = compoundLabel(vars, strBpartner, strProduct,
-                    strAttribute, strPageNumber);
-            try {
-                CommPortsOpen comm = new CommPortsOpen();
-                comm.transmit(label);
-                comm.close();
-                if (strWindow.equals(""))
-                    bdError(response, "ProcessOK", vars.getLanguage());
-                else
-                    printPageClosePopUpWindow(response, vars);
-            } catch (Exception e) {
-                log4j.error(e);
-                advise(response, "Error", e.toString());
-            }
-        } else
-            pageError(response);
-    }
-
-    void printPage(HttpServletResponse response, VariablesSecureApp vars,
-            String strcBpartnerId, String strmProductId,
-            String strmAttributesetinstanceId, String strqty)
-            throws IOException, ServletException {
-        if (log4j.isDebugEnabled())
-            log4j.debug("Output: dataSheet");
-        response.setContentType("text/html; charset=UTF-8");
-        PrintWriter out = response.getWriter();
-        XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
-                "org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas_Config")
-                .createXmlDocument();
-
-        xmlDocument.setParameter("directory", "var baseDirectory = \""
-                + strReplaceWith + "/\";\n");
-        xmlDocument.setParameter("paramLanguage", "defaultLang=\""
-                + vars.getLanguage() + "\";");
-        xmlDocument.setParameter("product", strmProductId);
-        xmlDocument.setParameter("productName", RptEtiquetasData.selectProduct(
-                this, strmProductId));
-        xmlDocument.setParameter("bpartner", strcBpartnerId);
-        xmlDocument.setParameter("bpartnerName", RptEtiquetasData
-                .selectBPartner(this, strcBpartnerId));
-        xmlDocument.setParameter("attribute", strmAttributesetinstanceId);
-        xmlDocument.setParameter("attributeName", RptEtiquetasData
-                .selectAttribute(this, strmAttributesetinstanceId));
-        xmlDocument.setParameter("numberPages", strqty);
-
-        ToolBar toolbar = new ToolBar(this, vars.getLanguage(), "RptEtiquetas",
-                false, "", "", "", false, "ad_reports", strReplaceWith, false,
-                true);
-        toolbar.prepareSimpleToolBarTemplate();
-        xmlDocument.setParameter("toolbar", toolbar.toString());
-        try {
-            WindowTabs tabs = new WindowTabs(this, vars,
-                    "org.openbravo.erpCommon.ad_reports.Rpt_Etiquetas");
-            xmlDocument.setParameter("parentTabContainer", tabs.parentTabs());
-            xmlDocument.setParameter("mainTabContainer", tabs.mainTabs());
-            xmlDocument.setParameter("childTabContainer", tabs.childTabs());
-            xmlDocument.setParameter("theme", vars.getTheme());
-            NavigationBar nav = new NavigationBar(this, vars.getLanguage(),
-                    "Rpt_Etiquetas_Config.html", classInfo.id, classInfo.type,
-                    strReplaceWith, tabs.breadcrumb());
-            xmlDocument.setParameter("navigationBar", nav.toString());
-            LeftTabsBar lBar = new LeftTabsBar(this, vars.getLanguage(),
-                    "Rpt_Etiquetas_Config.html", strReplaceWith);
-            xmlDocument.setParameter("leftTabs", lBar.manualTemplate());
-        } catch (Exception ex) {
-            throw new ServletException(ex);
-        }
-        {
-            OBError myMessage = vars.getMessage("Rpt_Etiquetas");
-            vars.removeMessage("Rpt_Etiquetas");
-            if (myMessage != null) {
-                xmlDocument.setParameter("messageType", myMessage.getType());
-                xmlDocument.setParameter("messageTitle", myMessage.getTitle());
-                xmlDocument.setParameter("messageMessage", myMessage
-                        .getMessage());
-            }
-        }
-
-        out.println(xmlDocument.print());
-        out.close();
-    }
-
-    String compoundLabel(VariablesSecureApp vars, String strBpartner,
-            String strProduct, String strAttribute, String strPageNumber)
-            throws IOException, ServletException {
-        if (log4j.isDebugEnabled())
-            log4j.debug("Output: dataSheet");
-
-        XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
-                "org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas")
-                .createXmlDocument();
-        RptEtiquetasData[] data = RptEtiquetasData.select(this, strBpartner,
-                strProduct);
-
-        xmlDocument.setParameter("bPartnerName", RptEtiquetasData
-                .selectBPartner(this, strBpartner));
-        if (data != null && data.length > 0) {
-            xmlDocument.setParameter("productName", data[0].name);
-            xmlDocument.setParameter("productDescription", data[0].description);
-            xmlDocument.setParameter("productEAN", data[0].upc);
-        }
-        RptEtiquetasData[] data2 = RptEtiquetasData.selectAttributeComplete(
-                this, strAttribute);
-        if (data2 != null && data2.length > 0) {
-            xmlDocument.setParameter("productAttribute", data2[0].lot);
-            xmlDocument.setParameter("productAttributeCad",
-                    data2[0].guaranteedate);
-        }
-
-        xmlDocument.setParameter("numberPages", strPageNumber);
-
-        return (xmlDocument.print());
-    }
-
-    public String getServletInfo() {
-        return "Servlet Etiquetas. This Servlet was made by Firi";
-    } // end of the getServletInfo() method
-}
--- a/src/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.srpt	Thu Jan 22 09:54:57 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-
-<FIELDS_TMP>
-
-N
-q800
-Q1119,24+0
-S3
-D8
-ZT
-A99,1062,3,4,2,2,N,"<PARAMETER_TMP id="paramBPartnerName">LE MOULIN DU PIVERT</PARAMETER_TMP>"
-A171,1062,3,4,4,2,N,"<PARAMETER_TMP id="paramProductName">BISCOTTE A LA FARINE BLANCHE</PARAMETER_TMP>"
-B410,1021,3,E30,4,4,343,B,"<PARAMETER_TMP id="paramProductEAN">123456789012</PARAMETER_TMP>"
-A558,463,3,4,3,2,N,"L:<PARAMETER_TMP id="paramProductAttribute">Lote 20031203</PARAMETER_TMP>"
-A264,1062,3,4,3,2,N,"<PARAMETER_TMP id="paramProductDescription">12 BOITES DE 270 GR.</PARAMETER_TMP>"
-A339,1056,3,4,3,2,N,"Cons.Pref.:<PARAMETER_TMP id="paramProductAttributeCad">Cad 20031203</PARAMETER_TMP>"
-P<PARAMETER_TMP id="paramNumberPages">1</PARAMETER_TMP>
-</FIELDS_TMP>
--- a/src/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas.xml	Thu Jan 22 09:54:57 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-*************************************************************************
-* The contents of this file are subject to the Openbravo  Public  License
-* Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
-* Version 1.1  with a permitted attribution clause; you may not  use this
-* file except in compliance with the License. You  may  obtain  a copy of
-* the License at http://www.openbravo.com/legal/license.html 
-* Software distributed under the License  is  distributed  on  an "AS IS"
-* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-* License for the specific  language  governing  rights  and  limitations
-* under the License. 
-* The Original Code is Openbravo ERP. 
-* The Initial Developer of the Original Code is Openbravo SL 
-* All portions are Copyright (C) 2001-2006 Openbravo SL 
-* All Rights Reserved. 
-* Contributor(s):  ______________________________________.
-************************************************************************
--->
-
-
-<REPORT>
-  <template file="Rpt_Etiquetas.srpt"/>
-
-  <PARAMETER id="paramBPartnerName" name="bPartnerName" default=""/>
-  <PARAMETER id="paramProductName" name="productName" default=""/>
-  <PARAMETER id="paramProductDescription" name="productDescription" default=""/>
-  <PARAMETER id="paramProductEAN" name="productEAN" default=""/>
-  <PARAMETER id="paramProductAttribute" name="productAttribute" default=""/>
-  <PARAMETER id="paramProductAttributeCad" name="productAttributeCad" default=""/>
-  <PARAMETER id="paramNumberPages" name="numberPages" default="1"/>
-
-  <DISCARD id="discard"/>
-</REPORT>
--- a/src/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas_Config.html	Thu Jan 22 09:54:57 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,364 +0,0 @@
-<?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>Print label</title>
-    <link rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico" type="image/x-icon" />
-    <link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Openbravo_ERP_250.css" id="paramCSS" />
-    <script language="JavaScript" type="text/javascript" id="paramDirectory">
-    //<![CDATA[
-var baseDirectory = "../../../../../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">
-    //<![CDATA[
-  var defaultLang = "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/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/dojoConfig.js" type="text/javascript">
-    </script>
-    <script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript">
-    </script>
-    <script type="text/javascript">
-    //<![CDATA[
-      dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
-    //]]>
-    </script>
-    <script language="JavaScript" type="text/javascript">
-    //<![CDATA[
-
-function debugSearch(key, text, keyField) {
-  if (keyField=="inpmProductId") {
-          document.frmMain.inpmAttributesetinstanceId.value="";
-    document.frmMain.inpmAttributesetinstanceId_D.value="";
-  }
-return true;
-}
-    //]]>
-    </script>
-  	<script language="JavaScript" type="text/javascript">
-	function onLoadDo(){
-		this.windowTables = new Array(
-		  new windowTableId('client', 'buttonSearch')
-		);
-		setWindowTableParentElement();
-		this.tabsTables = new Array(
-		  new tabTableId('tdtopTabs')
-		);
-		setTabTableParentElement();
-		enableShortcuts('edition');
-		setBrowserAutoComplete(false);
-		
-		resizeArea();
-		updateMenuIcon('buttonMenu');
-
-		setWindowElementFocus('firstElement');
-	}
-
-	function onResizeDo(){
-		resizeArea();
-	}
-	</script>
-</head>
-
-  <body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
-    <form method="post" action="Rpt_Etiquetas.html" name="frmMain" id="form">
-      <input type="hidden" name="Command" /> <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">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="inpBpartnerId" value="" id="fieldBpartner"></input> 
-                          <input class="dojoValidateValid TextBox_btn_TwoCells_width" type="text"  name="inpBpartnerId_DES" maxlength="20" value="" id="fieldBpartnerName"></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.html', 'SELECTOR_BUSINESS', false, 'frmMain', 'inpBpartnerId', 'inpBpartnerId_DES', document.frmMain.inpBpartnerId_DES.value);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">Product</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="inpmProductId" value="" id="fieldProduct"></input> 
-                          <input class="dojoValidateValid TextBox_btn_TwoCells_width" type="text"  name="inpmProductId_D" maxlength="20" value="" id="fieldProductName"></input>
-                        </td>
-                        <td class="FieldButton_ContentCell">
-                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Product'; 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/Product.html', null, false, 'frmMain', 'inpmProductId', 'inpmProductId_D', document.frmMain.inpmProductId_D.value);return false;">
-                          <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Product';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
-                            <tr>
-                              <td class="FieldButton_bg">
-                                <img alt="Product" class="FieldButton_Icon FieldButton_Icon_Product" title="Product" src="../../../../../web/images/blank.gif" border="0"></img>
-                              </td>
-                            </tr>
-                          </table>
-                          </a>
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                </tr>
-
-				<tr>
-                  <td class="TitleCell"><span class="LabelText">Attribute</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="inpmAttributesetinstanceId" value="" id="fieldAttribute"></input> 
-                          <input class="dojoValidateValid TextBox_btn_TwoCells_width" type="text"  name="inpmAttributesetinstanceId_D" maxlength="20" value="" id="fieldAttributeName"></input>
-                        </td>
-                        <td class="FieldButton_ContentCell">
-                          <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Attribute'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;"  onclick="openPAttribute(null, null, '../info/AttributeSetInstance.html', null, false, 'frmMain', 'inpmAttributesetinstanceId', 'inpmAttributesetinstanceId_D', document.frmMain.inpmAttributesetinstanceId_D.value, 'WindowID', 'Rpt_Etiquetas', 'inpKeyValue', document.frmMain.inpmAttributesetinstanceId.value, 'inpwindowId', 'Rpt_Etiquetas', 'inpProduct', document.frmMain.inpmProductId.value);return false;">
-                          <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Attribute';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
-                            <tr>
-                              <td class="FieldButton_bg">
-                                <img alt="Attribute" class="FieldButton_Icon FieldButton_Icon_AttributeSetInstance" title="Attribute" src="../../../../../web/images/blank.gif" border="0"></img>
-                              </td>
-                            </tr>
-                          </table>
-                          </a>
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                  <td class="TitleCell"><span class="LabelText">Page</span></td>
-                  <td class="TextBox_btn_ContentCell" colspan="2">
-                    <table border="0" cellpadding="0" cellspacing="0" class="TextBox_ContentCell">
-    					<tr>
-      						<td>
-        					<input type="text" class="dojoValidateValid TextBox_OneCell_width" value="main" maxlength="40" id="fieldNumberPages" name="inpNumberPages"></input>
-      						</td>
-    					</tr>
-				    </table>
-                  </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('PRINT_LABEL');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>
-
-
-                      <!-- 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/Rpt_Etiquetas_Config.xml	Thu Jan 22 09:54:57 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-*************************************************************************
-* The contents of this file are subject to the Openbravo  Public  License
-* Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
-* Version 1.1  with a permitted attribution clause; you may not  use this
-* file except in compliance with the License. You  may  obtain  a copy of
-* the License at http://www.openbravo.com/legal/license.html 
-* Software distributed under the License  is  distributed  on  an "AS IS"
-* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-* License for the specific  language  governing  rights  and  limitations
-* under the License. 
-* The Original Code is Openbravo ERP. 
-* The Initial Developer of the Original Code is Openbravo SL 
-* All portions are Copyright (C) 2001-2006 Openbravo SL 
-* All Rights Reserved. 
-* Contributor(s):  ______________________________________.
-************************************************************************
--->
-
-
-<REPORT>
-  <template file="Rpt_Etiquetas_Config.html"/>
-
-  <PARAMETER id="paramDirectory" name="directory" default=""/>
-  <PARAMETER id="paramLanguage" name="paramLanguage" default=""/>
-
-  <PARAMETER id="fieldBPartner" name="bpartner" attribute="value"/>
-  <PARAMETER id="fieldBpartnerName" name="bpartnerName" attribute="value"/>
-  <PARAMETER id="fieldProduct" name="product" attribute="value"/>
-  <PARAMETER id="fieldProductName" name="productName" attribute="value"/>
-  <PARAMETER id="fieldAttribute" name="attribute" attribute="value"/>
-  <PARAMETER id="fieldAttributeName" name="attributeName" attribute="value"/>
-  <PARAMETER id="fieldNumberPages" name="numberPages" attribute="value"/>
-
-  <PARAMETER id="paramToolBar" name="toolbar" default=""/>
-  <PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
-  <PARAMETER id="tdleftTabs" name="leftTabs" default=""/>
-  <PARAMETER id="paramParentTabContainer" name="parentTabContainer" default=" "/>
-  <PARAMETER id="paramMainTabContainer" name="mainTabContainer" default=" "/>
-  <PARAMETER id="paramChildTabContainer" name="childTabContainer" default=" "/>
-  <PARAMETER id="tdtopButtons" name="navigationBar" default=""/>
-  <PARAMETER id="messageBoxID" name="messageType" attribute="class" replace="yy" default="HIDDEN"/>
-  <PARAMETER id="messageBoxIDTitle" name="messageTitle" default=""/>
-  <PARAMETER id="messageBoxIDMessage" name="messageMessage" default=""/>
-
-  <DISCARD id="discard"/>
-
-</REPORT>
--- a/src/org/openbravo/erpCommon/ad_reports/Rpt_Etiquetas_data.xsql	Thu Jan 22 09:54:57 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-
-
-<SqlClass name="RptEtiquetasData" package="org.openbravo.erpCommon.ad_reports">
-   <SqlClassComment>Clase RptEtiquetasData
-   autor@ Fernando Iriazabal
-   version@ 06/08/2004
-   </SqlClassComment>
-   <SqlMethod name="select" type="preparedStatement" return="multiple">
-      <SqlMethodComment>Devuelve las lineas de albaran</SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT M_PRODUCT.M_PRODUCT_ID AS ID, COALESCE(M_PRODUCT_CUSTOMER.NAME, M_PRODUCT.NAME) AS NAME, 
-        COALESCE(M_PRODUCT_CUSTOMER.DESCRIPTION, M_PRODUCT.DESCRIPTION) AS DESCRIPTION, COALESCE(M_PRODUCT_CUSTOMER.UPC, M_PRODUCT.UPC) AS UPC, 
-        '' AS LOT, '' AS GUARANTEEDATE
-        FROM M_PRODUCT LEFT JOIN M_PRODUCT_CUSTOMER on M_PRODUCT.M_PRODUCT_ID = M_PRODUCT_CUSTOMER.M_PRODUCT_ID AND M_PRODUCT_CUSTOMER.C_BPARTNER_ID = ?
-        WHERE M_PRODUCT.M_PRODUCT_ID = ?
-        ]]>
-        </Sql>
-        <Parameter name="cBpartnerId"/>
-        <Parameter name="mProductId"/>
-   </SqlMethod>
-   <SqlMethod name="selectProduct" type="preparedStatement" return="String" default="">
-      <SqlMethodComment>Devuelve las lineas de albaran</SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT NAME
-        FROM M_PRODUCT
-        WHERE M_PRODUCT_ID = ?
-        ]]>
-        </Sql>
-        <Parameter name="mProductId"/>
-   </SqlMethod>
-   <SqlMethod name="selectBPartner" type="preparedStatement" return="String" default="">
-      <SqlMethodComment>Devuelve las lineas de albaran</SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT NAME
-        FROM C_BPARTNER
-        WHERE C_BPARTNER_ID = ?
-        ]]>
-        </Sql>
-        <Parameter name="cBpartnerId"/>
-   </SqlMethod>
-   <SqlMethod name="selectAttribute" type="preparedStatement" return="String" default="">
-      <SqlMethodComment>Devuelve las lineas de albaran</SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT DESCRIPTION
-        FROM M_ATTRIBUTESETINSTANCE
-        WHERE M_ATTRIBUTESETINSTANCE_ID = ?
-        ]]>
-        </Sql>
-        <Parameter name="mAttributesetinstanceId"/>
-   </SqlMethod>
-   <SqlMethod name="selectAttributeComplete" type="preparedStatement" return="multiple">
-      <SqlMethodComment>Devuelve las lineas de albaran</SqlMethodComment>
-      <Sql>
-      <![CDATA[
-        SELECT DESCRIPTION, LOT, GUARANTEEDATE
-        FROM M_ATTRIBUTESETINSTANCE
-        WHERE M_ATTRIBUTESETINSTANCE_ID = ?
-        ]]>
-        </Sql>
-        <Parameter name="mAttributesetinstanceId"/>
-   </SqlMethod>
-</SqlClass>