Merged changes from ajaxgrids branch.
authorIván Perdomo <ivan.perdomo@openbravo.com>
Mon, 21 Apr 2008 19:06:47 +0000
changeset 712 aa0c40278c5a
parent 711 4e8209a9d749
child 713 3471a641f6d1
Merged changes from ajaxgrids branch.
database/sourcedata/AD_MESSAGE.xml
database/sourcedata/AD_MESSAGE_TRL.xml
database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
database/sourcedata/AD_REF_SEARCH_COLUMN.xml
src/org/openbravo/erpCommon/info/Account.html
src/org/openbravo/erpCommon/info/Account.java
src/org/openbravo/erpCommon/info/Account.xml
src/org/openbravo/erpCommon/info/Account_F1.html
src/org/openbravo/erpCommon/info/Account_F1.xml
src/org/openbravo/erpCommon/info/Account_F2.html
src/org/openbravo/erpCommon/info/Account_F2.xml
src/org/openbravo/erpCommon/info/Account_F3.html
src/org/openbravo/erpCommon/info/Account_F3.xml
src/org/openbravo/erpCommon/info/Account_FS.html
src/org/openbravo/erpCommon/info/Account_FS.xml
src/org/openbravo/erpCommon/info/Account_data.xsql
src/org/openbravo/erpCommon/info/BusinessPartner.html
src/org/openbravo/erpCommon/info/BusinessPartner.java
src/org/openbravo/erpCommon/info/BusinessPartner.xml
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.html
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.java
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.xml
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_F1.html
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_F1.xml
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_F2.html
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_F2.xml
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_F3.html
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_F3.xml
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_FS.html
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_FS.xml
src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_data.xsql
src/org/openbravo/erpCommon/info/BusinessPartner_F1.html
src/org/openbravo/erpCommon/info/BusinessPartner_F1.xml
src/org/openbravo/erpCommon/info/BusinessPartner_F2.html
src/org/openbravo/erpCommon/info/BusinessPartner_F2.xml
src/org/openbravo/erpCommon/info/BusinessPartner_F3.html
src/org/openbravo/erpCommon/info/BusinessPartner_F3.xml
src/org/openbravo/erpCommon/info/BusinessPartner_FS.html
src/org/openbravo/erpCommon/info/BusinessPartner_FS.xml
src/org/openbravo/erpCommon/info/BusinessPartner_data.xsql
src/org/openbravo/erpCommon/info/CashJournal_F1.html
src/org/openbravo/erpCommon/info/DebtPayment.html
src/org/openbravo/erpCommon/info/DebtPayment.java
src/org/openbravo/erpCommon/info/DebtPayment.xml
src/org/openbravo/erpCommon/info/DebtPayment_F1.html
src/org/openbravo/erpCommon/info/DebtPayment_F1.xml
src/org/openbravo/erpCommon/info/DebtPayment_F2.html
src/org/openbravo/erpCommon/info/DebtPayment_F2.xml
src/org/openbravo/erpCommon/info/DebtPayment_F3.html
src/org/openbravo/erpCommon/info/DebtPayment_F3.xml
src/org/openbravo/erpCommon/info/DebtPayment_FS.html
src/org/openbravo/erpCommon/info/DebtPayment_FS.xml
src/org/openbravo/erpCommon/info/DebtPayment_data.xsql
src/org/openbravo/erpCommon/info/Invoice.html
src/org/openbravo/erpCommon/info/Invoice.java
src/org/openbravo/erpCommon/info/Invoice.xml
src/org/openbravo/erpCommon/info/InvoiceLine.html
src/org/openbravo/erpCommon/info/InvoiceLine.java
src/org/openbravo/erpCommon/info/InvoiceLine.xml
src/org/openbravo/erpCommon/info/InvoiceLine_F1.html
src/org/openbravo/erpCommon/info/InvoiceLine_F1.xml
src/org/openbravo/erpCommon/info/InvoiceLine_F2.html
src/org/openbravo/erpCommon/info/InvoiceLine_F2.xml
src/org/openbravo/erpCommon/info/InvoiceLine_F3.html
src/org/openbravo/erpCommon/info/InvoiceLine_F3.xml
src/org/openbravo/erpCommon/info/InvoiceLine_FS.html
src/org/openbravo/erpCommon/info/InvoiceLine_FS.xml
src/org/openbravo/erpCommon/info/InvoiceLine_data.xsql
src/org/openbravo/erpCommon/info/Invoice_F1.html
src/org/openbravo/erpCommon/info/Invoice_F1.xml
src/org/openbravo/erpCommon/info/Invoice_F2.html
src/org/openbravo/erpCommon/info/Invoice_F2.xml
src/org/openbravo/erpCommon/info/Invoice_F3.html
src/org/openbravo/erpCommon/info/Invoice_F3.xml
src/org/openbravo/erpCommon/info/Invoice_FS.html
src/org/openbravo/erpCommon/info/Invoice_FS.xml
src/org/openbravo/erpCommon/info/Invoice_data.xsql
src/org/openbravo/erpCommon/info/Locator.html
src/org/openbravo/erpCommon/info/Locator.java
src/org/openbravo/erpCommon/info/Locator.xml
src/org/openbravo/erpCommon/info/Locator_F1.html
src/org/openbravo/erpCommon/info/Locator_F1.xml
src/org/openbravo/erpCommon/info/Locator_F2.html
src/org/openbravo/erpCommon/info/Locator_F2.xml
src/org/openbravo/erpCommon/info/Locator_F3.html
src/org/openbravo/erpCommon/info/Locator_F3.xml
src/org/openbravo/erpCommon/info/Locator_FS.html
src/org/openbravo/erpCommon/info/Locator_FS.xml
src/org/openbravo/erpCommon/info/Locator_data.xsql
src/org/openbravo/erpCommon/info/Product.html
src/org/openbravo/erpCommon/info/Product.java
src/org/openbravo/erpCommon/info/Product.xml
src/org/openbravo/erpCommon/info/ProductComplete.html
src/org/openbravo/erpCommon/info/ProductComplete.java
src/org/openbravo/erpCommon/info/ProductComplete.xml
src/org/openbravo/erpCommon/info/ProductComplete_F1.html
src/org/openbravo/erpCommon/info/ProductComplete_F1.xml
src/org/openbravo/erpCommon/info/ProductComplete_F2.html
src/org/openbravo/erpCommon/info/ProductComplete_F2.xml
src/org/openbravo/erpCommon/info/ProductComplete_F3.html
src/org/openbravo/erpCommon/info/ProductComplete_F3.xml
src/org/openbravo/erpCommon/info/ProductComplete_FS.html
src/org/openbravo/erpCommon/info/ProductComplete_FS.xml
src/org/openbravo/erpCommon/info/ProductComplete_data.xsql
src/org/openbravo/erpCommon/info/ProductMultiple.html
src/org/openbravo/erpCommon/info/ProductMultiple.java
src/org/openbravo/erpCommon/info/ProductMultiple.xml
src/org/openbravo/erpCommon/info/ProductMultiple_F1.html
src/org/openbravo/erpCommon/info/ProductMultiple_F1.xml
src/org/openbravo/erpCommon/info/ProductMultiple_F2.html
src/org/openbravo/erpCommon/info/ProductMultiple_F2.xml
src/org/openbravo/erpCommon/info/ProductMultiple_F3.html
src/org/openbravo/erpCommon/info/ProductMultiple_F3.xml
src/org/openbravo/erpCommon/info/ProductMultiple_FS.html
src/org/openbravo/erpCommon/info/ProductMultiple_FS.xml
src/org/openbravo/erpCommon/info/ProductMultiple_data.xsql
src/org/openbravo/erpCommon/info/Product_F1.html
src/org/openbravo/erpCommon/info/Product_F1.xml
src/org/openbravo/erpCommon/info/Product_F2.html
src/org/openbravo/erpCommon/info/Product_F2.xml
src/org/openbravo/erpCommon/info/Product_F3.html
src/org/openbravo/erpCommon/info/Product_F3.xml
src/org/openbravo/erpCommon/info/Product_FS.html
src/org/openbravo/erpCommon/info/Product_FS.xml
src/org/openbravo/erpCommon/info/Product_data.xsql
src/org/openbravo/erpCommon/info/Project.html
src/org/openbravo/erpCommon/info/Project.java
src/org/openbravo/erpCommon/info/Project.xml
src/org/openbravo/erpCommon/info/Project_F1.html
src/org/openbravo/erpCommon/info/Project_F1.xml
src/org/openbravo/erpCommon/info/Project_F2.html
src/org/openbravo/erpCommon/info/Project_F2.xml
src/org/openbravo/erpCommon/info/Project_F3.html
src/org/openbravo/erpCommon/info/Project_F3.xml
src/org/openbravo/erpCommon/info/Project_FS.html
src/org/openbravo/erpCommon/info/Project_FS.xml
src/org/openbravo/erpCommon/info/Project_data.xsql
src/org/openbravo/erpCommon/info/SalesOrder.html
src/org/openbravo/erpCommon/info/SalesOrder.java
src/org/openbravo/erpCommon/info/SalesOrder.xml
src/org/openbravo/erpCommon/info/SalesOrderLine.html
src/org/openbravo/erpCommon/info/SalesOrderLine.java
src/org/openbravo/erpCommon/info/SalesOrderLine.xml
src/org/openbravo/erpCommon/info/SalesOrderLine_F1.html
src/org/openbravo/erpCommon/info/SalesOrderLine_F1.xml
src/org/openbravo/erpCommon/info/SalesOrderLine_F2.html
src/org/openbravo/erpCommon/info/SalesOrderLine_F2.xml
src/org/openbravo/erpCommon/info/SalesOrderLine_F3.html
src/org/openbravo/erpCommon/info/SalesOrderLine_F3.xml
src/org/openbravo/erpCommon/info/SalesOrderLine_FS.html
src/org/openbravo/erpCommon/info/SalesOrderLine_FS.xml
src/org/openbravo/erpCommon/info/SalesOrderLine_data.xsql
src/org/openbravo/erpCommon/info/SalesOrder_F1.html
src/org/openbravo/erpCommon/info/SalesOrder_F1.xml
src/org/openbravo/erpCommon/info/SalesOrder_F2.html
src/org/openbravo/erpCommon/info/SalesOrder_F2.xml
src/org/openbravo/erpCommon/info/SalesOrder_F3.html
src/org/openbravo/erpCommon/info/SalesOrder_F3.xml
src/org/openbravo/erpCommon/info/SalesOrder_FS.html
src/org/openbravo/erpCommon/info/SalesOrder_FS.xml
src/org/openbravo/erpCommon/info/SalesOrder_data.xsql
src/org/openbravo/erpCommon/info/ShipmentReceipt.html
src/org/openbravo/erpCommon/info/ShipmentReceipt.java
src/org/openbravo/erpCommon/info/ShipmentReceipt.xml
src/org/openbravo/erpCommon/info/ShipmentReceiptLine.html
src/org/openbravo/erpCommon/info/ShipmentReceiptLine.java
src/org/openbravo/erpCommon/info/ShipmentReceiptLine.xml
src/org/openbravo/erpCommon/info/ShipmentReceiptLine_F1.html
src/org/openbravo/erpCommon/info/ShipmentReceiptLine_F1.xml
src/org/openbravo/erpCommon/info/ShipmentReceiptLine_F2.html
src/org/openbravo/erpCommon/info/ShipmentReceiptLine_F2.xml
src/org/openbravo/erpCommon/info/ShipmentReceiptLine_F3.html
src/org/openbravo/erpCommon/info/ShipmentReceiptLine_F3.xml
src/org/openbravo/erpCommon/info/ShipmentReceiptLine_FS.html
src/org/openbravo/erpCommon/info/ShipmentReceiptLine_FS.xml
src/org/openbravo/erpCommon/info/ShipmentReceiptLine_data.xsql
src/org/openbravo/erpCommon/info/ShipmentReceipt_F1.html
src/org/openbravo/erpCommon/info/ShipmentReceipt_F1.xml
src/org/openbravo/erpCommon/info/ShipmentReceipt_F2.html
src/org/openbravo/erpCommon/info/ShipmentReceipt_F2.xml
src/org/openbravo/erpCommon/info/ShipmentReceipt_F3.html
src/org/openbravo/erpCommon/info/ShipmentReceipt_F3.xml
src/org/openbravo/erpCommon/info/ShipmentReceipt_FS.html
src/org/openbravo/erpCommon/info/ShipmentReceipt_FS.xml
src/org/openbravo/erpCommon/info/ShipmentReceipt_data.xsql
src/org/openbravo/erpCommon/utility/Menu_data.xsql
src/org/openbravo/erpCommon/utility/VerticalMenu.java
--- a/database/sourcedata/AD_MESSAGE.xml	Mon Apr 21 19:03:40 2008 +0000
+++ b/database/sourcedata/AD_MESSAGE.xml	Mon Apr 21 19:06:47 2008 +0000
@@ -5569,4 +5569,122 @@
   <AD_MESSAGE AD_MESSAGE_ID="1005900004" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-03-22 16:41:10.0" CREATEDBY="100" UPDATED="2008-03-22 16:43:56.0" UPDATEDBY="100" VALUE="ChangeToOrder" MSGTEXT="Change project status to 'Order'" MSGTYPE="E" ENTITYTYPE="U" />
   <AD_MESSAGE AD_MESSAGE_ID="1005900005" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-03-25 10:26:04.0" CREATEDBY="100" UPDATED="2008-03-25 10:26:04.0" UPDATEDBY="100" VALUE="NoExpenseLines" MSGTEXT="There are not expense lines to process" MSGTYPE="E" ENTITYTYPE="U" />
   <AD_MESSAGE AD_MESSAGE_ID="1005900006" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-04 12:37:50.0" CREATEDBY="100" UPDATED="2008-04-04 12:38:11.0" UPDATEDBY="100" VALUE="InvoiceRuleNotdefined" MSGTEXT="has not defined an invoice term" MSGTYPE="E" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300000" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:05:01.0" CREATEDBY="100" UPDATED="2008-04-06 13:08:09.0" UPDATEDBY="100" VALUE="BPS_VALUE" MSGTEXT="Key" MSGTIP="Used for column name translation in Business Partner Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300001" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:09:45.0" CREATEDBY="100" UPDATED="2008-04-06 13:19:10.0" UPDATEDBY="100" VALUE="BPS_NAME" MSGTEXT="Name" MSGTIP="Used for column name translation in Business Partner Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300002" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:12:04.0" CREATEDBY="100" UPDATED="2008-04-06 13:18:44.0" UPDATEDBY="100" VALUE="BPS_SO_CREDITAVAILABLE" MSGTEXT="Disp. Credit" MSGTIP="Used for column name translation in Business Partner Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300003" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:13:00.0" CREATEDBY="100" UPDATED="2008-04-06 13:18:34.0" UPDATEDBY="100" VALUE="BPS_SO_CREDITUSED" MSGTEXT="Credit used" MSGTIP="Used for column name translation in Business Partner Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300004" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:13:44.0" CREATEDBY="100" UPDATED="2008-04-06 13:19:27.0" UPDATEDBY="100" VALUE="BPS_CONTACT" MSGTEXT="Contact" MSGTIP="Used for column name translation in Business Partner Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300005" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:14:21.0" CREATEDBY="100" UPDATED="2008-04-06 13:18:52.0" UPDATEDBY="100" VALUE="BPS_PHONE" MSGTEXT="Phone" MSGTIP="Used for column name translation in Business Partner Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300006" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:15:08.0" CREATEDBY="100" UPDATED="2008-04-06 13:19:01.0" UPDATEDBY="100" VALUE="BPS_PC" MSGTEXT="Zip" MSGTIP="Used for column name translation in Business Partner Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300007" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:15:42.0" CREATEDBY="100" UPDATED="2008-04-06 13:19:37.0" UPDATEDBY="100" VALUE="BPS_CITY" MSGTEXT="City" MSGTIP="Used for column name translation in Business Partner Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300008" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:16:25.0" CREATEDBY="100" UPDATED="2008-04-06 13:19:19.0" UPDATEDBY="100" VALUE="BPS_INCOME" MSGTEXT="Income" MSGTIP="Used for column name translation in Business Partner Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300009" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 11:16:21.0" CREATEDBY="100" UPDATED="2008-04-09 11:26:58.0" UPDATEDBY="100" VALUE="ACCS_ALIAS" MSGTEXT="Alias" MSGTIP="Used for grid column translation in Account selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300010" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 11:27:53.0" CREATEDBY="100" UPDATED="2008-04-09 12:26:03.0" UPDATEDBY="100" VALUE="ACCS_COMBINATION" MSGTEXT="Accounting Combination" MSGTIP="Used for grid column translation in Account selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300011" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 11:30:47.0" CREATEDBY="100" UPDATED="2008-04-09 12:26:16.0" UPDATEDBY="100" VALUE="ACCS_DESCRIPTION" MSGTEXT="Description" MSGTIP="Used for grid column translation in Account selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300012" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 11:32:12.0" CREATEDBY="100" UPDATED="2008-04-09 12:25:39.0" UPDATEDBY="100" VALUE="ACCS_AD_ORG_ID_D" MSGTEXT="Organization" MSGTIP="Used for grid column translation in Account selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300013" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 12:20:20.0" CREATEDBY="100" UPDATED="2008-04-09 12:25:32.0" UPDATEDBY="100" VALUE="ACCS_ACCOUNT_ID_D" MSGTEXT="Account" MSGTIP="Used for grid column translation in Account selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300014" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 12:21:12.0" CREATEDBY="100" UPDATED="2008-04-09 12:26:22.0" UPDATEDBY="100" VALUE="ACCS_M_PRODUCT_ID_D" MSGTEXT="Product" MSGTIP="Used for grid column translation in Account selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300015" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 12:22:10.0" CREATEDBY="100" UPDATED="2008-04-09 12:25:50.0" UPDATEDBY="100" VALUE="ACCS_C_BPARTNER_ID_D" MSGTEXT="Business Partner" MSGTIP="Used for grid column translation in Account selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300016" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 12:22:59.0" CREATEDBY="100" UPDATED="2008-04-09 12:26:09.0" UPDATEDBY="100" VALUE="ACCS_C_PROJECT_ID_D" MSGTEXT="Project" MSGTIP="Used for grid column translation in Account selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300017" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 12:23:42.0" CREATEDBY="100" UPDATED="2008-04-09 12:25:57.0" UPDATEDBY="100" VALUE="ACCS_C_CAMPAIGN_ID_D" MSGTEXT="Campaign" MSGTIP="Used for grid column translation in Account selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300018" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 17:33:12.0" CREATEDBY="100" UPDATED="2008-04-11 17:33:12.0" UPDATEDBY="100" VALUE="MBPS_VALUE" MSGTEXT="Key" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300019" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 17:33:33.0" CREATEDBY="100" UPDATED="2008-04-11 17:33:33.0" UPDATEDBY="100" VALUE="MBPS_NAME" MSGTEXT="Name" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300020" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 17:34:40.0" CREATEDBY="100" UPDATED="2008-04-11 17:34:40.0" UPDATEDBY="100" VALUE="MBPS_SO_CREDITAVAILABLE" MSGTEXT="Credit Aval." MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300021" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 17:35:26.0" CREATEDBY="100" UPDATED="2008-04-11 17:35:26.0" UPDATEDBY="100" VALUE="MBPS_SO_CREDITUSED" MSGTEXT="Credit Used" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300022" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 17:37:11.0" CREATEDBY="100" UPDATED="2008-04-11 17:37:11.0" UPDATEDBY="100" VALUE="MBPS_SALESREP" MSGTEXT="Sales Rep." MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300023" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 17:37:56.0" CREATEDBY="100" UPDATED="2008-04-11 17:37:56.0" UPDATEDBY="100" VALUE="MBPS_URL" MSGTEXT="Url" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300024" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 17:38:10.0" CREATEDBY="100" UPDATED="2008-04-11 17:38:10.0" UPDATEDBY="100" VALUE="MBPS_EMAIL" MSGTEXT="Email" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300025" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 17:55:35.0" CREATEDBY="100" UPDATED="2008-04-15 17:55:35.0" UPDATEDBY="100" VALUE="MPS_KEY" MSGTEXT="Key" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300026" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 17:56:03.0" CREATEDBY="100" UPDATED="2008-04-15 17:56:03.0" UPDATEDBY="100" VALUE="MPS_NAME" MSGTEXT="Name" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300027" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 17:57:24.0" CREATEDBY="100" UPDATED="2008-04-15 17:57:24.0" UPDATEDBY="100" VALUE="MPS_PRODUCT_CATEGORY" MSGTEXT="Product Category" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300028" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:19:44.0" CREATEDBY="100" UPDATED="2008-04-18 13:19:44.0" UPDATEDBY="100" VALUE="INS_BPARTNERNAME" MSGTEXT="Business Partner" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300029" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:20:35.0" CREATEDBY="100" UPDATED="2008-04-18 13:20:35.0" UPDATEDBY="100" VALUE="INS_DATEINVOICED" MSGTEXT="Date" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300030" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:21:10.0" CREATEDBY="100" UPDATED="2008-04-18 13:21:10.0" UPDATEDBY="100" VALUE="INS_DOCUMENTNO" MSGTEXT="Invoice No." MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300031" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:21:55.0" CREATEDBY="100" UPDATED="2008-04-18 13:21:55.0" UPDATEDBY="100" VALUE="INS_CURRENCY" MSGTEXT="Currency" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300032" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:22:32.0" CREATEDBY="100" UPDATED="2008-04-18 13:22:32.0" UPDATEDBY="100" VALUE="INS_GRANDTOTAL" MSGTEXT="Grand Total" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300033" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:23:11.0" CREATEDBY="100" UPDATED="2008-04-18 13:23:11.0" UPDATEDBY="100" VALUE="INS_CONVERTEDAMOUNT" MSGTEXT="Converted" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300034" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:23:51.0" CREATEDBY="100" UPDATED="2008-04-18 17:14:59.0" UPDATEDBY="100" VALUE="INS_OPENAMT" MSGTEXT="Open" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300035" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:24:25.0" CREATEDBY="100" UPDATED="2008-04-18 13:24:25.0" UPDATEDBY="100" VALUE="INS_ISPAID" MSGTEXT="Paid" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300036" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:25:13.0" CREATEDBY="100" UPDATED="2008-04-18 13:25:13.0" UPDATEDBY="100" VALUE="INS_ISSOTRX" MSGTEXT="Sales Tran." MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300037" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:26:46.0" CREATEDBY="100" UPDATED="2008-04-18 13:26:46.0" UPDATEDBY="100" VALUE="INS_DESCRIPTION" MSGTEXT="Description" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300038" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:27:27.0" CREATEDBY="100" UPDATED="2008-04-18 13:27:27.0" UPDATEDBY="100" VALUE="INS_POREFERENCE" MSGTEXT="Order" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300039" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 09:57:22.0" CREATEDBY="100" UPDATED="2008-04-19 09:57:22.0" UPDATEDBY="100" VALUE="DPS_BPARTNER" MSGTEXT="Business Partner" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300040" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 09:58:08.0" CREATEDBY="100" UPDATED="2008-04-19 09:58:08.0" UPDATEDBY="100" VALUE="DPS_INVOICE" MSGTEXT="Invoice" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300041" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 09:58:54.0" CREATEDBY="100" UPDATED="2008-04-19 09:58:54.0" UPDATEDBY="100" VALUE="DPS_DATEPLANNED" MSGTEXT="Date" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300042" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 10:00:29.0" CREATEDBY="100" UPDATED="2008-04-19 10:00:29.0" UPDATEDBY="100" VALUE="DPS_ORDERNO" MSGTEXT="Order" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300043" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 10:19:04.0" CREATEDBY="100" UPDATED="2008-04-19 10:19:04.0" UPDATEDBY="100" VALUE="DPS_AMOUNT" MSGTEXT="Amount" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300044" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 10:19:53.0" CREATEDBY="100" UPDATED="2008-04-19 10:20:14.0" UPDATEDBY="100" VALUE="DPS_WRITEOFFAMT" MSGTEXT="Canceled" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300045" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 10:20:36.0" CREATEDBY="100" UPDATED="2008-04-19 10:20:36.0" UPDATEDBY="100" VALUE="DPS_CURRENCY" MSGTEXT="Currency" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300046" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 10:21:18.0" CREATEDBY="100" UPDATED="2008-04-19 10:21:18.0" UPDATEDBY="100" VALUE="DPS_PAYMENTRULE" MSGTEXT="Payment Rule" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300047" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 10:22:08.0" CREATEDBY="100" UPDATED="2008-04-19 10:22:08.0" UPDATEDBY="100" VALUE="DPS_DEBTCANCEL" MSGTEXT="Canceled Settlement" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300048" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 10:22:56.0" CREATEDBY="100" UPDATED="2008-04-19 10:22:56.0" UPDATEDBY="100" VALUE="DPS_DEBTGENERATE" MSGTEXT="Generated Settlement" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300049" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 11:55:13.0" CREATEDBY="100" UPDATED="2008-04-20 11:55:13.0" UPDATEDBY="100" VALUE="ILS_BPARTNER_NAME" MSGTEXT="Business Partner" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300050" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 11:55:52.0" CREATEDBY="100" UPDATED="2008-04-20 11:55:52.0" UPDATEDBY="100" VALUE="ILS_PRODUCT_NAME" MSGTEXT="Product" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300051" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 11:57:50.0" CREATEDBY="100" UPDATED="2008-04-20 11:57:50.0" UPDATEDBY="100" VALUE="ILS_DATEINVOICED" MSGTEXT="Date" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300052" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 11:58:39.0" CREATEDBY="100" UPDATED="2008-04-20 11:58:39.0" UPDATEDBY="100" VALUE="ILS_DOCUMENTNO" MSGTEXT="Doc. No." MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300053" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 11:59:23.0" CREATEDBY="100" UPDATED="2008-04-20 11:59:23.0" UPDATEDBY="100" VALUE="ILS_QTY" MSGTEXT="Quantity" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300054" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 11:59:53.0" CREATEDBY="100" UPDATED="2008-04-20 11:59:53.0" UPDATEDBY="100" VALUE="ILS_PRICEACTUAL" MSGTEXT="Price" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300055" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 12:00:37.0" CREATEDBY="100" UPDATED="2008-04-20 19:07:39.0" UPDATEDBY="100" VALUE="ILS_LINENETAMT" MSGTEXT="Amount" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006300056" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 12:03:33.0" CREATEDBY="100" UPDATED="2008-04-20 12:03:33.0" UPDATEDBY="100" VALUE="ILS_ISSOTRX" MSGTEXT="Sale" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400000" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:09:19.0" CREATEDBY="100" UPDATED="2008-04-10 14:33:48.0" UPDATEDBY="100" VALUE="PS_VALUE" MSGTEXT="Key" MSGTIP="Used for column name translation in Product Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400001" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:11:12.0" CREATEDBY="100" UPDATED="2008-04-10 14:32:17.0" UPDATEDBY="100" VALUE="PS_NAME" MSGTEXT="Name" MSGTIP="Used for column name translation in Product Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400002" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:14:34.0" CREATEDBY="100" UPDATED="2008-04-10 14:33:06.0" UPDATEDBY="100" VALUE="PS_QTYAVAILABLE" MSGTEXT="Avail." MSGTIP="Used for column name translation in Product Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400003" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:17:42.0" CREATEDBY="100" UPDATED="2008-04-10 14:32:39.0" UPDATEDBY="100" VALUE="PS_PRICELIST" MSGTEXT="Pricelist price" MSGTIP="Used for column name translation in Product Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400004" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:18:50.0" CREATEDBY="100" UPDATED="2008-04-10 14:32:52.0" UPDATEDBY="100" VALUE="PS_PRICESTD" MSGTEXT="Applied price" MSGTIP="Used for column name translation in Product Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400005" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:20:20.0" CREATEDBY="100" UPDATED="2008-04-10 14:33:17.0" UPDATEDBY="100" VALUE="PS_QTYONHAND" MSGTEXT="Warehouse quant." MSGTIP="Used for column name translation in Product Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400006" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:21:31.0" CREATEDBY="100" UPDATED="2008-04-10 14:33:41.0" UPDATEDBY="100" VALUE="PS_QTYORDERED" MSGTEXT="Purchasing quant." MSGTIP="Used for column name translation in Product Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400007" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:23:00.0" CREATEDBY="100" UPDATED="2008-04-10 14:31:55.0" UPDATEDBY="100" VALUE="PS_MARGIN" MSGTEXT="Margin" MSGTIP="Used for column name translation in Product Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400008" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:24:32.0" CREATEDBY="100" UPDATED="2008-04-10 14:32:30.0" UPDATEDBY="100" VALUE="PS_PRICELIMIT" MSGTEXT="Limit" MSGTIP="Used for column name translation in Product Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400009" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:19:22.0" CREATEDBY="100" UPDATED="2008-04-11 14:20:14.0" UPDATEDBY="100" VALUE="PCS_VALUE" MSGTEXT="Key" MSGTIP="Used for column name translation in Product Complete Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400010" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:20:41.0" CREATEDBY="100" UPDATED="2008-04-11 14:20:41.0" UPDATEDBY="100" VALUE="PCS_NAME" MSGTEXT="Name" MSGTIP="Used for column name translation in Product Complete Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400011" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:22:21.0" CREATEDBY="100" UPDATED="2008-04-11 14:23:19.0" UPDATEDBY="100" VALUE="PCS_LOCATOR" MSGTEXT="Wharehouse" MSGTIP="Used for column name translation in Product Complete Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400012" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:25:26.0" CREATEDBY="100" UPDATED="2008-04-11 14:25:26.0" UPDATEDBY="100" VALUE="PCS_QTY" MSGTEXT="Quantity" MSGTIP="Used for column name translation in Product Complete Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400013" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:26:10.0" CREATEDBY="100" UPDATED="2008-04-11 14:26:10.0" UPDATEDBY="100" VALUE="PCS_C_UOM1" MSGTEXT="Unit" MSGTIP="Used for column name translation in Product Complete Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400014" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:26:59.0" CREATEDBY="100" UPDATED="2008-04-11 14:26:59.0" UPDATEDBY="100" VALUE="PCS_ATTRIBUTE" MSGTEXT="Attribute" MSGTIP="Used for column name translation in Product Complete Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400015" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:27:50.0" CREATEDBY="100" UPDATED="2008-04-11 14:27:50.0" UPDATEDBY="100" VALUE="PCS_QTYORDER" MSGTEXT="Quant. of order" MSGTIP="Used for column name translation in Product Complete Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400016" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:29:04.0" CREATEDBY="100" UPDATED="2008-04-11 14:29:04.0" UPDATEDBY="100" VALUE="PCS_C_UOM2" MSGTEXT="Order No." MSGTIP="Used for column name translation in Product Complete Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400017" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:32:46.0" CREATEDBY="100" UPDATED="2008-04-11 14:32:46.0" UPDATEDBY="100" VALUE="PCS_QTY_REF" MSGTEXT="Quant. Served" MSGTIP="Used for column name translation in Product Complete Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400018" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:33:51.0" CREATEDBY="100" UPDATED="2008-04-11 14:33:51.0" UPDATEDBY="100" VALUE="PCS_QUANTITYORDER_REF" MSGTEXT="Quant. of order delivered" MSGTIP="Used for column name translation in Product Complete Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400019" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 12:50:17.0" CREATEDBY="100" UPDATED="2008-04-14 12:51:30.0" UPDATEDBY="100" VALUE="LS_NAME" MSGTEXT="Wharehouse" MSGTIP="Used for column name translation in Locator Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400020" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 12:53:37.0" CREATEDBY="100" UPDATED="2008-04-14 12:53:37.0" UPDATEDBY="100" VALUE="LS_VALUE" MSGTEXT="Alias" MSGTIP="Used for column name translation in Locator Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400021" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 12:54:32.0" CREATEDBY="100" UPDATED="2008-04-14 12:54:32.0" UPDATEDBY="100" VALUE="LS_AISLE" MSGTEXT="Corridor" MSGTIP="Used for column name translation in Locator Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400022" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 12:55:30.0" CREATEDBY="100" UPDATED="2008-04-14 12:55:30.0" UPDATEDBY="100" VALUE="LS_BIN" MSGTEXT="Shelves" MSGTIP="Used for column name translation in Locator Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400023" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 12:56:31.0" CREATEDBY="100" UPDATED="2008-04-14 12:56:31.0" UPDATEDBY="100" VALUE="LS_NIVEL" MSGTEXT="Height" MSGTIP="Used for column name translation in Locator Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400024" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 12:57:25.0" CREATEDBY="100" UPDATED="2008-04-14 12:57:25.0" UPDATEDBY="100" VALUE="LS_PRIORITYNO" MSGTEXT="Priority No." MSGTIP="Used for column name translation in Locator Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400025" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 12:58:35.0" CREATEDBY="100" UPDATED="2008-04-14 12:58:35.0" UPDATEDBY="100" VALUE="LS_ISDEFAULT" MSGTEXT="By default" MSGTIP="Used for column name translation in Locator Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400026" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 18:27:03.0" CREATEDBY="100" UPDATED="2008-04-14 18:27:03.0" UPDATEDBY="100" VALUE="PJS_VALUE" MSGTEXT="Key" MSGTIP="Used for column name translation in Project Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400027" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 18:28:07.0" CREATEDBY="100" UPDATED="2008-04-14 18:28:07.0" UPDATEDBY="100" VALUE="PJS_NAME" MSGTEXT="Name" MSGTIP="Used for column name translation in Project Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400028" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 18:29:02.0" CREATEDBY="100" UPDATED="2008-04-14 18:29:02.0" UPDATEDBY="100" VALUE="PJS_BPARTNER" MSGTEXT="Business Partner" MSGTIP="Used for column name translation in Project Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400029" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 18:30:04.0" CREATEDBY="100" UPDATED="2008-04-14 18:30:04.0" UPDATEDBY="100" VALUE="PJS_PROJECTSTATUS" MSGTEXT="Situation" MSGTIP="Used for column name translation in Project Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400030" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 14:12:58.0" CREATEDBY="100" UPDATED="2008-04-15 14:37:18.0" UPDATEDBY="100" VALUE="SRS_BPARTNER_NAME" MSGTEXT="Business Partner" MSGTIP="Used for column name translation in Shipment Receipt Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400031" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 14:22:29.0" CREATEDBY="100" UPDATED="2008-04-15 14:22:29.0" UPDATEDBY="100" VALUE="SRS_MOVEMENTDATE" MSGTEXT="Movement date" MSGTIP="Used for column name translation in Shipment Receipt Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400032" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 14:24:16.0" CREATEDBY="100" UPDATED="2008-04-15 14:24:16.0" UPDATEDBY="100" VALUE="SRS_DOCUMENTNO" MSGTEXT="Doc No." MSGTIP="Used for column name translation in Shipment Receipt Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400033" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 14:25:32.0" CREATEDBY="100" UPDATED="2008-04-15 14:25:32.0" UPDATEDBY="100" VALUE="SRS_DESCRIPTION" MSGTEXT="Description" MSGTIP="Used for column name translation in Shipment Receipt Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400034" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 14:27:26.0" CREATEDBY="100" UPDATED="2008-04-15 14:37:53.0" UPDATEDBY="100" VALUE="SRS_ORDER_REFERENCE" MSGTEXT="Reference Order" MSGTIP="Used for column name translation in Shipment Receipt Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400035" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 14:28:41.0" CREATEDBY="100" UPDATED="2008-04-15 14:36:34.0" UPDATEDBY="100" VALUE="SRS_SALES_TRANSACTION" MSGTEXT="Sale transaction" MSGTIP="Used for column name translation in Shipment Receipt Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400036" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-17 16:00:29.0" CREATEDBY="100" UPDATED="2008-04-17 16:00:29.0" UPDATEDBY="100" VALUE="SOLS_BPARTNER_NAME" MSGTEXT="Business Partners" MSGTIP="Used for column name translation in Sales Order Line Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400037" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-17 16:02:27.0" CREATEDBY="100" UPDATED="2008-04-17 16:02:27.0" UPDATEDBY="100" VALUE="SOLS_DATEORDERED" MSGTEXT="Date" MSGTIP="Used for column name translation in Sales Order Line Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400038" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-17 16:03:32.0" CREATEDBY="100" UPDATED="2008-04-17 16:03:32.0" UPDATEDBY="100" VALUE="SOLS_DOCUMENTNO" MSGTEXT="Doc No." MSGTIP="Used for column name translation in Sales Order Line Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400039" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-17 16:04:55.0" CREATEDBY="100" UPDATED="2008-04-17 16:04:55.0" UPDATEDBY="100" VALUE="SOLS_ISSOTRX" MSGTEXT="Sale" MSGTIP="Used for column name translation in Sales Order Line Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400040" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-17 16:06:30.0" CREATEDBY="100" UPDATED="2008-04-17 16:06:30.0" UPDATEDBY="100" VALUE="SOLS_PRODUCT_NAME" MSGTEXT="Product" MSGTIP="Used for column name translation in Sales Order Line Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400041" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-17 16:08:02.0" CREATEDBY="100" UPDATED="2008-04-17 16:08:02.0" UPDATEDBY="100" VALUE="SOLS_QTY" MSGTEXT="Quantity" MSGTIP="Used for column name translation in Sales Order Line Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400042" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-17 16:09:43.0" CREATEDBY="100" UPDATED="2008-04-17 16:09:43.0" UPDATEDBY="100" VALUE="SOLS_PRICEACTUAL" MSGTEXT="Price" MSGTIP="Used for column name translation in Sales Order Line Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400043" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-17 16:11:35.0" CREATEDBY="100" UPDATED="2008-04-17 16:11:35.0" UPDATEDBY="100" VALUE="SOLS_LINENETAMT" MSGTEXT="Amount" MSGTIP="Used for column name translation in Sales Order Line Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400044" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:03:44.0" CREATEDBY="100" UPDATED="2008-04-19 16:03:44.0" UPDATEDBY="100" VALUE="SOS_BPARTNERNAME" MSGTEXT="Business Partner" MSGTIP="Used for column name translation in Sales Order Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400045" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:05:39.0" CREATEDBY="100" UPDATED="2008-04-19 16:12:13.0" UPDATEDBY="100" VALUE="SOS_DATEORDERED" MSGTEXT="Date" MSGTIP="Used for column name translation in Sales Order Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400046" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:07:04.0" CREATEDBY="100" UPDATED="2008-04-19 16:13:19.0" UPDATEDBY="100" VALUE="SOS_DOCUMENTNO" MSGTEXT="Document No." MSGTIP="Used for column name translation in Sales Order Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400047" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:07:36.0" CREATEDBY="100" UPDATED="2008-04-19 16:11:54.0" UPDATEDBY="100" VALUE="SOS_CURRENCY" MSGTEXT="Currency" MSGTIP="Used for column name translation in Sales Order Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400048" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:08:17.0" CREATEDBY="100" UPDATED="2008-04-19 16:13:37.0" UPDATEDBY="100" VALUE="SOS_GRANDTOTAL" MSGTEXT="Grand Total" MSGTIP="Used for column name translation in Sales Order Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400049" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:08:57.0" CREATEDBY="100" UPDATED="2008-04-19 16:11:31.0" UPDATEDBY="100" VALUE="SOS_CONVERTED" MSGTEXT="Converted" MSGTIP="Used for column name translation in Sales Order Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400050" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:10:19.0" CREATEDBY="100" UPDATED="2008-04-19 16:10:19.0" UPDATEDBY="100" VALUE="SOS_ISSOTRX" MSGTEXT="Sales Trans." MSGTIP="Used for column name translation in Sales Order Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400051" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:14:27.0" CREATEDBY="100" UPDATED="2008-04-19 16:14:27.0" UPDATEDBY="100" VALUE="SOS_DESCRIPTION" MSGTEXT="Description" MSGTIP="Used for column name translation in Sales Order Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400052" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:15:13.0" CREATEDBY="100" UPDATED="2008-04-19 16:15:13.0" UPDATEDBY="100" VALUE="SOS_POREFERENCE" MSGTEXT="Reference Order" MSGTIP="Used for column name translation in Sales Order Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400053" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 16:14:28.0" CREATEDBY="100" UPDATED="2008-04-20 16:14:28.0" UPDATEDBY="100" VALUE="SRLS_BPARTNER_NAME" MSGTEXT="Business Partners" MSGTIP="Used for column name translation in Shipment Receipt Line Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400054" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 16:16:41.0" CREATEDBY="100" UPDATED="2008-04-20 16:16:41.0" UPDATEDBY="100" VALUE="SRLS_MOVEMENTDATE" MSGTEXT="Date" MSGTIP="Used for column name translation in Shipment Receipt Line Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400055" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 16:17:35.0" CREATEDBY="100" UPDATED="2008-04-20 16:17:35.0" UPDATEDBY="100" VALUE="SRLS_DOCUMENTNO" MSGTEXT="Doc No." MSGTIP="Used for column name translation in Shipment Receipt Line Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400056" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 16:18:27.0" CREATEDBY="100" UPDATED="2008-04-20 16:18:27.0" UPDATEDBY="100" VALUE="SRLS_ISOTRX" MSGTEXT="Sale" MSGTIP="Used for column name translation in Shipment Receipt Line Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400057" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 16:19:34.0" CREATEDBY="100" UPDATED="2008-04-20 16:19:34.0" UPDATEDBY="100" VALUE="SRLS_PRODUCT_NAME" MSGTEXT="Product" MSGTIP="Used for column name translation in Shipment Receipt Line Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400058" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 16:20:14.0" CREATEDBY="100" UPDATED="2008-04-20 16:20:14.0" UPDATEDBY="100" VALUE="SRLS_QTY" MSGTEXT="Quatity" MSGTIP="Used for column name translation in Shipment Receipt Line Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400059" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 16:21:27.0" CREATEDBY="100" UPDATED="2008-04-20 16:21:27.0" UPDATEDBY="100" VALUE="SRLS_LOCATOR_NAME" MSGTEXT="Location" MSGTIP="Used for column name translation in Shipment Receipt Line Selector" MSGTYPE="I" ENTITYTYPE="U" />
+  <AD_MESSAGE AD_MESSAGE_ID="1006400060" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 16:22:12.0" CREATEDBY="100" UPDATED="2008-04-20 16:22:12.0" UPDATEDBY="100" VALUE="SRLS_ATTRIBUTE_NAME" MSGTEXT="Attribute" MSGTIP="Used for column name translation in Shipment Receipt Line Selector" MSGTYPE="I" ENTITYTYPE="U" />
 </data>
--- a/database/sourcedata/AD_MESSAGE_TRL.xml	Mon Apr 21 19:03:40 2008 +0000
+++ b/database/sourcedata/AD_MESSAGE_TRL.xml	Mon Apr 21 19:06:47 2008 +0000
@@ -5570,4 +5570,122 @@
   <AD_MESSAGE_TRL AD_MESSAGE_ID="1005900004" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-03-22 16:41:10.0" CREATEDBY="100" UPDATED="2008-03-22 16:44:03.0" UPDATEDBY="100" MSGTEXT="Cambie el estado del proyecto a 'Pedido'" ISTRANSLATED="N" />
   <AD_MESSAGE_TRL AD_MESSAGE_ID="1005900005" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-03-25 10:26:04.0" CREATEDBY="100" UPDATED="2008-03-25 10:26:31.0" UPDATEDBY="100" MSGTEXT="No hay líneas de gasto para procesar" ISTRANSLATED="N" />
   <AD_MESSAGE_TRL AD_MESSAGE_ID="1005900006" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-04 12:37:50.0" CREATEDBY="100" UPDATED="2008-04-04 12:40:11.0" UPDATEDBY="100" MSGTEXT="no tiene definido un tipo de facturación" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300000" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:05:01.0" CREATEDBY="100" UPDATED="2008-04-06 13:08:58.0" UPDATEDBY="100" MSGTEXT="Clave" MSGTIP="Usado para traducción de columna en selector de Terceros" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300001" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:09:45.0" CREATEDBY="100" UPDATED="2008-04-06 00:00:00.0" UPDATEDBY="100" MSGTEXT="Nombre" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300002" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:12:04.0" CREATEDBY="100" UPDATED="2008-04-06 00:00:00.0" UPDATEDBY="100" MSGTEXT="Crédito disp." ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300003" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:13:00.0" CREATEDBY="100" UPDATED="2008-04-06 00:00:00.0" UPDATEDBY="100" MSGTEXT="Crédito usado" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300004" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:13:44.0" CREATEDBY="100" UPDATED="2008-04-06 00:00:00.0" UPDATEDBY="100" MSGTEXT="Contacto" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300005" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:14:21.0" CREATEDBY="100" UPDATED="2008-04-06 00:00:00.0" UPDATEDBY="100" MSGTEXT="Teléfono" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300006" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:15:08.0" CREATEDBY="100" UPDATED="2008-04-06 00:00:00.0" UPDATEDBY="100" MSGTEXT="C.P." ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300007" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:15:42.0" CREATEDBY="100" UPDATED="2008-04-06 00:00:00.0" UPDATEDBY="100" MSGTEXT="Localidad" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300008" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 13:16:25.0" CREATEDBY="100" UPDATED="2008-04-06 00:00:00.0" UPDATEDBY="100" MSGTEXT="Ingresos" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300009" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 11:16:21.0" CREATEDBY="100" UPDATED="2008-04-09 11:16:21.0" UPDATEDBY="100" MSGTEXT="Alias" MSGTIP="Used for grid column translation in Account selector" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300010" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 11:27:53.0" CREATEDBY="100" UPDATED="2008-04-09 00:00:00.0" UPDATEDBY="100" MSGTEXT="Combinación Contable" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300011" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 11:30:47.0" CREATEDBY="100" UPDATED="2008-04-09 00:00:00.0" UPDATEDBY="100" MSGTEXT="Descripción" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300012" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 11:32:12.0" CREATEDBY="100" UPDATED="2008-04-09 00:00:00.0" UPDATEDBY="100" MSGTEXT="Organización" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300013" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 12:20:20.0" CREATEDBY="100" UPDATED="2008-04-09 00:00:00.0" UPDATEDBY="100" MSGTEXT="Cuenta" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300014" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 12:21:12.0" CREATEDBY="100" UPDATED="2008-04-09 00:00:00.0" UPDATEDBY="100" MSGTEXT="Producto" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300015" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 12:22:10.0" CREATEDBY="100" UPDATED="2008-04-09 00:00:00.0" UPDATEDBY="100" MSGTEXT="Tercero" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300016" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 12:22:59.0" CREATEDBY="100" UPDATED="2008-04-09 00:00:00.0" UPDATEDBY="100" MSGTEXT="Proyecto" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300017" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-09 12:23:42.0" CREATEDBY="100" UPDATED="2008-04-09 00:00:00.0" UPDATEDBY="100" MSGTEXT="Campaña" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300018" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 17:33:12.0" CREATEDBY="100" UPDATED="2008-04-11 17:33:12.0" UPDATEDBY="100" MSGTEXT="Key" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300019" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 17:33:33.0" CREATEDBY="100" UPDATED="2008-04-11 17:33:33.0" UPDATEDBY="100" MSGTEXT="Name" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300020" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 17:34:40.0" CREATEDBY="100" UPDATED="2008-04-11 17:34:40.0" UPDATEDBY="100" MSGTEXT="Credit Aval." ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300021" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 17:35:26.0" CREATEDBY="100" UPDATED="2008-04-11 17:35:26.0" UPDATEDBY="100" MSGTEXT="Credit Used" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300022" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 17:37:11.0" CREATEDBY="100" UPDATED="2008-04-11 17:37:11.0" UPDATEDBY="100" MSGTEXT="Sales Rep." ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300023" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 17:37:56.0" CREATEDBY="100" UPDATED="2008-04-11 17:37:56.0" UPDATEDBY="100" MSGTEXT="Url" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300024" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 17:38:10.0" CREATEDBY="100" UPDATED="2008-04-11 17:38:10.0" UPDATEDBY="100" MSGTEXT="Email" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300025" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 17:55:35.0" CREATEDBY="100" UPDATED="2008-04-15 17:55:46.0" UPDATEDBY="100" MSGTEXT="Clave" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300026" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 17:56:03.0" CREATEDBY="100" UPDATED="2008-04-15 17:56:14.0" UPDATEDBY="100" MSGTEXT="Nombre" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300027" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 17:57:24.0" CREATEDBY="100" UPDATED="2008-04-15 17:58:05.0" UPDATEDBY="100" MSGTEXT="Categoría Producto" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300028" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:19:44.0" CREATEDBY="100" UPDATED="2008-04-18 13:19:59.0" UPDATEDBY="100" MSGTEXT="Tercero" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300029" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:20:35.0" CREATEDBY="100" UPDATED="2008-04-18 13:20:43.0" UPDATEDBY="100" MSGTEXT="Fecha" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300030" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:21:10.0" CREATEDBY="100" UPDATED="2008-04-18 13:21:30.0" UPDATEDBY="100" MSGTEXT="Nº Factura" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300031" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:21:55.0" CREATEDBY="100" UPDATED="2008-04-18 13:22:04.0" UPDATEDBY="100" MSGTEXT="Moneda" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300032" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:22:32.0" CREATEDBY="100" UPDATED="2008-04-18 13:22:40.0" UPDATEDBY="100" MSGTEXT="Total" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300033" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:23:11.0" CREATEDBY="100" UPDATED="2008-04-18 13:23:21.0" UPDATEDBY="100" MSGTEXT="Convertido" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300034" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:23:51.0" CREATEDBY="100" UPDATED="2008-04-18 13:24:01.0" UPDATEDBY="100" MSGTEXT="Abierto" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300035" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:24:25.0" CREATEDBY="100" UPDATED="2008-04-18 13:24:34.0" UPDATEDBY="100" MSGTEXT="Pagado" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300036" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:25:13.0" CREATEDBY="100" UPDATED="2008-04-18 13:25:26.0" UPDATEDBY="100" MSGTEXT="Operación de Venta" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300037" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:26:46.0" CREATEDBY="100" UPDATED="2008-04-18 13:26:56.0" UPDATEDBY="100" MSGTEXT="Descripción" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300038" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:27:27.0" CREATEDBY="100" UPDATED="2008-04-18 13:27:37.0" UPDATEDBY="100" MSGTEXT="Pedido" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300039" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 09:57:22.0" CREATEDBY="100" UPDATED="2008-04-19 09:57:34.0" UPDATEDBY="100" MSGTEXT="Tercero" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300040" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 09:58:08.0" CREATEDBY="100" UPDATED="2008-04-19 09:58:16.0" UPDATEDBY="100" MSGTEXT="Factura" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300041" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 09:58:54.0" CREATEDBY="100" UPDATED="2008-04-19 09:59:02.0" UPDATEDBY="100" MSGTEXT="Fecha" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300042" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 10:00:29.0" CREATEDBY="100" UPDATED="2008-04-19 10:00:38.0" UPDATEDBY="100" MSGTEXT="Pedido" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300043" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 10:19:04.0" CREATEDBY="100" UPDATED="2008-04-19 10:19:16.0" UPDATEDBY="100" MSGTEXT="Importe" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300044" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 10:19:53.0" CREATEDBY="100" UPDATED="2008-04-19 10:20:14.0" UPDATEDBY="100" MSGTEXT="Cancelado" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300045" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 10:20:36.0" CREATEDBY="100" UPDATED="2008-04-19 10:20:46.0" UPDATEDBY="100" MSGTEXT="Moneda" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300046" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 10:21:18.0" CREATEDBY="100" UPDATED="2008-04-19 10:21:33.0" UPDATEDBY="100" MSGTEXT="Forma de Pago" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300047" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 10:22:08.0" CREATEDBY="100" UPDATED="2008-04-19 10:22:25.0" UPDATEDBY="100" MSGTEXT="Liquidación Cancelada" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300048" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 10:22:56.0" CREATEDBY="100" UPDATED="2008-04-19 10:23:09.0" UPDATEDBY="100" MSGTEXT="Liquidación Generada" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300049" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 11:55:13.0" CREATEDBY="100" UPDATED="2008-04-20 11:55:26.0" UPDATEDBY="100" MSGTEXT="Tercero" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300050" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 11:55:52.0" CREATEDBY="100" UPDATED="2008-04-20 11:56:00.0" UPDATEDBY="100" MSGTEXT="Producto" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300051" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 11:57:50.0" CREATEDBY="100" UPDATED="2008-04-20 11:57:58.0" UPDATEDBY="100" MSGTEXT="Fecha" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300052" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 11:58:39.0" CREATEDBY="100" UPDATED="2008-04-20 11:58:58.0" UPDATEDBY="100" MSGTEXT="Nº Documento" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300053" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 11:59:23.0" CREATEDBY="100" UPDATED="2008-04-20 11:59:33.0" UPDATEDBY="100" MSGTEXT="Cantidad" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300054" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 11:59:53.0" CREATEDBY="100" UPDATED="2008-04-20 12:00:05.0" UPDATEDBY="100" MSGTEXT="Precio" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300055" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 12:00:37.0" CREATEDBY="100" UPDATED="2008-04-20 12:00:46.0" UPDATEDBY="100" MSGTEXT="Importe" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006300056" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 12:03:33.0" CREATEDBY="100" UPDATED="2008-04-20 12:03:41.0" UPDATEDBY="100" MSGTEXT="Venta" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400000" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:09:19.0" CREATEDBY="100" UPDATED="2008-04-10 12:16:31.0" UPDATEDBY="100" MSGTEXT="Clave" MSGTIP="Used for column name translation in Product Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400001" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:11:12.0" CREATEDBY="100" UPDATED="2008-04-10 12:15:50.0" UPDATEDBY="100" MSGTEXT="Nombre" MSGTIP="Used for column name translation in Product Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400002" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:14:34.0" CREATEDBY="100" UPDATED="2008-04-10 12:15:30.0" UPDATEDBY="100" MSGTEXT="Disp." MSGTIP="Used for column name translation in Product Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400003" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:17:42.0" CREATEDBY="100" UPDATED="2008-04-10 12:18:05.0" UPDATEDBY="100" MSGTEXT="Precio tarifa" MSGTIP="Used for column name translation in Product Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400004" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:18:50.0" CREATEDBY="100" UPDATED="2008-04-10 12:19:40.0" UPDATEDBY="100" MSGTEXT="Precio aplicado" MSGTIP="Used for column name translation in Product Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400005" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:20:20.0" CREATEDBY="100" UPDATED="2008-04-10 12:20:38.0" UPDATEDBY="100" MSGTEXT="Cant. Almacén" MSGTIP="Used for column name translation in Product Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400006" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:21:31.0" CREATEDBY="100" UPDATED="2008-04-10 12:22:24.0" UPDATEDBY="100" MSGTEXT="Cant. Compras" MSGTIP="Used for column name translation in Product Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400007" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:23:00.0" CREATEDBY="100" UPDATED="2008-04-10 12:23:34.0" UPDATEDBY="100" MSGTEXT="Margen" MSGTIP="Used for column name translation in Product Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400008" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-10 12:24:32.0" CREATEDBY="100" UPDATED="2008-04-10 12:24:49.0" UPDATEDBY="100" MSGTEXT="Límite" MSGTIP="Used for column name translation in Product Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400009" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:19:22.0" CREATEDBY="100" UPDATED="2008-04-11 14:20:22.0" UPDATEDBY="100" MSGTEXT="Clave" MSGTIP="Used for column name translation in Product Complete Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400010" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:20:41.0" CREATEDBY="100" UPDATED="2008-04-11 14:20:41.0" UPDATEDBY="100" MSGTEXT="Name" MSGTIP="Used for column name translation in Product Complete Selector" ISTRANSLATED="N" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400011" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:22:21.0" CREATEDBY="100" UPDATED="2008-04-11 14:24:39.0" UPDATEDBY="100" MSGTEXT="Almacén" MSGTIP="Used for column name translation in Product Complete Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400012" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:25:26.0" CREATEDBY="100" UPDATED="2008-04-11 14:25:38.0" UPDATEDBY="100" MSGTEXT="Cantidad" MSGTIP="Used for column name translation in Product Complete Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400013" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:26:10.0" CREATEDBY="100" UPDATED="2008-04-11 14:26:24.0" UPDATEDBY="100" MSGTEXT="Unidad" MSGTIP="Used for column name translation in Product Complete Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400014" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:26:59.0" CREATEDBY="100" UPDATED="2008-04-11 14:27:11.0" UPDATEDBY="100" MSGTEXT="Atributo" MSGTIP="Used for column name translation in Product Complete Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400015" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:27:50.0" CREATEDBY="100" UPDATED="2008-04-11 14:28:09.0" UPDATEDBY="100" MSGTEXT="Cant. Pedido" MSGTIP="Used for column name translation in Product Complete Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400016" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:29:04.0" CREATEDBY="100" UPDATED="2008-04-11 14:31:57.0" UPDATEDBY="100" MSGTEXT="Nº Pedido" MSGTIP="Used for column name translation in Product Complete Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400017" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:32:46.0" CREATEDBY="100" UPDATED="2008-04-11 14:33:02.0" UPDATEDBY="100" MSGTEXT="Cant. Servida" MSGTIP="Used for column name translation in Product Complete Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400018" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 14:33:51.0" CREATEDBY="100" UPDATED="2008-04-11 14:34:04.0" UPDATEDBY="100" MSGTEXT="Cant. Ped. Servida" MSGTIP="Used for column name translation in Product Complete Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400019" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 12:50:17.0" CREATEDBY="100" UPDATED="2008-04-14 12:52:21.0" UPDATEDBY="100" MSGTEXT="Almacén" MSGTIP="Used for column name translation in Locator Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400020" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 12:53:37.0" CREATEDBY="100" UPDATED="2008-04-14 12:53:44.0" UPDATEDBY="100" MSGTEXT="Alias" MSGTIP="Used for column name translation in Locator Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400021" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 12:54:32.0" CREATEDBY="100" UPDATED="2008-04-14 12:54:48.0" UPDATEDBY="100" MSGTEXT="Pasillo" MSGTIP="Used for column name translation in Locator Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400022" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 12:55:30.0" CREATEDBY="100" UPDATED="2008-04-14 12:55:51.0" UPDATEDBY="100" MSGTEXT="Estantería" MSGTIP="Used for column name translation in Locator Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400023" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 12:56:31.0" CREATEDBY="100" UPDATED="2008-04-14 12:56:46.0" UPDATEDBY="100" MSGTEXT="Altura" MSGTIP="Used for column name translation in Locator Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400024" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 12:57:25.0" CREATEDBY="100" UPDATED="2008-04-14 12:57:44.0" UPDATEDBY="100" MSGTEXT="Número Prioridad" MSGTIP="Used for column name translation in Locator Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400025" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 12:58:35.0" CREATEDBY="100" UPDATED="2008-04-14 12:58:47.0" UPDATEDBY="100" MSGTEXT="Por defecto" MSGTIP="Used for column name translation in Locator Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400026" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 18:27:03.0" CREATEDBY="100" UPDATED="2008-04-14 18:27:38.0" UPDATEDBY="100" MSGTEXT="Clave" MSGTIP="Used for column name translation in Project Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400027" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 18:28:07.0" CREATEDBY="100" UPDATED="2008-04-14 18:28:17.0" UPDATEDBY="100" MSGTEXT="Nombre" MSGTIP="Used for column name translation in Project Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400028" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 18:29:02.0" CREATEDBY="100" UPDATED="2008-04-14 18:29:15.0" UPDATEDBY="100" MSGTEXT="Tercero" MSGTIP="Used for column name translation in Project Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400029" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 18:30:04.0" CREATEDBY="100" UPDATED="2008-04-14 18:30:15.0" UPDATEDBY="100" MSGTEXT="Situación" MSGTIP="Used for column name translation in Project Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400030" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 14:12:58.0" CREATEDBY="100" UPDATED="2008-04-15 14:20:13.0" UPDATEDBY="100" MSGTEXT="Tercero" MSGTIP="Used for column name translation in Shipment Receipt Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400031" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 14:22:29.0" CREATEDBY="100" UPDATED="2008-04-15 14:23:27.0" UPDATEDBY="100" MSGTEXT="Fecha movimiento" MSGTIP="Used for column name translation in Shipment Receipt Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400032" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 14:24:16.0" CREATEDBY="100" UPDATED="2008-04-15 14:24:49.0" UPDATEDBY="100" MSGTEXT="Nº Documento" MSGTIP="Used for column name translation in Shipment Receipt Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400033" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 14:25:32.0" CREATEDBY="100" UPDATED="2008-04-15 14:25:46.0" UPDATEDBY="100" MSGTEXT="Descripción" MSGTIP="Used for column name translation in Shipment Receipt Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400034" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 14:27:26.0" CREATEDBY="100" UPDATED="2008-04-15 14:27:50.0" UPDATEDBY="100" MSGTEXT="Pedido de Referencia" MSGTIP="Used for column name translation in Shipment Receipt Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400035" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 14:28:41.0" CREATEDBY="100" UPDATED="2008-04-15 14:29:01.0" UPDATEDBY="100" MSGTEXT="Operación venta" MSGTIP="Used for column name translation in Shipment Receipt Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400036" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-17 16:00:29.0" CREATEDBY="100" UPDATED="2008-04-17 16:01:06.0" UPDATEDBY="100" MSGTEXT="Terceros" MSGTIP="Used for column name translation in Sales Order Line Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400037" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-17 16:02:27.0" CREATEDBY="100" UPDATED="2008-04-17 16:02:35.0" UPDATEDBY="100" MSGTEXT="Fecha" MSGTIP="Used for column name translation in Sales Order Line Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400038" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-17 16:03:32.0" CREATEDBY="100" UPDATED="2008-04-17 16:03:55.0" UPDATEDBY="100" MSGTEXT="Nº Documento" MSGTIP="Used for column name translation in Sales Order Line Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400039" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-17 16:04:55.0" CREATEDBY="100" UPDATED="2008-04-17 16:05:03.0" UPDATEDBY="100" MSGTEXT="Venta" MSGTIP="Used for column name translation in Sales Order Line Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400040" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-17 16:06:30.0" CREATEDBY="100" UPDATED="2008-04-17 16:06:40.0" UPDATEDBY="100" MSGTEXT="Producto" MSGTIP="Used for column name translation in Sales Order Line Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400041" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-17 16:08:02.0" CREATEDBY="100" UPDATED="2008-04-17 16:08:12.0" UPDATEDBY="100" MSGTEXT="Cantidad" MSGTIP="Used for column name translation in Sales Order Line Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400042" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-17 16:09:43.0" CREATEDBY="100" UPDATED="2008-04-17 16:09:55.0" UPDATEDBY="100" MSGTEXT="Precio" MSGTIP="Used for column name translation in Sales Order Line Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400043" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-17 16:11:35.0" CREATEDBY="100" UPDATED="2008-04-17 16:11:43.0" UPDATEDBY="100" MSGTEXT="Importe" MSGTIP="Used for column name translation in Sales Order Line Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400044" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:03:44.0" CREATEDBY="100" UPDATED="2008-04-19 16:05:06.0" UPDATEDBY="100" MSGTEXT="Terceros" MSGTIP="Used for column name translation in Sales Order Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400045" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:05:39.0" CREATEDBY="100" UPDATED="2008-04-19 16:12:26.0" UPDATEDBY="100" MSGTEXT="Fecha" MSGTIP="Used for column name translation in Sales Order Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400046" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:07:04.0" CREATEDBY="100" UPDATED="2008-04-19 16:13:25.0" UPDATEDBY="100" MSGTEXT="Documento" MSGTIP="Used for column name translation in Sales Order Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400047" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:07:36.0" CREATEDBY="100" UPDATED="2008-04-19 16:12:44.0" UPDATEDBY="100" MSGTEXT="Moneda" MSGTIP="Used for column name translation in Sales Order Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400048" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:08:17.0" CREATEDBY="100" UPDATED="2008-04-19 16:13:43.0" UPDATEDBY="100" MSGTEXT="Total" MSGTIP="Used for column name translation in Sales Order Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400049" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:08:57.0" CREATEDBY="100" UPDATED="2008-04-19 16:12:57.0" UPDATEDBY="100" MSGTEXT="Convertido" MSGTIP="Used for column name translation in Sales Order Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400050" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:10:19.0" CREATEDBY="100" UPDATED="2008-04-19 16:10:43.0" UPDATEDBY="100" MSGTEXT="Operación de venta" MSGTIP="Used for column name translation in Sales Order Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400051" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:14:27.0" CREATEDBY="100" UPDATED="2008-04-19 16:14:40.0" UPDATEDBY="100" MSGTEXT="Descriptción" MSGTIP="Used for column name translation in Sales Order Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400052" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 16:15:13.0" CREATEDBY="100" UPDATED="2008-04-19 16:15:42.0" UPDATEDBY="100" MSGTEXT="Pedido de Referencia" MSGTIP="Used for column name translation in Sales Order Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400053" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 16:14:28.0" CREATEDBY="100" UPDATED="2008-04-20 16:16:12.0" UPDATEDBY="100" MSGTEXT="Terceros" MSGTIP="Used for column name translation in Shipment Receipt Line Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400054" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 16:16:41.0" CREATEDBY="100" UPDATED="2008-04-20 16:16:54.0" UPDATEDBY="100" MSGTEXT="Fecha" MSGTIP="Used for column name translation in Shipment Receipt Line Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400055" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 16:17:35.0" CREATEDBY="100" UPDATED="2008-04-20 16:18:00.0" UPDATEDBY="100" MSGTEXT="Nº Documento" MSGTIP="Used for column name translation in Shipment Receipt Line Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400056" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 16:18:27.0" CREATEDBY="100" UPDATED="2008-04-20 16:18:54.0" UPDATEDBY="100" MSGTEXT="Venta" MSGTIP="Used for column name translation in Shipment Receipt Line Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400057" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 16:19:34.0" CREATEDBY="100" UPDATED="2008-04-20 16:19:44.0" UPDATEDBY="100" MSGTEXT="Producto" MSGTIP="Used for column name translation in Shipment Receipt Line Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400058" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 16:20:14.0" CREATEDBY="100" UPDATED="2008-04-20 16:20:50.0" UPDATEDBY="100" MSGTEXT="Cantidad" MSGTIP="Used for column name translation in Shipment Receipt Line Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400059" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 16:21:27.0" CREATEDBY="100" UPDATED="2008-04-20 16:21:43.0" UPDATEDBY="100" MSGTEXT="Dirección" MSGTIP="Used for column name translation in Shipment Receipt Line Selector" ISTRANSLATED="Y" />
+  <AD_MESSAGE_TRL AD_MESSAGE_ID="1006400060" AD_LANGUAGE="es_ES" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 16:22:12.0" CREATEDBY="100" UPDATED="2008-04-20 16:22:29.0" UPDATEDBY="100" MSGTEXT="Atributo" MSGTIP="Used for column name translation in Shipment Receipt Line Selector" ISTRANSLATED="Y" />  
 </data>
--- a/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Mon Apr 21 19:03:40 2008 +0000
+++ b/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Mon Apr 21 19:06:47 2008 +0000
@@ -61,38 +61,6 @@
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1581" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-09 16:27:07.0" CREATEDBY="0" UPDATED="2006-05-09 16:27:07.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="633" MAPPINGNAME="/ad_callouts/SL_WorkRequirement_StartDate.html" ISDEFAULT="Y" />
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1583" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-09 16:27:07.0" CREATEDBY="0" UPDATED="2006-05-09 16:27:07.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="635" MAPPINGNAME="/ad_callouts/SL_WRPhaseProduct_Product.html" ISDEFAULT="Y" />
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1584" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-09 16:27:07.0" CREATEDBY="0" UPDATED="2006-05-09 16:27:07.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="636" MAPPINGNAME="/ad_callouts/SL_WRPhase_Sequence.html" ISDEFAULT="Y" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800004" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="100" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800001" MAPPINGNAME="/info/BusinessPartner_FS.html" ISDEFAULT="Y" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800005" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="100" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800001" MAPPINGNAME="/info/BusinessPartner_F1.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800006" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="100" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800001" MAPPINGNAME="/info/BusinessPartner_F2.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800007" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="100" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800001" MAPPINGNAME="/info/BusinessPartner_F3.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800008" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800002" MAPPINGNAME="/info/DebtPayment_FS.html" ISDEFAULT="Y" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800009" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800002" MAPPINGNAME="/info/DebtPayment_F1.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800010" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800002" MAPPINGNAME="/info/DebtPayment_F2.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800011" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800002" MAPPINGNAME="/info/DebtPayment_F3.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800012" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800003" MAPPINGNAME="/info/Invoice_FS.html" ISDEFAULT="Y" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800013" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800003" MAPPINGNAME="/info/Invoice_F1.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800014" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800003" MAPPINGNAME="/info/Invoice_F2.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800015" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800003" MAPPINGNAME="/info/Invoice_F3.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800016" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800004" MAPPINGNAME="/info/Product_FS.html" ISDEFAULT="Y" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800017" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800004" MAPPINGNAME="/info/Product_F1.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800018" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800004" MAPPINGNAME="/info/Product_F2.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800019" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800004" MAPPINGNAME="/info/Product_F3.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800020" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800005" MAPPINGNAME="/info/Project_FS.html" ISDEFAULT="Y" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800021" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800005" MAPPINGNAME="/info/Project_F1.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800022" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800005" MAPPINGNAME="/info/Project_F2.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800023" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800005" MAPPINGNAME="/info/Project_F3.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800024" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800006" MAPPINGNAME="/info/SalesOrder_FS.html" ISDEFAULT="Y" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800025" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800006" MAPPINGNAME="/info/SalesOrder_F1.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800026" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800006" MAPPINGNAME="/info/SalesOrder_F2.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800027" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800006" MAPPINGNAME="/info/SalesOrder_F3.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800028" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800007" MAPPINGNAME="/info/SalesOrderLine_FS.html" ISDEFAULT="Y" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800029" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800007" MAPPINGNAME="/info/SalesOrderLine_F1.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800030" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800007" MAPPINGNAME="/info/SalesOrderLine_F2.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800031" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800007" MAPPINGNAME="/info/SalesOrderLine_F3.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800032" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800008" MAPPINGNAME="/info/ShipmentReceiptLine_FS.html" ISDEFAULT="Y" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800033" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800008" MAPPINGNAME="/info/ShipmentReceiptLine_F1.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800034" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800008" MAPPINGNAME="/info/ShipmentReceiptLine_F2.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800035" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-10 17:56:03.0" CREATEDBY="0" UPDATED="2006-05-10 17:56:03.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800008" MAPPINGNAME="/info/ShipmentReceiptLine_F3.html" ISDEFAULT="N" />
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800582" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-15 17:52:05.0" CREATEDBY="100" UPDATED="2007-05-31 19:33:08.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800523" MAPPINGNAME="/ad_forms/FileImport.html" ISDEFAULT="Y" />
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800583" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-15 17:52:05.0" CREATEDBY="100" UPDATED="2006-05-15 17:52:05.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800524" MAPPINGNAME="/ad_forms/InitialClientSetup.html" ISDEFAULT="Y" />
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="800584" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-05-15 17:52:05.0" CREATEDBY="100" UPDATED="2006-05-15 17:52:05.0" UPDATEDBY="0" AD_MODEL_OBJECT_ID="800525" MAPPINGNAME="/ad_forms/MaterialTransactions.html" ISDEFAULT="Y" />
@@ -359,14 +327,6 @@
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="801900" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-12-17 19:57:51.0" CREATEDBY="100" UPDATED="2006-12-17 19:57:51.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801298" MAPPINGNAME="/ad_reports/Rpt_Etiquetas.html" ISDEFAULT="Y" />
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="801901" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-12-17 19:58:25.0" CREATEDBY="100" UPDATED="2006-12-17 19:58:25.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801298" MAPPINGNAME="/ad_reports/Rpt_Etiquetas_Config.html" ISDEFAULT="N" />
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="801918" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-12-27 13:52:29.0" CREATEDBY="100" UPDATED="2006-12-27 13:52:29.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801305" MAPPINGNAME="/ad_callouts/SL_MachineCost.html" ISDEFAULT="Y" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="801919" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-12-28 13:27:25.0" CREATEDBY="100" UPDATED="2006-12-28 13:27:25.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801306" MAPPINGNAME="/info/ShipmentReceipt_FS.html" ISDEFAULT="Y" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="801920" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-12-28 13:27:25.0" CREATEDBY="100" UPDATED="2006-12-28 13:27:25.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801306" MAPPINGNAME="/info/ShipmentReceipt_F1.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="801921" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-12-28 13:27:25.0" CREATEDBY="100" UPDATED="2006-12-28 13:27:25.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801306" MAPPINGNAME="/info/ShipmentReceipt_F2.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="801922" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-12-28 13:27:25.0" CREATEDBY="100" UPDATED="2006-12-28 13:27:25.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801306" MAPPINGNAME="/info/ShipmentReceipt_F3.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="801923" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-12-28 14:22:31.0" CREATEDBY="100" UPDATED="2006-12-28 14:22:31.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801307" MAPPINGNAME="/info/InvoiceLine_FS.html" ISDEFAULT="Y" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="801924" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-12-28 14:22:31.0" CREATEDBY="100" UPDATED="2006-12-28 14:22:31.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801307" MAPPINGNAME="/info/InvoiceLine_F1.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="801925" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-12-28 14:22:31.0" CREATEDBY="100" UPDATED="2006-12-28 14:22:31.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801307" MAPPINGNAME="/info/InvoiceLine_F2.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="801926" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2006-12-28 14:22:31.0" CREATEDBY="100" UPDATED="2006-12-28 14:22:31.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801307" MAPPINGNAME="/info/InvoiceLine_F3.html" ISDEFAULT="N" />
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802072" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-01-24 16:29:54.0" CREATEDBY="100" UPDATED="2007-01-24 16:29:54.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801381" MAPPINGNAME="/ad_callouts/SL_Requisition_BPartner.html" ISDEFAULT="Y" />
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802082" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-02-05 10:50:18.0" CREATEDBY="100" UPDATED="2007-02-05 10:50:18.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801387" MAPPINGNAME="/ad_actionButton/CopyFromPOOrder.html" ISDEFAULT="Y" />
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802083" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-02-13 15:25:14.0" CREATEDBY="100" UPDATED="2007-07-19 10:23:28.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801388" MAPPINGNAME="/ad_forms/about.html" ISDEFAULT="Y" />
@@ -379,18 +339,7 @@
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802114" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-03-23 18:18:13.0" CREATEDBY="100" UPDATED="2007-03-23 18:18:13.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800530" MAPPINGNAME="/ad_forms/MatchingPO-Receipt-Invoice_F3.html" ISDEFAULT="N" />
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802115" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-03-23 18:18:20.0" CREATEDBY="100" UPDATED="2007-03-23 18:18:20.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800530" MAPPINGNAME="/ad_forms/MatchingPO-Receipt-Invoice_F4.html" ISDEFAULT="N" />
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802116" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-03-23 18:18:38.0" CREATEDBY="100" UPDATED="2007-03-23 18:18:38.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800530" MAPPINGNAME="/ad_forms/MatchingPO-Receipt-Invoice_F5.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802125" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 12:24:22.0" CREATEDBY="0" UPDATED="2007-04-16 12:24:22.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801408" MAPPINGNAME="/info/Account_FS.html" ISDEFAULT="Y" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802126" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 12:24:22.0" CREATEDBY="0" UPDATED="2007-04-16 12:24:22.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801408" MAPPINGNAME="/info/Account_F1.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802127" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 12:24:22.0" CREATEDBY="0" UPDATED="2007-04-16 12:24:22.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801408" MAPPINGNAME="/info/Account_F2.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802128" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 12:24:22.0" CREATEDBY="0" UPDATED="2007-04-16 12:24:22.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801408" MAPPINGNAME="/info/Account_F3.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802133" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 13:46:14.0" CREATEDBY="100" UPDATED="2007-04-16 13:46:14.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801410" MAPPINGNAME="/info/ProductComplete_FS.html" ISDEFAULT="Y" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802134" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 13:46:14.0" CREATEDBY="100" UPDATED="2007-04-16 13:46:14.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801410" MAPPINGNAME="/info/ProductComplete_F1.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802135" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 13:46:14.0" CREATEDBY="100" UPDATED="2007-04-16 13:46:14.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801410" MAPPINGNAME="/info/ProductComplete_F2.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802136" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 13:46:14.0" CREATEDBY="100" UPDATED="2007-04-16 13:46:14.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801410" MAPPINGNAME="/info/ProductComplete_F3.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802141" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 16:44:34.0" CREATEDBY="0" UPDATED="2007-04-16 16:44:34.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801412" MAPPINGNAME="/info/Locator_FS.html" ISDEFAULT="Y" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802142" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 16:44:34.0" CREATEDBY="0" UPDATED="2007-04-16 16:44:34.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801412" MAPPINGNAME="/info/Locator_F1.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802143" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 16:44:34.0" CREATEDBY="0" UPDATED="2007-04-16 16:44:34.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801412" MAPPINGNAME="/info/Locator_F2.html" ISDEFAULT="N" />
-  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802144" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 16:44:34.0" CREATEDBY="0" UPDATED="2007-04-16 16:44:34.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801412" MAPPINGNAME="/info/Locator_F3.html" ISDEFAULT="N" />
+  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802141" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 16:44:34.0" CREATEDBY="0" UPDATED="2008-04-14 12:46:56.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801412" MAPPINGNAME="/info/Locator_FS.html" ISDEFAULT="N" />
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802145" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 16:50:41.0" CREATEDBY="0" UPDATED="2007-04-16 16:50:41.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801413" MAPPINGNAME="/info/Location_FS.html" ISDEFAULT="Y" />
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802146" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 16:50:41.0" CREATEDBY="0" UPDATED="2007-04-16 16:50:41.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801413" MAPPINGNAME="/info/Location_F1.html" ISDEFAULT="N" />
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="802147" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 16:50:41.0" CREATEDBY="0" UPDATED="2007-04-16 16:50:41.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801413" MAPPINGNAME="/info/Location_F2.html" ISDEFAULT="N" />
@@ -2922,4 +2871,19 @@
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1005900025" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-03-23 20:21:32.0" CREATEDBY="100" UPDATED="2008-03-23 20:21:32.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="1005900012" MAPPINGNAME="/ServiceProject/Supplier_Edition.html" ISDEFAULT="N" />
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1005900026" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-03-23 20:21:32.0" CREATEDBY="100" UPDATED="2008-03-23 20:21:32.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="1005900012" MAPPINGNAME="/ServiceProject/Supplier_Excel.xls" ISDEFAULT="N" />
   <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1005900027" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-03-23 20:21:32.0" CREATEDBY="100" UPDATED="2008-03-23 20:21:32.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="1005900013" MAPPINGNAME="/ad_callouts/ComboReloads800005.html" ISDEFAULT="N" />
+  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1006300000" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-06 17:02:02.0" CREATEDBY="100" UPDATED="2008-04-06 17:02:02.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800001" MAPPINGNAME="/info/BusinessPartner.html" ISDEFAULT="Y" />
+  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1006300001" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-08 14:57:44.0" CREATEDBY="100" UPDATED="2008-04-08 14:57:49.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801408" MAPPINGNAME="/info/Account.html" ISDEFAULT="Y" />
+  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1006300002" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 10:31:02.0" CREATEDBY="100" UPDATED="2008-04-14 10:31:02.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800779" MAPPINGNAME="/info/BusinessPartnerMultiple.html" ISDEFAULT="Y" />
+  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1006300003" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 09:24:04.0" CREATEDBY="100" UPDATED="2008-04-18 09:24:04.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800781" MAPPINGNAME="/info/ProductMultiple.html" ISDEFAULT="Y" />
+  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1006300004" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-18 13:14:01.0" CREATEDBY="100" UPDATED="2008-04-18 13:14:01.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800003" MAPPINGNAME="/info/Invoice.html" ISDEFAULT="Y" />
+  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1006300005" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 10:24:24.0" CREATEDBY="100" UPDATED="2008-04-19 10:24:24.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800002" MAPPINGNAME="/info/DebtPayment.html" ISDEFAULT="Y" />
+  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1006300006" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 12:26:47.0" CREATEDBY="100" UPDATED="2008-04-20 12:26:47.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801307" MAPPINGNAME="/info/InvoiceLine.html" ISDEFAULT="Y" />
+  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1006400000" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-08 20:15:34.0" CREATEDBY="100" UPDATED="2008-04-09 11:30:32.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800004" MAPPINGNAME="/info/Product.html" ISDEFAULT="Y" />
+  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1006400001" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-11 12:02:41.0" CREATEDBY="100" UPDATED="2008-04-11 12:36:58.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801410" MAPPINGNAME="/info/ProductComplete.html" ISDEFAULT="Y" />
+  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1006400003" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 12:46:45.0" CREATEDBY="100" UPDATED="2008-04-14 12:46:45.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801412" MAPPINGNAME="/info/Locator.html" ISDEFAULT="Y" />
+  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1006400004" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-14 18:21:04.0" CREATEDBY="100" UPDATED="2008-04-14 18:21:04.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800005" MAPPINGNAME="/info/Project.html" ISDEFAULT="Y" />
+  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1006400005" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-15 14:10:41.0" CREATEDBY="100" UPDATED="2008-04-15 14:10:41.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="801306" MAPPINGNAME="/info/ShipmentReceipt.html" ISDEFAULT="Y" />
+  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1006400006" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-17 15:54:30.0" CREATEDBY="100" UPDATED="2008-04-17 15:54:30.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800007" MAPPINGNAME="/info/SalesOrderLine.html" ISDEFAULT="Y" />
+  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1006400007" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-19 15:44:30.0" CREATEDBY="100" UPDATED="2008-04-19 15:44:30.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800006" MAPPINGNAME="/info/SalesOrder.html" ISDEFAULT="Y" />
+  <AD_MODEL_OBJECT_MAPPING AD_MODEL_OBJECT_MAPPING_ID="1006400008" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 16:12:39.0" CREATEDBY="100" UPDATED="2008-04-20 16:12:39.0" UPDATEDBY="100" AD_MODEL_OBJECT_ID="800008" MAPPINGNAME="/info/ShipmentReceiptLine.html" ISDEFAULT="Y" />
 </data>
--- a/database/sourcedata/AD_REF_SEARCH_COLUMN.xml	Mon Apr 21 19:03:40 2008 +0000
+++ b/database/sourcedata/AD_REF_SEARCH_COLUMN.xml	Mon Apr 21 19:06:47 2008 +0000
@@ -34,4 +34,18 @@
   <AD_REF_SEARCH_COLUMN AD_REF_SEARCH_COLUMN_ID="800031" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 13:54:04.0" CREATEDBY="100" UPDATED="2007-04-16 13:54:04.0" UPDATEDBY="100" AD_REF_SEARCH_ID="800012" NAME="M_Product_ID" COLUMNNAME="PriceLimit" COLUMNTYPE="O" COLUMN_SUFFIX="_PLIM" />
   <AD_REF_SEARCH_COLUMN AD_REF_SEARCH_COLUMN_ID="800032" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 13:54:22.0" CREATEDBY="100" UPDATED="2007-04-16 13:54:22.0" UPDATEDBY="100" AD_REF_SEARCH_ID="800012" NAME="M_Product_ID" COLUMNNAME="C_Currency_ID" COLUMNTYPE="O" COLUMN_SUFFIX="_CURR" />
   <AD_REF_SEARCH_COLUMN AD_REF_SEARCH_COLUMN_ID="800034" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2007-04-16 16:45:16.0" CREATEDBY="100" UPDATED="2007-04-16 16:45:16.0" UPDATEDBY="100" AD_REF_SEARCH_ID="800014" NAME="mWarehouseId" COLUMNNAME="M_Warehouse_ID" COLUMNTYPE="I" />
+  <AD_REF_SEARCH_COLUMN AD_REF_SEARCH_COLUMN_ID="1006300000" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 21:45:13.0" CREATEDBY="100" UPDATED="2008-04-20 21:45:13.0" UPDATEDBY="100" AD_REF_SEARCH_ID="800000" NAME="AD_Org_ID" COLUMNNAME="AD_Org_ID" COLUMNTYPE="I" />
+  <AD_REF_SEARCH_COLUMN AD_REF_SEARCH_COLUMN_ID="1006300001" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 21:53:07.0" CREATEDBY="100" UPDATED="2008-04-20 21:53:07.0" UPDATEDBY="100" AD_REF_SEARCH_ID="800011" NAME="AD_Org_ID" COLUMNNAME="AD_Org_ID" COLUMNTYPE="I" />
+  <AD_REF_SEARCH_COLUMN AD_REF_SEARCH_COLUMN_ID="1006300002" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 21:53:38.0" CREATEDBY="100" UPDATED="2008-04-20 21:53:38.0" UPDATEDBY="100" AD_REF_SEARCH_ID="800001" NAME="AD_Org_ID" COLUMNNAME="AD_Org_ID" COLUMNTYPE="I" />
+  <AD_REF_SEARCH_COLUMN AD_REF_SEARCH_COLUMN_ID="1006300003" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 21:54:12.0" CREATEDBY="100" UPDATED="2008-04-20 21:54:12.0" UPDATEDBY="100" AD_REF_SEARCH_ID="800002" NAME="AD_Org_ID" COLUMNNAME="AD_Org_ID" COLUMNTYPE="I" />
+  <AD_REF_SEARCH_COLUMN AD_REF_SEARCH_COLUMN_ID="1006300004" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 21:54:47.0" CREATEDBY="100" UPDATED="2008-04-20 21:54:47.0" UPDATEDBY="100" AD_REF_SEARCH_ID="800010" NAME="AD_Org_ID" COLUMNNAME="AD_Org_ID" COLUMNTYPE="I" />
+  <AD_REF_SEARCH_COLUMN AD_REF_SEARCH_COLUMN_ID="1006300005" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 21:55:17.0" CREATEDBY="100" UPDATED="2008-04-20 21:55:17.0" UPDATEDBY="100" AD_REF_SEARCH_ID="800015" NAME="AD_Org_ID" COLUMNNAME="AD_Org_ID" COLUMNTYPE="I" />
+  <AD_REF_SEARCH_COLUMN AD_REF_SEARCH_COLUMN_ID="1006300006" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 21:55:41.0" CREATEDBY="100" UPDATED="2008-04-20 21:55:41.0" UPDATEDBY="100" AD_REF_SEARCH_ID="800014" NAME="AD_Org_ID" COLUMNNAME="AD_Org_ID" COLUMNTYPE="I" />
+  <AD_REF_SEARCH_COLUMN AD_REF_SEARCH_COLUMN_ID="1006300007" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 21:56:56.0" CREATEDBY="100" UPDATED="2008-04-20 21:56:56.0" UPDATEDBY="100" AD_REF_SEARCH_ID="800003" NAME="AD_Org_ID" COLUMNNAME="AD_Org_ID" COLUMNTYPE="I" />
+  <AD_REF_SEARCH_COLUMN AD_REF_SEARCH_COLUMN_ID="1006300008" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 21:57:22.0" CREATEDBY="100" UPDATED="2008-04-20 21:57:22.0" UPDATEDBY="100" AD_REF_SEARCH_ID="800012" NAME="AD_Org_ID" COLUMNNAME="AD_Org_ID" COLUMNTYPE="I" />
+  <AD_REF_SEARCH_COLUMN AD_REF_SEARCH_COLUMN_ID="1006300009" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 21:57:44.0" CREATEDBY="100" UPDATED="2008-04-20 21:57:44.0" UPDATEDBY="100" AD_REF_SEARCH_ID="800004" NAME="AD_Org_ID" COLUMNNAME="AD_Org_ID" COLUMNTYPE="I" />
+  <AD_REF_SEARCH_COLUMN AD_REF_SEARCH_COLUMN_ID="1006300010" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 21:58:18.0" CREATEDBY="100" UPDATED="2008-04-20 21:58:18.0" UPDATEDBY="100" AD_REF_SEARCH_ID="800005" NAME="AD_Org_ID" COLUMNNAME="AD_Org_ID" COLUMNTYPE="I" />
+  <AD_REF_SEARCH_COLUMN AD_REF_SEARCH_COLUMN_ID="1006300011" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 21:58:43.0" CREATEDBY="100" UPDATED="2008-04-20 21:58:43.0" UPDATEDBY="100" AD_REF_SEARCH_ID="800006" NAME="AD_Org_ID" COLUMNNAME="AD_Org_ID" COLUMNTYPE="I" />
+  <AD_REF_SEARCH_COLUMN AD_REF_SEARCH_COLUMN_ID="1006300012" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 21:59:14.0" CREATEDBY="100" UPDATED="2008-04-20 21:59:14.0" UPDATEDBY="100" AD_REF_SEARCH_ID="800009" NAME="AD_Org_ID" COLUMNNAME="AD_Org_ID" COLUMNTYPE="I" />
+  <AD_REF_SEARCH_COLUMN AD_REF_SEARCH_COLUMN_ID="1006300013" AD_CLIENT_ID="0" AD_ORG_ID="0" ISACTIVE="Y" CREATED="2008-04-20 21:59:44.0" CREATEDBY="100" UPDATED="2008-04-20 21:59:44.0" UPDATEDBY="100" AD_REF_SEARCH_ID="800007" NAME="AD_Org_ID" COLUMNNAME="AD_Org_ID" COLUMNTYPE="I" />
 </data>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/erpCommon/info/Account.html	Mon Apr 21 19:06:47 2008 +0000
@@ -0,0 +1,430 @@
+<!--
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License. 
+ * The Original Code is Openbravo ERP. 
+ * The Initial Developer of the Original Code is Openbravo SL 
+ * All portions are Copyright (C) 2001-2008 Openbravo SL 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+-->
+<html>
+<head>
+<title>Account selector</title>
+<link rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"></link>
+<link rel="stylesheet" type="text/css" 	href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"></link>
+<script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/appStatus.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/dojoConfig.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/openbravo/core.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/openbravo/widget/DataGrid.js" type="text/javascript"></script>
+<script language="JavaScript" type="text/javascript" id="paramLanguage">LNG_POR_DEFECTO = "en_US";</script>
+<script language="JavaScript" type="text/javascript" id="paramDirection">var baseDirection = "../../../../../web/";</script>
+<script language="JavaScript" src="../../../../../web/js/TypeAheadCombo.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/searchs.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/messages.js" type="text/javascript"></script>
+<script type="text/javascript">
+        dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
+</script>
+<script language="JavaScript" type="text/javascript">
+function depurar() {
+	var frm = document.forms[0];
+	if ((frm.inpAlias.value==null || frm.inpAlias.value=="") && (frm.inpCombination.value==null || frm.inpCombination.value=="") && frm.inpOrganization.selectedIndex==-1 && frm.inpAccount.selectedIndex==-1 && frm.inpProduct.selectedIndex==-1 && frm.inpBPartner.selectedIndex==-1 && frm.inpProject.selectedIndex==-1 && frm.inpCampaign.selectedIndex==-1) {
+		frm.inpAlias.focus();
+		// mensaje(7);
+		return false;
+	}
+  if (frm.inpOrganization.value==null || frm.inpOrganization.value=="") {
+    frm.inpOrganization.focus();
+    // mensaje(7);
+    return false;    
+  }
+	return true;
+}
+
+function onloadFunctions() {
+	/*
+	new TypeAheadCombo("inpOrganization");
+	new TypeAheadCombo("inpAccount");
+	new TypeAheadCombo("inpProduct");
+	new TypeAheadCombo("inpBPartner");
+  	new TypeAheadCombo("inpProject");
+  	new TypeAheadCombo("inpCampaign");
+  
+  	keyArray[keyArray.lenght] = new keyArrayItem("B", "submitCommandForm('FIND', false, null, null, 'medio');", null, "ctrlKey");
+  	*/  
+}
+</script>
+<script language="JavaScript" type="text/javascript" id="selectedColumn">  
+  dojo.require("openbravo.widget.DataGrid");
+  var selectedRow = 0;
+  var orderByPositions = new Array("1");
+  var orderByDirections = new Array("ASC");
+</script>
+<script language="JavaScript" type="text/javascript">
+	function onLoadDo(){
+	    this.windowTables = new Array(
+	      new windowTableId('client_top', null, 'buttonSearch', null),
+	      new windowTableId('client_middle', null, 'buttonOK', null),
+	      new windowTableId('client_bottom', null, 'buttonOK', null)
+	    );
+	    setWindowTableParentElement();
+	    enableShortcuts('popup');
+	
+	    try {
+	      onloadFunctions();
+	    } catch (e) {}
+	
+	    setWindowElementFocus('firstElement');
+	    resizeAreaInfo();
+  }
+
+  function onResizeDo(){
+    resizeAreaInfo(true);
+  }
+  
+  function depurarSelector(action) {
+  	var keys; var clave; var texto;
+  	if(action == 'SAVE') {
+	  	keys = getSelectdText().split("#"); 
+	  	clave = keys[0];
+		texto = keys[1];
+	}
+	parent.opener.closeSearch(action, clave, texto, null);
+  }
+  
+  function disableSaveButton(a) {
+  	a.onclick = new Function("return false;");
+  }
+  
+  function enableSaveButton(a) {
+  	a.onclick = new Function("saveCombination();return false;");
+  }
+  
+  function saveCombination() {
+  	var b = document.getElementById("buttonSave");
+  	if(depurar()) {
+  		disableSaveButton(b);
+		submitXmlHttpRequest(saveCallback, null, 'SAVE', "Account.html", false);
+	}
+  }
+  
+  function saveCallback() {
+  	var f = document.forms[0];
+  	f.inpCombination.value = "%";
+  	var b = document.getElementById("buttonSave");
+  	setFilters();
+  	enableSaveButton(b);
+  }
+  
+	</script>
+</head>
+<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
+<form name="frmSelector" method="POST" action="Account.html">
+	<input type="hidden" name="Command" />
+	<input type="hidden" name="IsPopUpCall" value="1" />
+	<input type="hidden" name="inpAD_Org_ID" value="xx" id="fieldOrgs" />
+	<div class="Popup_ContentPane_CircleLogo">
+		<div class="Popup_WindowLogo">
+			<img class="Popup_WindowLogo_Icon Popup_WindowLogo_Icon_account" src="../../../../../web/images/blank.gif" border="0" />
+		</div>
+	</div>
+	<table cellspacing="0" cellpadding="0" width="100%" id="table_header">
+		<tr>
+			<td>
+			<table cellspacing="0" cellpadding="0" class="Popup_ContentPane_NavBar">
+				<tr class="Popup_NavBar_bg">
+					<td></td>
+					<td class="Popup_NavBar_separator_cell"></td>
+					<td class="Popup_NavBar_bg_logo_left"></td>
+					<td class="Popup_NavBar_bg_logo" width="1" onclick="abrirNuevoBrowser('http://www.openbravo.com', 'Openbravo');return false;">
+					<img src="../../../../../web/images/blank.gif" alt="Openbravo" title="Openbravo" border="0" id="openbravoLogo" class="Popup_NavBar_logo" /></td>
+					<td class="Popup_NavBar_bg_logo_right"></td>
+					<td class="Popup_NavBar_Popup_title_cell"><span>Account Selector</span><a></a></td>
+					<td class="Popup_NavBar_separator_cell"></td>
+				</tr>
+			</table>
+			</td>
+		</tr>
+		<tr>
+			<td>
+			<table cellspacing="0" cellpadding="0" class="Popup_ContentPane_SeparatorBar">
+				<tr>
+					<td class="Popup_SeparatorBar_bg"></td>
+				</tr>
+			</table>
+			</td>
+		</tr>
+	</table>
+  	<table cellspacing="0" cellpadding="0" width="100%">
+		<tr>
+			<td>
+			<div class="Popup_ContentPane_Client" style="overflow: auto;" id="client_top">
+			<table cellspacing="0" cellpadding="0" class="Popup_Client_TableSelector">
+				<tr>
+					<td class="TableEdition_OneCell_width"></td>
+					<td class="TableEdition_OneCell_width"></td>
+					<td class="TableEdition_OneCell_width"></td>
+					<td class="TableEdition_OneCell_width"></td>
+					<td class="TableEdition_OneCell_width"></td>
+					<td class="TableEdition_OneCell_width"></td>
+				</tr>
+				<tr>
+					<td colspan="6">
+					<table class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
+						<tr class="FieldGroup_TopMargin"></tr>
+						<tr>
+							<td class="FieldGroupTitle_Left">
+								<img class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"></img></td>
+							<td class="FieldGroupTitle">Primary Filters</td>
+							<td class="FieldGroupTitle_Right">
+								<img class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"></img></td>
+							<td class="FieldGroupContent"></td>
+						</tr>
+						<tr class="FieldGroup_BottomMargin"></tr>
+					</table>
+					</td>
+				</tr>
+				<tr></tr>
+				<tr>
+					<td class="TitleCell"><span class="LabelText">Alias</span></td>
+					<td class="TextBox_ContentCell">
+						<input type="hidden" name="inpValidCombination" value="" id="fieldValidCombination" />
+						<input class="dojoValidateValid TextBox_OneCell_width" name="inpAlias" type="text" size="25" value="" id="fieldAlias" />
+					</td>
+					<td />
+					<td class="TitleCell"><span class="LabelText">Accounting combination</span></td>
+					<td class="TextBox_ContentCell">
+						<input class="dojoValidateValid TextBox_OneCell_width" name="inpCombination" type="text" size="25" value="" id="fieldCombination"></input>
+					</td>
+					<td />
+				</tr>
+				<tr>
+					<td class="TitleCell"><span class="LabelText">Organization</span></td>
+					<td class="Combo_ContentCell" colspan="2">
+						<select class="Combo Combo_TwoCells_width required" required="true" name="inpOrganization" id="inpOrganization">
+							<option value=""></option>
+							<div id="reportAD_Org_ID"></div>
+						</select>
+					</td>
+					<td class="TitleCell"><span class="LabelText">Account</span></td>
+					<td class="Combo_ContentCell" colspan="2">
+						<select class="Combo Combo_TwoCells_width required" required="true" name="inpAccount" id="inpAccount">
+							<option value=""></option>
+							<div id="reportAccount_ID"></div>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td class="TitleCell"><span class="LabelText">Product</span></td>
+					<td class="Combo_ContentCell" colspan="2">
+						<select class="Combo Combo_TwoCells_width" name="inpProduct" id="inpProduct">
+							<option value=""></option>
+							<div id="reportM_Product_ID"></div>
+						</select>
+					</td>
+					<td class="TitleCell"><span class="LabelText">Business Partner</span></td>
+					<td class="Combo_ContentCell" colspan="2">
+						<select class="Combo Combo_TwoCells_width" name="inpBPartner" id="inpBPartner">
+							<option value=""></option>
+							<div id="reportC_BPartner_ID"></div>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td class="TitleCell"><span class="LabelText">Project</span></td>
+					<td class="Combo_ContentCell" colspan="2">
+						<select class="Combo Combo_TwoCells_width" name="inpProject" id="inpProject">
+							<option value=""></option>
+							<div id="reportC_Project_ID"></div>
+						</select>
+					</td>
+					<td class="TitleCell"><span class="LabelText">Campaign</span></td>
+					<td class="Combo_ContentCell" colspan="2">
+						<select class="Combo Combo_TwoCells_width" name="inpCampaign" id="inpCampaign">
+							<option value=""></option>
+							<div id="reportC_Campaign_ID"></div>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<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="setFilters();return false;"
+								id="buttonSearch">
+									<table class="Button"
+										onmousedown="this.className='Button_active'; return true;"
+										onmouseup="this.className='Button'; return true;"
+										onmouseover="this.className='Button_hover'; window.status='Search'; return true;"
+										onmouseout="this.className='Button'; window.status=''; 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="Button_LeftAlign_ContentCell">
+						<div>
+							<a class="ButtonLink" href="#"
+								onfocus="setWindowElementFocus(this); window.status='Save'; return true;"
+								onblur="window.status=''; return true;"
+								onkeypress="this.className='ButtonLink_active'; return true;"
+								onkeyup="this.className='ButtonLink_focus'; return true;"
+								onclick="saveCombination();return false;" id="buttonSave">
+								<table class="Button"
+									onmousedown="this.className='Button_active'; return true;"
+									onmouseup="this.className='Button'; return true;"
+									onmouseover="this.className='Button_hover'; window.status='Save'; return true;"
+									onmouseout="this.className='Button'; window.status=''; return true;">
+									<tr>
+										<td class="Button_left">
+										<img class="Button_Icon Button_Icon_save" alt="Save" title="Save" src="../../../../../web/images/blank.gif" border="0" /></td>
+										<td class="Button_text Button_width">Save</td>
+										<td class="Button_right"></td>
+									</tr>
+								</table>
+							</a>
+						</div>
+					</td>
+					<td></td>
+					<td></td>
+					<td></td>
+				</tr>				
+			</table>
+			</div>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<div class="Popup_ContentPane_Client" style="overflow: hidden; height: 0px;" id="client_middle">
+		          <table summary="" id="sectionDetail">
+		            <tr>
+		              <td>
+		                <table cellspacing="0" cellpadding="0" width="10px" class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;" id="grid_sample">
+		                  <tr class="DataGrid_Body_Row" id="grid_sample_header">
+		                    <th width="10px" class="DataGrid_Header_Cell">DataGrid</th>
+		                  </tr>
+		                  <tr class="DataGrid_Body_Row DataGrid_Body_Row_1" onclick="selectActual(this); loadData('BBAccountingUser', '1000012', '', '1'); return true;" id="grid_sample_row">
+		                    <td class="DataGrid_Body_Cell">Loading...</td>
+		                  </tr>
+		                </table>
+		                <table width="100%" cellspacing="0" cellpadding="0" border="0" class="Main_Client_TableRelation" id="grid_table">
+		                  <tr>
+		                    <td>
+		                      <div id="grid" dojotype="openbravo:DataGrid"
+		                        structureurl="../info/Account.html?Command=STRUCTURE"
+		                        dataurl="../info/Account.html?Command=DATA"
+		                        updatesurl="../info/Account.html?Command=DATA"
+		                        calculatenumrows="true" editable="false" sortable="true"
+		                        deleteable="true" oninvalidvalue="alert" onscroll="updateHeader"
+		                        ongridload="onGridLoadDo" buffersize="3.0" showlinenumbers="true"
+		                        offset="0" sortcols="1" sortdirs="ASC" defaultrow="0"
+		                        maxwidth="99%" percentagewidthrelativetoid="client_middle"
+		                        multipleRowSelection="false"
+		                        preventcache="true" usecache="true" cachecontent="false">
+		                      </div>
+		                      <script>djConfig.searchIds.push("grid");</script>
+		                    </td>
+		                  </tr>
+		                </table>
+		              </td>
+		            </tr>
+		          </table>
+		        </div>
+			</td>
+		</tr>
+		<tr>
+			<td>
+			<div class="Popup_ContentPane_Client" style="overflow: auto; height: 50px;" id="client_bottom">
+				<table cellspacing="0" cellpadding="0" class="Popup_Client_TableSelector">	
+					<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></td>
+						<td></td>
+						<td class="Button_RightAlign_ContentCell">
+						<div><a class="ButtonLink" href="#"
+							onfocus="setWindowElementFocus(this); window.status='OK'; return true;"
+							onblur="window.status=''; return true;"
+							onkeypress="this.className='ButtonLink_active'; return true;"
+							onkeyup="this.className='ButtonLink_focus'; return true;"
+							onclick="depurarSelector('SAVE');return false;" id="buttonOK">
+						<table class="Button"
+							onmousedown="this.className='Button_active'; return true;"
+							onmouseup="this.className='Button'; return true;"
+							onmouseover="this.className='Button_hover'; window.status='OK'; return true;"
+							onmouseout="this.className='Button'; window.status=''; return true;">
+							<tr>
+								<td class="Button_left"><img
+									class="Button_Icon Button_Icon_ok" alt="OK" title="OK"
+									src="../../../../../web/images/blank.gif" border="0" /></td>
+								<td class="Button_text Button_width">OK</td>
+								<td class="Button_right"></td>
+							</tr>
+						</table>
+						</a></div>
+						</td>
+						<td class="Button_LeftAlign_ContentCell">
+							<div>
+								<a class="ButtonLink" href="#"
+									onfocus="setWindowElementFocus(this); window.status='Cancel'; return true;"
+									onblur="window.status=''; return true;"
+									onkeypress="this.className='ButtonLink_active'; return true;"
+									onkeyup="this.className='ButtonLink_focus'; return true;"
+									onclick="depurarSelector('CLEAR');return false;">
+								<table class="Button"
+									onmousedown="this.className='Button_active'; return true;"
+									onmouseup="this.className='Button'; return true;"
+									onmouseover="this.className='Button_hover'; window.status='Cancel'; return true;"
+									onmouseout="this.className='Button'; window.status=''; return true;">
+									<tr>
+										<td class="Button_left"><img
+											class="Button_Icon Button_Icon_cancel" alt="Cancel"
+											title="Cancel" src="../../../../../web/images/blank.gif"
+											border="0" /></td>
+										<td class="Button_text Button_width">Cancel</td>
+										<td class="Button_right"></td>
+									</tr>
+								</table>
+								</a>
+							</div>
+						</td>
+						<td></td>
+						<td></td>
+					</tr>
+				</table>
+			</div>
+			</td>
+		</tr>
+	</table>
+</form>
+</body>
+</html>
--- a/src/org/openbravo/erpCommon/info/Account.java	Mon Apr 21 19:03:40 2008 +0000
+++ b/src/org/openbravo/erpCommon/info/Account.java	Mon Apr 21 19:06:47 2008 +0000
@@ -11,7 +11,7 @@
  * 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 portions are Copyright (C) 2001-2008 Openbravo SL 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -20,12 +20,18 @@
 
 import org.openbravo.base.secureApp.*;
 import org.openbravo.xmlEngine.XmlDocument;
+import org.openbravo.data.FieldProvider;
+import org.openbravo.erpCommon.utility.OBError;
+import org.openbravo.erpCommon.utility.SQLReturnObject;
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.erpCommon.utility.ComboTableData;
 
 import java.io.*;
+import java.util.Vector;
+
 import javax.servlet.*;
 import javax.servlet.http.*;
+
 import org.openbravo.utils.Replace;
 
 
@@ -50,10 +56,29 @@
       }
       vars.removeSessionValue("Account.alias");
       if (!strNameValue.equals("")) vars.setSessionValue("Account.combination", strNameValue + "%");
-      printPageFS(response, vars);
-    } else if (vars.commandIn("LOAD_FIELD")) {
-      String strClave = vars.getStringParameter("inpClave");
-      printPageFrame1(response, vars, "", "", strClave, false);
+      
+      String strAlias = vars.getGlobalVariable("inpAlias", "Account.alias", "");
+      String strCombination = vars.getGlobalVariable("inpCombination", "Account.combination", "");
+      printPage(response, vars, strAlias, strCombination, "", true);      
+    } else if(vars.commandIn("STRUCTURE")) {
+    	printGridStructure(response, vars);
+    } else if(vars.commandIn("DATA")) {
+        if(vars.getStringParameter("newFilter").equals("1"))
+          clearSessionValues(vars);
+    	  String strAlias = vars.getGlobalVariable("inpAlias", "Account.alias", "");
+        String strCombination = vars.getGlobalVariable("inpCombination", "Account.combination", "");
+        String strOrganization = vars.getStringParameter("inpOrganization");
+        String strAccount = vars.getStringParameter("inpAccount");
+        String strProduct = vars.getStringParameter("inpProduct");
+        String strBPartner = vars.getStringParameter("inpBPartner");
+        String strProject = vars.getStringParameter("inpProject");
+        String strCampaign = vars.getStringParameter("inpCampaign");
+        String strNewFilter = vars.getStringParameter("newFilter");
+        String strOffset = vars.getStringParameter("offset");
+        String strPageSize = vars.getStringParameter("page_size");
+        String strSortCols = vars.getStringParameter("sort_cols").toUpperCase();
+        String strSortDirs = vars.getStringParameter("sort_dirs").toUpperCase();
+        printGridData(response, vars, strAlias, strCombination, strOrganization, strAccount, strProduct, strBPartner, strProject, strCampaign, strSortCols + " " + strSortDirs, strOffset, strPageSize, strNewFilter);
     } else if (vars.commandIn("KEY")) {
       String strKeyValue = vars.getRequestGlobalVariable("inpNameValue", "Account.alias");
       String strAcctSchema = vars.getRequestGlobalVariable("inpAcctSchema", "Account.cAcctschemaId");
@@ -66,35 +91,7 @@
       AccountData[] data = AccountData.selectKey(this, strAcctSchema, Utility.getContext(this, vars, "#User_Client", "Account"), Utility.getContext(this, vars, "#User_Org", "Account"), strKeyValue + "%");
       if (data!=null && data.length==1) {
         printPageKey(response, vars, data);
-      } else printPageFS(response, vars);
-    } else if (vars.commandIn("FRAME1")) {
-      String strAlias = vars.getGlobalVariable("inpAlias", "Account.alias", "");
-      String strCombination = vars.getGlobalVariable("inpCombination", "Account.combination", "");
-      printPageFrame1(response, vars, strAlias, strCombination, "", true);
-    } else if (vars.commandIn("FRAME2")) {
-      String strAlias = vars.getGlobalVariable("inpAlias", "Account.alias", "");
-      String strCombination = vars.getGlobalVariable("inpCombination", "Account.combination", "");
-      String strOrganization = vars.getStringParameter("inpOrganization");
-      String strAccount = vars.getStringParameter("inpAccount");
-      String strProduct = vars.getStringParameter("inpProduct");
-      String strBPartner = vars.getStringParameter("inpBPartner");
-      String strProject = vars.getStringParameter("inpProject");
-      String strCampaign = vars.getStringParameter("inpCampaign");
-      printPageFrame2(response, vars, strAlias, strCombination, strOrganization, strAccount, strProduct, strBPartner, strProject, strCampaign);
-    } else if (vars.commandIn("FIND")) {
-      String strAlias = vars.getRequestGlobalVariable("inpAlias", "Account.alias");
-      String strCombination = vars.getRequestGlobalVariable("inpCombination", "Account.combination");
-      String strOrganization = vars.getStringParameter("inpOrganization");
-      String strAccount = vars.getStringParameter("inpAccount");
-      String strProduct = vars.getStringParameter("inpProduct");
-      String strBPartner = vars.getStringParameter("inpBPartner");
-      String strProject = vars.getStringParameter("inpProject");
-      String strCampaign = vars.getStringParameter("inpCampaign");
-
-      vars.setSessionValue("Account.initRecordNumber", "0");
-      printPageFrame2(response, vars, strAlias, strCombination, strOrganization, strAccount, strProduct, strBPartner, strProject, strCampaign);
-    } else if (vars.commandIn("FRAME3")) {
-      printPageFrame3(response, vars);
+      } else printPage(response, vars, strKeyValue + "%", "", "", true);
     } else if (vars.commandIn("SAVE")) {
       String strAcctSchema = vars.getSessionValue("Account.cAcctschemaId");
       String strClave = vars.getStringParameter("inpValidCombination");
@@ -109,41 +106,15 @@
       if (data!=null) strClave = data.cValidcombinationId;
       vars.removeSessionValue("Account.alias");
       vars.setSessionValue("Account.combination", AccountData.combination(this, strClave));
-      printPageFS(response, vars);
-    } else if (vars.commandIn("PREVIOUS")) {
-      String strInitRecord = vars.getSessionValue("Account.initRecordNumber");
-      String strRecordRange = Utility.getContext(this, vars, "#RecordRangeInfo", "Account");
-      int intRecordRange = strRecordRange.equals("")?0:Integer.parseInt(strRecordRange);
-      if (strInitRecord.equals("") || strInitRecord.equals("0")) vars.setSessionValue("Account.initRecordNumber", "0");
-      else {
-        int initRecord = (strInitRecord.equals("")?0:Integer.parseInt(strInitRecord));
-        initRecord -= intRecordRange;
-        strInitRecord = ((initRecord<0)?"0":Integer.toString(initRecord));
-        vars.setSessionValue("Account.initRecordNumber", strInitRecord);
-      }
-
-      request.getRequestDispatcher(request.getServletPath() + "?Command=FRAME2").forward(request, response);
-    } else if (vars.commandIn("NEXT")) {
-      String strInitRecord = vars.getSessionValue("Account.initRecordNumber");
-      String strRecordRange = Utility.getContext(this, vars, "#RecordRangeInfo", "Account");
-      int intRecordRange = strRecordRange.equals("")?0:Integer.parseInt(strRecordRange);
-      int initRecord = (strInitRecord.equals("")?0:Integer.parseInt(strInitRecord));
-      if (initRecord==0) initRecord=1;
-      initRecord += intRecordRange;
-      strInitRecord = ((initRecord<0)?"0":Integer.toString(initRecord));
-      vars.setSessionValue("Account.initRecordNumber", strInitRecord);
-
-      request.getRequestDispatcher(request.getServletPath() + "?Command=FRAME2").forward(request, response);
+      printPageSave(response, vars, data);
     } else pageError(response);
   }
 
-  void printPageFS(HttpServletResponse response, VariablesSecureApp vars) throws IOException, ServletException {
-    if (log4j.isDebugEnabled()) log4j.debug("Output: Account seeker Frame Set");
-    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/Account_FS").createXmlDocument();
-
+  void printPageSave(HttpServletResponse response, VariablesSecureApp vars, AccountData data) throws IOException, ServletException {
+    if (log4j.isDebugEnabled()) log4j.debug("Output: Saved");
     response.setContentType("text/html; charset=UTF-8");
     PrintWriter out = response.getWriter();
-    out.println(xmlDocument.print());
+    out.println(data.combination);
     out.close();
   }
 
@@ -169,15 +140,15 @@
     return html.toString();
   }
 
-  void printPageFrame1(HttpServletResponse response, VariablesSecureApp vars, String strAlias, String strCombination, String strValidCombination, boolean isDefault) throws IOException, ServletException {
+  void printPage(HttpServletResponse response, VariablesSecureApp vars, String strAlias, String strCombination, String strValidCombination, boolean isDefault) throws IOException, ServletException {
     if (log4j.isDebugEnabled()) log4j.debug("Output: Frame 1 of the accounts seeker");
-    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/Account_F1").createXmlDocument();
+    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/Account").createXmlDocument();
     AccountData[] data = null;
     if (isDefault) {
       if (strAlias.equals("") && strCombination.equals("")) strAlias = "%";
       data = AccountData.set(strAlias, strCombination);
     } else {
-      data = AccountData.select(this, "", "", "", "", "", "", "", "", "", strValidCombination, Utility.getContext(this, vars, "#User_Client", "Account"), Utility.getContext(this, vars, "#User_Org", "Account"));
+      data = AccountData.select(this, "1", "", "", "", "", "", "", "", "", "", strValidCombination, Utility.getContext(this, vars, "#User_Client", "Account"), Utility.getContext(this, vars, "#User_Org", "Account"), "1 ASC", "", "");
     }
     xmlDocument.setParameter("direction", "var baseDirection = \"" + strReplaceWith + "/\";\n");
     xmlDocument.setParameter("language", "LNG_POR_DEFECTO=\"" + vars.getLanguage() + "\";");
@@ -203,6 +174,7 @@
 
 
     try {
+      // Utility.getContext(conn, vars, "#AccessibleOrgTree", windowId, accesslevel)
       ComboTableData comboTableData = new ComboTableData(vars, this, "TABLE", "AD_Org_ID", "AD_Org (Trx)", "", Utility.getContext(this, vars, "#User_Org", "Account"), Utility.getContext(this, vars, "#User_Client", "Account"), 0);
       Utility.fillSQLParameters(this, vars, null, comboTableData, "Account", "");
       xmlDocument.setData("reportAD_Org_ID","liststructure", comboTableData.select(false));
@@ -240,58 +212,167 @@
     } catch (Exception ex) {
       throw new ServletException(ex);
     }
+    
+    xmlDocument.setParameter("orgs", vars.getStringParameter("inpAD_Org_ID"));
+    
+    xmlDocument.setParameter("grid", "20");
+    xmlDocument.setParameter("grid_Offset", "");
+    xmlDocument.setParameter("grid_SortCols", "1");
+    xmlDocument.setParameter("grid_SortDirs", "ASC");
+    xmlDocument.setParameter("grid_Default", "0");
 
     response.setContentType("text/html; charset=UTF-8");
     PrintWriter out = response.getWriter();
     out.println(xmlDocument.print());
     out.close();
   }
-
-  void printPageFrame2(HttpServletResponse response, VariablesSecureApp vars, String strAlias, String strCombination, String strOrganization, String strAccount, String strProduct, String strBPartner, String strProject, String strCampaign) throws IOException, ServletException {
-    if (log4j.isDebugEnabled()) log4j.debug("Output: Frame 2 of the accounts seeker");
-    XmlDocument xmlDocument;
-    String strAcctSchema = vars.getSessionValue("Account.cAcctschemaId");
-
-    String strRecordRange = Utility.getContext(this, vars, "#RecordRangeInfo", "Account");
-    int intRecordRange = (strRecordRange.equals("")?0:Integer.parseInt(strRecordRange));
-    String strInitRecord = vars.getSessionValue("Account.initRecordNumber");
-    int initRecordNumber = (strInitRecord.equals("")?0:Integer.parseInt(strInitRecord));
-
-    if (strAlias.equals("") && strCombination.equals("") && strOrganization.equals("") && strAccount.equals("") && strProduct.equals("") && strBPartner.equals("") && strProject.equals("") && strCampaign.equals("")) {
-      String[] discard = {"sectionDetail", "hasPrevious", "hasNext"};
-      xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/Account_F2", discard).createXmlDocument();
-      xmlDocument.setData("structure1", AccountData.set(strAlias, strCombination));
-    } else {
-      String[] discard = {"withoutPrevious", "withoutNext"};
-      AccountData[] data = AccountData.select(this, strAcctSchema, strAlias, strCombination, strOrganization, strAccount, strProduct, strBPartner, strProject, strCampaign, "", Utility.getContext(this, vars, "#User_Client", "Account"), Utility.getContext(this, vars, "#User_Org", "Account"), initRecordNumber, intRecordRange);
-      if (data==null || initRecordNumber<=1) discard[0] = new String("hasPrevious");
-      if (data==null || data.length==0 || data.length<intRecordRange) discard[1] = new String("hasNext");
-      xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/Account_F2", discard).createXmlDocument();
-      xmlDocument.setData("structure1", data);
-    }
-
-    xmlDocument.setParameter("language", "LNG_POR_DEFECTO=\"" + vars.getLanguage() + "\";");
-    xmlDocument.setParameter("direction", "var baseDirection = \"" + strReplaceWith + "/\";\n");
-    xmlDocument.setParameter("theme", vars.getTheme());
-    response.setContentType("text/html; charset=UTF-8");
-    PrintWriter out = response.getWriter();
-    out.println(xmlDocument.print());
-    out.close();
+  
+  void printGridStructure(HttpServletResponse response, VariablesSecureApp vars) throws IOException, ServletException {
+	  if (log4j.isDebugEnabled()) log4j.debug("Output: print page structure");
+	    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/utility/DataGridStructure").createXmlDocument();
+	    
+	    SQLReturnObject[] data = getHeaders(vars);
+	    String type = "Hidden";
+	    String title = "";
+	    String description = "";
+	   	    
+	    xmlDocument.setParameter("type", type);
+	    xmlDocument.setParameter("title", title);
+	    xmlDocument.setParameter("description", description);
+	    xmlDocument.setData("structure1", data);
+	    response.setContentType("text/xml; charset=UTF-8");
+	    response.setHeader("Cache-Control", "no-cache");
+	    PrintWriter out = response.getWriter();
+	    if (log4j.isDebugEnabled()) log4j.debug(xmlDocument.print());
+	    out.println(xmlDocument.print());
+	    out.close();
   }
-
-  void printPageFrame3(HttpServletResponse response, VariablesSecureApp vars) throws IOException, ServletException {
-    if (log4j.isDebugEnabled()) log4j.debug("Output: Frame 3 of the business partners seeker");
-    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/Account_F3").createXmlDocument();
-
-    response.setContentType("text/html; charset=UTF-8");
-    xmlDocument.setParameter("language", "LNG_POR_DEFECTO=\"" + vars.getLanguage() + "\";");
-    xmlDocument.setParameter("direction", "var baseDirection = \"" + strReplaceWith + "/\";\n");
-    xmlDocument.setParameter("theme", vars.getTheme());
-    PrintWriter out = response.getWriter();
-    out.println(xmlDocument.print());
-    out.close();
+  
+  private SQLReturnObject[] getHeaders(VariablesSecureApp vars) {
+	  SQLReturnObject[] data = null;
+	  Vector<SQLReturnObject> vAux = new Vector<SQLReturnObject>();	  
+	  String[] colNames = {"ALIAS","COMBINATION","DESCRIPTION", "AD_ORG_ID_D", "ACCOUNT_ID_D", "M_PRODUCT_ID_D", "C_BPARTNER_ID_D", "C_PROJECT_ID_D", "C_CAMPAIGN_ID_D", "C_VALIDCOMBINATION_ID", "ROWKEY"};
+	  String[] colWidths = {"43", "193", "151", "105", "123", "71", "101", "43", "59", "0", "0"};
+	  for(int i=0; i < colNames.length; i++) {
+		  SQLReturnObject dataAux = new SQLReturnObject();
+		  dataAux.setData("columnname", colNames[i]);
+	      dataAux.setData("gridcolumnname", colNames[i]);
+	      dataAux.setData("adReferenceId", "AD_Reference_ID");
+	      dataAux.setData("adReferenceValueId", "AD_ReferenceValue_ID");	      
+	      dataAux.setData("isidentifier", (colNames[i].equals("ROWKEY")?"true":"false"));
+	      dataAux.setData("iskey", (colNames[i].equals("ROWKEY")?"true":"false"));
+	      dataAux.setData("isvisible", (colNames[i].endsWith("_ID")?"false":"true"));
+	      String name = Utility.messageBD(this, "ACCS_" + colNames[i].toUpperCase(), vars.getLanguage());
+	      dataAux.setData("name", (name.startsWith("ACCS_")?colNames[i]:name));
+	      dataAux.setData("type", "string");
+	      dataAux.setData("width", colWidths[i]);
+	      vAux.addElement(dataAux);
+	  }
+	  data = new SQLReturnObject[vAux.size()];
+	  vAux.copyInto(data);
+	  return data;
   }
-
+  
+  void printGridData(HttpServletResponse response, VariablesSecureApp vars, String strAlias, String strCombination, String strOrganization, String strAccount, String strProduct, String strBPartner, String strProject, String strCampaign, String strOrderBy, String strOffset, String strPageSize, String strNewFilter ) throws IOException, ServletException {
+	    if (log4j.isDebugEnabled()) log4j.debug("Output: print page rows");
+	    
+	    SQLReturnObject[] headers = getHeaders(vars);
+	    FieldProvider[] data = null;
+	    String type = "Hidden";
+	    String title = "";
+	    String description = "";
+	    String strNumRows = "0";
+	    String strAcctSchema = vars.getSessionValue("Account.cAcctschemaId");
+	    
+	    if (headers!=null) {
+	      try{
+		  	if(strNewFilter.equals("1") || strNewFilter.equals("")) { // New filter or first load    	
+		  		data = AccountData.select(this, "1", strAcctSchema, strAlias, strCombination, strOrganization, strAccount, strProduct, strBPartner, strProject, strCampaign, "", Utility.getContext(this, vars, "#User_Client", "Account"), Utility.getContext(this, vars, "#User_Org", "Account"), strOrderBy, "", "");
+		  		strNumRows = String.valueOf(data.length);
+		  		vars.setSessionValue("AccountInfo.numrows", strNumRows);
+		  	}
+	  		else {
+	  			strNumRows = vars.getSessionValue("AccountInfo.numrows");
+	  		}
+		  			
+	  		// Filtering result
+	    	if(this.myPool.getRDBMS().equalsIgnoreCase("ORACLE")) {
+	    		String oraLimit = strOffset + " AND " + String.valueOf(Integer.valueOf(strOffset).intValue() + Integer.valueOf(strPageSize));
+	    		data = AccountData.select(this, "1", strAcctSchema, strAlias, strCombination, strOrganization, strAccount, strProduct, strBPartner, strProject, strCampaign, "", Utility.getContext(this, vars, "#User_Client", "Account"), Utility.getContext(this, vars, "#User_Org", "Account"), strOrderBy, oraLimit, "");
+	    	}
+	    	else {
+	    		String pgLimit = strPageSize + " OFFSET " + strOffset;
+	    		data = AccountData.select(this, "1", strAcctSchema, strAlias, strCombination, strOrganization, strAccount, strProduct, strBPartner, strProject, strCampaign, "", Utility.getContext(this, vars, "#User_Client", "Account"), Utility.getContext(this, vars, "#User_Org", "Account"), strOrderBy, "", pgLimit);
+	    	}    	
+	      } catch (ServletException e) {
+	        log4j.error("Error in print page data: " + e);
+	        e.printStackTrace();
+	        OBError myError = Utility.translateError(this, vars, vars.getLanguage(), e.getMessage());
+	        if (!myError.isConnectionAvailable()) {
+	          bdErrorAjax(response, "Error", "Connection Error", "No database connection");
+	          return;
+	        } else {
+	          type = myError.getType();
+	          title = myError.getTitle();
+	          if (!myError.getMessage().startsWith("<![CDATA[")) description = "<![CDATA[" + myError.getMessage() + "]]>";
+	          else description = myError.getMessage();
+	        }
+	      } catch (Exception e) { 
+	        if (log4j.isDebugEnabled()) log4j.debug("Error obtaining rows data");
+	        type = "Error";
+	        title = "Error";
+	        if (e.getMessage().startsWith("<![CDATA[")) description = "<![CDATA[" + e.getMessage() + "]]>";
+	        else description = e.getMessage();
+	        e.printStackTrace();
+	      }
+	    }
+	    
+	    if (!type.startsWith("<![CDATA[")) type = "<![CDATA[" + type + "]]>";
+	    if (!title.startsWith("<![CDATA[")) title = "<![CDATA[" + title + "]]>";
+	    if (!description.startsWith("<![CDATA[")) description = "<![CDATA[" + description + "]]>";
+	    StringBuffer strRowsData = new StringBuffer();
+	    strRowsData.append("<xml-data>\n");
+	    strRowsData.append("  <status>\n");
+	    strRowsData.append("    <type>").append(type).append("</type>\n");
+	    strRowsData.append("    <title>").append(title).append("</title>\n");
+	    strRowsData.append("    <description>").append(description).append("</description>\n");
+	    strRowsData.append("  </status>\n");
+	    strRowsData.append("  <rows numRows=\"").append(strNumRows).append("\">\n");
+	    if (data!=null && data.length>0) {
+	      for (int j=0;j<data.length;j++) {
+	        strRowsData.append("    <tr>\n");
+	        for (int k=0;k<headers.length;k++) {
+	          strRowsData.append("      <td><![CDATA[");
+	          String columnname = headers[k].getField("columnname");
+	          
+	          if ((data[j].getField(columnname)) != null) {
+	            if (headers[k].getField("adReferenceId").equals("32")) strRowsData.append(strReplaceWith).append("/images/");
+	            strRowsData.append(data[j].getField(columnname).replaceAll("<b>","").replaceAll("<B>","").replaceAll("</b>","").replaceAll("</B>","").replaceAll("<i>","").replaceAll("<I>","").replaceAll("</i>","").replaceAll("</I>","").replaceAll("<p>","&nbsp;").replaceAll("<P>","&nbsp;").replaceAll("<br>","&nbsp;").replaceAll("<BR>","&nbsp;"));
+	          } else {
+	            if (headers[k].getField("adReferenceId").equals("32")) {
+	              strRowsData.append(strReplaceWith).append("/images/blank.gif");
+	            } else strRowsData.append("&nbsp;");
+	          }
+	          strRowsData.append("]]></td>\n");
+	        }
+	        strRowsData.append("    </tr>\n");
+	      }
+	    }
+	    strRowsData.append("  </rows>\n");
+	    strRowsData.append("</xml-data>\n");
+	        
+	    response.setContentType("text/xml; charset=UTF-8");
+	    response.setHeader("Cache-Control", "no-cache");
+	    PrintWriter out = response.getWriter();
+	    if (log4j.isDebugEnabled()) log4j.debug(strRowsData.toString());  
+	    out.print(strRowsData.toString());
+	    out.close();
+	  }
+  
+  private void clearSessionValues(VariablesSecureApp vars) {
+    vars.removeSessionValue("");
+  }
+  
   public String getServletInfo() {
     return "Servlet that presents que accounts seeker";
   } // end of getServletInfo() method
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/erpCommon/info/Account.xml	Mon Apr 21 19:06:47 2008 +0000
@@ -0,0 +1,65 @@
+<?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="Account.html"/>
+	<PARAMETER id="paramDirection" name="direction" default=""/>
+	<PARAMETER id="paramLanguage" name="language" default=""/>
+	<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
+	
+	<PARAMETER id="fieldOrgs" name="orgs" replace="xx" attribute="value" />
+	
+	<PARAMETER id="grid" name="grid" attribute="numrows" />
+	<PARAMETER id="grid" name="grid_Offset" attribute="offset" />
+	<PARAMETER id="grid" name="grid_SortCols" attribute="sortcols" />
+	<PARAMETER id="grid" name="grid_SortDirs" attribute="sortdirs" />
+	<PARAMETER id="grid" name="grid_Default" attribute="defaultrow" />
+	<structure name="structure1">
+		<FIELD id="fieldValidCombination" attribute="value">cValidcombinationId</FIELD>
+		<FIELD id="fieldAlias" attribute="value">alias</FIELD>
+		<FIELD id="fieldCombination" attribute="value">combination</FIELD>
+		<FIELD id="AD_Org_ID">adOrgId</FIELD>
+		<FIELD id="Account_ID">accountId</FIELD>
+		<FIELD id="M_Product_ID">mProductId</FIELD>
+		<FIELD id="C_BPartner_ID">cBpartnerId</FIELD>
+		<FIELD id="C_Project_ID">cProjectId</FIELD>
+		<FIELD id="C_Campaign_ID">cCampaignId</FIELD>
+		<SECTION id="sectionDetail"/>
+		
+	</structure>
+	<SUBREPORT id="reportAD_Org_ID" name="reportAD_Org_ID" report="org/openbravo/erpCommon/reference/List">
+		<ARGUMENT name="parameterListSelected" withId="AD_Org_ID"/>
+	</SUBREPORT>
+	<SUBREPORT id="reportAccount_ID" name="reportAccount_ID" report="org/openbravo/erpCommon/reference/List">
+		<ARGUMENT name="parameterListSelected" withId="Account_ID"/>
+	</SUBREPORT>
+	<SUBREPORT id="reportM_Product_ID" name="reportM_Product_ID" report="org/openbravo/erpCommon/reference/List">
+		<ARGUMENT name="parameterListSelected" withId="M_Product_ID"/>
+	</SUBREPORT>
+	<SUBREPORT id="reportC_BPartner_ID" name="reportC_BPartner_ID" report="org/openbravo/erpCommon/reference/List">
+		<ARGUMENT name="parameterListSelected" withId="C_BPartner_ID"/>
+	</SUBREPORT>
+	<SUBREPORT id="reportC_Project_ID" name="reportC_Project_ID" report="org/openbravo/erpCommon/reference/List">
+		<ARGUMENT name="parameterListSelected" withId="C_Project_ID"/>
+	</SUBREPORT>
+	<SUBREPORT id="reportC_Campaign_ID" name="reportC_Campaign_ID" report="org/openbravo/erpCommon/reference/List">
+		<ARGUMENT name="parameterListSelected" withId="C_Campaign_ID"/>
+	</SUBREPORT>
+	<DISCARD id="discard"/>
+</REPORT>
--- a/src/org/openbravo/erpCommon/info/Account_F1.html	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,276 +0,0 @@
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2007 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<HTML>
-<HEAD>
-<TITLE>Account selector</TITLE>
-<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"></LINK> 
-<LINK rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"></LINK>
-<SCRIPT language="JavaScript" 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/ajax.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/dojoConfig.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript"></script>
-      <SCRIPT language="JavaScript" type="text/javascript" id="paramLanguage">	LNG_POR_DEFECTO = "en_US";</SCRIPT>
-      <SCRIPT language="JavaScript" type="text/javascript" id="paramDirection">var baseDirection = "../../../../../web/";</SCRIPT>
-      <SCRIPT language="JavaScript" src="../../../../../web/js/TypeAheadCombo.js" type="text/javascript"></SCRIPT>
-      <SCRIPT language="JavaScript" src="../../../../../web/js/calculator.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/searchs.js" type="text/javascript"></SCRIPT>
-<SCRIPT language="JavaScript" src="../../../../../web/js/String.js" type="text/javascript"></SCRIPT>
-      <script type="text/javascript">
-        dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
-      </script>
-
-<SCRIPT language="JavaScript" type="text/javascript">
-function depurar() {
-	var frm = document.frmSelector;
-	if ((frm.inpAlias.value==null || frm.inpAlias.value=="") && (frm.inpCombination.value==null || frm.inpCombination.value=="") && frm.inpOrganization.selectedIndex==-1 && frm.inpAccount.selectedIndex==-1 && frm.inpProduct.selectedIndex==-1 && frm.inpBPartner.selectedIndex==-1 && frm.inpProject.selectedIndex==-1 && frm.inpCampaign.selectedIndex==-1) {
-		frm.inpAlias.focus();
-		mensaje(7);
-		return false;
-	}
-  if (frm.inpOrganization.value==null || frm.inpOrganization.value=="") {
-    frm.inpOrganization.focus();
-    mensaje(7);
-    return false;    
-  }
-	return true;
-}
-
-function onloadFunctions() {
-	new TypeAheadCombo("inpOrganization");
-	new TypeAheadCombo("inpAccount");
-	new TypeAheadCombo("inpProduct");
-	new TypeAheadCombo("inpBPartner");
-  new TypeAheadCombo("inpProject");
-  new TypeAheadCombo("inpCampaign");
-  
-  keyArray[keyArray.lenght] = new keyArrayItem("B", "submitCommandForm('FIND', false, null, null, 'medio');", null, "ctrlKey");
-  
-}
-</SCRIPT>
-	<SCRIPT language="JavaScript" type="text/javascript">
-	function onLoadDo(){
-		this.windowTables = new Array(
-		  new windowTableId('client', 'superior', 'buttonSearch', 'superior'),
-		  new windowTableId('client','medio', 'buttonOK', 'inferior'),
-		  new windowTableId('client','inferior', 'buttonOK', 'inferior')
-		);
-		setWindowTableParentElement();
-		enableShortcuts('popup');
-		
-		try {
-		  onloadFunctions();
-		} catch (e) {}
-
-		setWindowElementFocus('firstElement');
-	}
-
-	function onResizeDo(){
-	}
-	</SCRIPT>
-</HEAD>
-<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
-<FORM name="frmSelector" method="POST" action="Account_F2.html" target="medio">
-  <INPUT type="hidden" name="Command">
-<INPUT type="hidden" name="IsPopUpCall" value="1"></INPUT>
-  
-  
-  <div class="Popup_ContentPane_CircleLogo">
-  <div class="Popup_WindowLogo">
-    <img class="Popup_WindowLogo_Icon Popup_WindowLogo_Icon_account" src="../../../../../web/images/blank.gif" border=0/></img>
-  </div>
-</div>
-
-<table cellspacing="0" cellpadding="0" width="100%">
-
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_NavBar">
-        <tr class="Popup_NavBar_bg"><td></td>
-          <td class="Popup_NavBar_separator_cell"></td>
-          <td class="Popup_NavBar_bg_logo_left"></td>
-          <td class="Popup_NavBar_bg_logo" width="1" onclick="abrirNuevoBrowser('http://www.openbravo.com', 'Openbravo');return false;"><IMG src="../../../../../web/images/blank.gif" alt="Openbravo" title="Openbravo" border="0" id="openbravoLogo" class="Popup_NavBar_logo" /></td>
-          <td class="Popup_NavBar_bg_logo_right"></td>
-          <td class="Popup_NavBar_Popup_title_cell"><span>Account Selector</span></a></td>
-          <td class="Popup_NavBar_separator_cell"></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_SeparatorBar">
-        <tr>
-          <td class="Popup_SeparatorBar_bg"></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  
-   <tr>
-    <td>
-      <div class="Popup_ContentPane_Client" style="overflow: auto;" id="client">
-        <table cellspacing="0" cellpadding="0" class="Popup_Client_TableSelector">
-
-          <tr>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-          </tr>
-
-          <TR>
-          <TD colspan="6">
-            <TABLE class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
-              <TR class="FieldGroup_TopMargin"></TR>
-              <TR>
-                <TD class="FieldGroupTitle_Left"><IMG class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
-                <TD class="FieldGroupTitle">Primary Filters</TD>
-                <TD class="FieldGroupTitle_Right"><IMG class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
-                <TD class="FieldGroupContent"></TD>
-
-              </TR>
-              <TR class="FieldGroup_BottomMargin"></TR>
-            </TABLE>
-          </TD>
-          </TR>
-         
-       </tr>
-       <div id="sectionDetail">
-         <TR> 
-          <TD class="TitleCell"><SPAN class="LabelText">Alias</SPAN></TD>
-          <TD class="TextBox_ContentCell"> 
-            <INPUT type="hidden" name="inpValidCombination" value="" id="fieldValidCombination"/> 
-            <INPUT class="dojoValidateValid TextBox_OneCell_width" name="inpAlias" type="text" size="25" value="" id="fieldAlias"/>
-          </TD>
-          <td/>
-          
-          <TD class="TitleCell"><SPAN class="LabelText">Accounting combination</SPAN></TD>
-          <TD class="TextBox_ContentCell"> 
-            <INPUT class="dojoValidateValid TextBox_OneCell_width" name="inpCombination" type="text" size="25" value="" id="fieldCombination"></INPUT>
-          </TD>
-          <td/>
-        </TR>
-        
-        <TR> 
-          <TD class="TitleCell"><SPAN class="LabelText">Organization</SPAN></TD>
-          <TD class="Combo_ContentCell" colspan="2"> 
-            <SELECT class="Combo Combo_TwoCells_width required" required="true" name="inpOrganization" id="inpOrganization">
-              <OPTION value=""></OPTION><DIV id="reportAD_Org_ID"></DIV>
-            </SELECT>
-          </TD>
-          <TD class="TitleCell"><SPAN class="LabelText">Account</SPAN></TD>
-          <TD class="Combo_ContentCell" colspan="2">
-            <SELECT class="Combo Combo_TwoCells_width required" required="true" name="inpAccount" id="inpAccount">
-              <OPTION value=""></OPTION><DIV id="reportAccount_ID"></DIV>
-            </SELECT></TD>
-        </TR>
-        <TR> 
-          <TD class="TitleCell"><SPAN class="LabelText">Product</SPAN></TD>
-          <TD class="Combo_ContentCell" colspan="2"> <SELECT class="Combo Combo_TwoCells_width" name="inpProduct" id="inpProduct">
-              <OPTION value=""></OPTION><DIV id="reportM_Product_ID"></DIV>
-            </SELECT></TD>
-          <TD class="TitleCell"><SPAN class="LabelText">Business Partner</SPAN></TD>
-          <TD class="Combo_ContentCell" colspan="2"> <SELECT class="Combo Combo_TwoCells_width" name="inpBPartner" id="inpBPartner">
-              <OPTION value=""></OPTION><DIV id="reportC_BPartner_ID"></DIV>
-            </SELECT></TD>
-        </TR>
-        <TR> 
-          <TD class="TitleCell"><SPAN class="LabelText">Project</SPAN></TD>
-          <TD class="Combo_ContentCell" colspan="2"> <SELECT class="Combo Combo_TwoCells_width" name="inpProject" id="inpProject">
-              <OPTION value=""></OPTION><DIV id="reportC_Project_ID"></DIV>
-            </SELECT></TD>
-          <TD class="TitleCell"><SPAN class="LabelText">Campaign</SPAN></TD>
-          <TD class="Combo_ContentCell" colspan="2"> <SELECT class="Combo Combo_TwoCells_width" name="inpCampaign" id="inpCampaign">
-              <OPTION value=""></OPTION><DIV id="reportC_Campaign_ID"></DIV>
-            </SELECT></TD>
-        </TR>
-        <tr>
-            <td></td>
-            <td class="Button_LeftAlign_ContentCell">
-              <div>
-                <a class="ButtonLink" href="#"
-                  onfocus="setWindowElementFocus(this); window.status='Search'; return true;"
-                  onblur="window.status=''; return true;"
-                  onkeypress="this.className='ButtonLink_active'; return true;"
-                  onkeyup="this.className='ButtonLink_focus'; return true;"
-                  onclick="submitCommandForm('FIND', false, null, null, 'medio');return false;"
-                  id="buttonSearch">
-                  <table class="Button"
-                    onmousedown="this.className='Button_active'; return true;"
-                    onmouseup="this.className='Button'; return true;"
-                    onmouseover="this.className='Button_hover'; window.status='Search'; return true;"
-                    onmouseout="this.className='Button'; window.status=''; 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="Button_LeftAlign_ContentCell">
-
-              <div>
-                <a class="ButtonLink" href="#"
-                  onfocus="setWindowElementFocus(this); window.status='Save'; return true;"
-                  onblur="window.status=''; return true;"
-                  onkeypress="this.className='ButtonLink_active'; return true;"
-                  onkeyup="this.className='ButtonLink_focus'; return true;"
-                  onclick="submitCommandForm('SAVE', true, null, null, '_top');return false;"">
-                  <table class="Button"
-                    onmousedown="this.className='Button_active'; return true;"
-                    onmouseup="this.className='Button'; return true;"
-                    onmouseover="this.className='Button_hover'; window.status='Save'; return true;"
-                    onmouseout="this.className='Button'; window.status=''; return true;">
-                    <tr>
-                      <td class="Button_left"><img class="Button_Icon Button_Icon_save" alt="Save" title="Save" src="../../../../../web/images/blank.gif" border=0/></td>
-                      <td class="Button_text Button_width">Save</td>
-                      <td class="Button_right"></td>
-                    </tr>
-                  </table>
-                </a>
-              </div>
-            </td>
-            <td></td>
-            <td></td>
-            <td></td>
-          </tr>
-      </div>
-       
-  </table>
-  </div>
-  </td>
-  
-  </table>
-  
-  
-
-</FORM>
-</BODY>
-</HTML>
--- a/src/org/openbravo/erpCommon/info/Account_F1.xml	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +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="Account_F1.html"/>
-	<PARAMETER id="paramDirection" name="direction" default=""/>
-	<PARAMETER id="paramLanguage" name="language" default=""/>
-	<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
-	<structure name="structure1">
-		<FIELD id="fieldValidCombination" attribute="value">cValidcombinationId</FIELD>
-		<FIELD id="fieldAlias" attribute="value">alias</FIELD>
-		<FIELD id="fieldCombination" attribute="value">combination</FIELD>
-		<FIELD id="AD_Org_ID">adOrgId</FIELD>
-		<FIELD id="Account_ID">accountId</FIELD>
-		<FIELD id="M_Product_ID">mProductId</FIELD>
-		<FIELD id="C_BPartner_ID">cBpartnerId</FIELD>
-		<FIELD id="C_Project_ID">cProjectId</FIELD>
-		<FIELD id="C_Campaign_ID">cCampaignId</FIELD>
-		<SECTION id="sectionDetail"/>
-	</structure>
-	<SUBREPORT id="reportAD_Org_ID" name="reportAD_Org_ID" report="org/openbravo/erpCommon/reference/List">
-		<ARGUMENT name="parameterListSelected" withId="AD_Org_ID"/>
-	</SUBREPORT>
-	<SUBREPORT id="reportAccount_ID" name="reportAccount_ID" report="org/openbravo/erpCommon/reference/List">
-		<ARGUMENT name="parameterListSelected" withId="Account_ID"/>
-	</SUBREPORT>
-	<SUBREPORT id="reportM_Product_ID" name="reportM_Product_ID" report="org/openbravo/erpCommon/reference/List">
-		<ARGUMENT name="parameterListSelected" withId="M_Product_ID"/>
-	</SUBREPORT>
-	<SUBREPORT id="reportC_BPartner_ID" name="reportC_BPartner_ID" report="org/openbravo/erpCommon/reference/List">
-		<ARGUMENT name="parameterListSelected" withId="C_BPartner_ID"/>
-	</SUBREPORT>
-	<SUBREPORT id="reportC_Project_ID" name="reportC_Project_ID" report="org/openbravo/erpCommon/reference/List">
-		<ARGUMENT name="parameterListSelected" withId="C_Project_ID"/>
-	</SUBREPORT>
-	<SUBREPORT id="reportC_Campaign_ID" name="reportC_Campaign_ID" report="org/openbravo/erpCommon/reference/List">
-		<ARGUMENT name="parameterListSelected" withId="C_Campaign_ID"/>
-	</SUBREPORT>
-	<DISCARD id="discard"/>
-</REPORT>
--- a/src/org/openbravo/erpCommon/info/Account_F2.html	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,183 +0,0 @@
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2007 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-
-<html>
-<head>
-  <title>Accounts list</title>
-
-  <link rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"></link>
-  <link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"></link>
-  <script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
-  <script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
-  <script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
-  <script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
-  <script language="JavaScript" src="../../../../../web/js/dojoConfig.js" type="text/javascript"></script>
-  <script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript"></script>
-  <script language="JavaScript" type="text/javascript" id="paramDirection">var baseDirection = "../../../../../web/";</script>
-  <script language="JavaScript" type="text/javascript" id="paramLanguage">  LNG_POR_DEFECTO = "en_US";</script>
-  <script type="text/javascript">
-    dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
-  </script>
-  <script language="JavaScript" type="text/javascript">
-    function loadData(text, position) {
-      document.frmSelector.inpLastKeySelected.value = position;
-      document.frmSelector.inpTexto.value=text;
-      submitCommandForm("LOAD_FIELD");
-      return true;
-    }
-
-    var selectedRow = "";
-    function selectActual(obj) {
-      if (selectedRow != "") {
-        selectedRow.className = selectedRow.className.replace(' DataGrid_Body_Row_selected', '');
-      }
-      selectedRow = obj;
-      selectedRow.className += " DataGrid_Body_Row_selected";
-      selectedCheck = selectedRow.id.toString().replace('funcEvenOddRow', 'CheckNum');
-      document.getElementById(selectedCheck).checked = true;
-    }
-
-    function HoverCell(cell) {
-      cell.className = cell.className + ' DataGrid_Body_Cell_hover';
-    }
-
-    function unHoverCell(cell) {
-      cell.className = cell.className.replace(' DataGrid_Body_Cell_hover', '');
-    }
-  </script>
-	<SCRIPT language="JavaScript" type="text/javascript">
-	function onLoadDo(){
-		this.windowTables = new Array(
-		  new windowTableId('client', 'superior', 'buttonSearch', 'superior'),
-		  new windowTableId('client','medio', 'buttonOK', 'inferior'),
-		  new windowTableId('client','inferior', 'buttonOK', 'inferior')
-		);
-		setWindowTableParentElement();
-		enableShortcuts('popup');
-		
-		resizeArea();
-	}
-
-	function onResizeDo(){
-		resizeArea();
-	}
-	</SCRIPT>
-</HEAD>
-
-<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
-<form name="frmSelector" action="Account_F1.html" method="POST" target="superior">
-  <INPUT type="hidden" name="Command">
-  <INPUT type="hidden" name="IsPopUpCall" value="1"></INPUT>
-  <input type="hidden" name="inpTexto"></input>
-  <input type="hidden" name="inpLastKeySelected"></input>
-  
-  <input type="hidden" name="inpAlias">
-  <input type="hidden" name="inpCombination">
-  <input type="hidden" name="inpAccount">
-  <input type="hidden" name="inpProduct">
-  <input type="hidden" name="inpBPartner">
-  <input type="hidden" name="inpOrganization">
-  <input type="hidden" name="inpProject">
-  <input type="hidden" name="inpCampaign">
-
-  <table height="100%" border="0" cellpadding="0" cellspacing="0" id="main">
-    <tr>
-      <td valign="top" class="Popup_Client_Selector_DataGrid_LeftMargin">
-        <table width="100%" border="0" cellspacing="0" cellpadding="0" id="tdleftSeparator">
-          <tr><td class="Popup_Client_Selector_DataGrid_LeftMargin"></td></tr>
-        </table>
-      </td>
-      <td valign="top">
-
-        <div style="overflow: auto; display: none;" id="client">
-
-          <table cellspacing="0" cellpadding="0" width="100%" class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;">
-            <tr class="DataGrid_Body_Row"> 
-              <th width="3%"  class="DataGrid_Header_LineNoCell">&nbsp;</th>
-              <th width="7%"  class="DataGrid_Header_Cell">Alias</th>
-              <th width="14%" class="DataGrid_Header_Cell">Accounting combination</th>
-              <th width="14%" class="DataGrid_Header_Cell">Description</th>
-              <th width="12%" class="DataGrid_Header_Cell">Organization</th>
-              <th width="12%" class="DataGrid_Header_Cell">Account</th>
-              <th width="12%" class="DataGrid_Header_Cell">Product</th>
-              <th width="11%" class="DataGrid_Header_Cell">Business Partner</th>
-              <th width="7%"  class="DataGrid_Header_Cell">Project</th>
-              <th width="8%"  class="DataGrid_Header_Cell">Campaign</th>
-            </tr>
-
-            <div id="sectionDetail"> 
-              <tr class="DataGrid_Body_Row DataGrid_Body_Row_yy" onclick="selectActual(this); loadData('xx', 'hh'); return true;"  ondblclick="parent.inferior.depurarSelector('SAVE'); return true;" id="funcEvenOddRowxx">
-                <td class="DataGrid_Body_LineNoCell DataGrid_Body_Cell_RadioButton">
-                  <input type="radio" name="inpClave" value="xx" id="CheckNumxx" class="DataGrid_RadioButton"></input>
-                </td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldAlias">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldCombination">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldDescription">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldOrganization">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldAccount">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldProduct">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldBPartner">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldProject">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldCampaign">xx</td>
-              </tr>
-            </div>
-          </table>
-          
-          <table cellspacing="0" cellpadding="0" width="100%" style="text-align:-moz-center;_text-align:center;border-collapse:collapse;">
-            <td align=left width=50% style="padding-left: 7px;">
-              <table cellspacing="0" cellpadding="0" id="hasPrevious">
-                <td class="Main_ToolBar_textlabel_bg_left">
-                  <a href="#"
-                  onClick="submitCommandForm('PREVIOUS', false, parent.superior.document.forms[0], 'Account_F2.html', null, null, false);return false;" class="Main_ToolBar_Button" onMouseOver="window.status='Reference';return true;" onMouseOut="window.status='';return true;" onclick="this.hideFocus=true" onblur="this.hideFocus=false" id="linkButtonRelatedInfo"><img class="Main_ToolBar_Button_Icon Main_ToolBar_Button_Icon_Previous" src="../../../../../web/images/blank.gif" title="Reference" border="0" id="buttonRelatedInfo"></a>
-                </td>
-                <td class="Main_ToolBar_textlabel_bg_body" width=65px align="center"><a href="#" 
-                  onClick="submitCommandForm('PREVIOUS', false, parent.superior.document.forms[0], 'Account_F2.html', null, null, false);return false;" class="Main_ToolBar_text_relatedinfo">Previous</a></td>
-                <td width="1"><img src="../../../../../web/images/blank.gif" class="Main_ToolBar_textlabel_bg_right" border="0"></img></td>
-              </table>
-              <span id="withoutPrevious"></span>
-            </td>
-            <td align=right width=50% style="padding-right: 7px;">
-              <table cellspacing="0" cellpadding="0" id="hasNext">
-                <td width="1"><img src="../../../../../web/images/blank.gif" class="Main_ToolBar_textlabel_bg_left" border="0"></img></td>
-                <td class="Main_ToolBar_textlabel_bg_body" width=65px align=center><a href="#" 
-                   onClick="submitCommandForm('NEXT', false, parent.superior.document.forms[0], 'Account_F2.html', null, null, false);return false;" class="Main_ToolBar_text_relatedinfo">Next</a></td>
-                <td class="Main_ToolBar_textlabel_bg_right">
-                  <a href="#" 
-                   onClick="submitCommandForm('NEXT', false, parent.superior.document.forms[0], 'Account_F2.html', null, null, false);return false;" class="Main_ToolBar_Button" onMouseOver="window.status='Reference';return true;" onMouseOut="window.status='';return true;" onclick="this.hideFocus=true" onblur="this.hideFocus=false" id="linkButtonRelatedInfo"><img class="Main_ToolBar_Button_Icon Main_ToolBar_Button_Icon_Next" src="../../../../../web/images/blank.gif" title="Reference" border="0" id="buttonRelatedInfo"></a>
-                </td>
-              </table>
-              <span id="withoutNext"></span>
-            </td>
-          </table>
-
-        </div>
-
-      </td>
-
-      <td valign="top" class="Popup_Client_Selector_DataGrid_RightMargin">
-        <table width="100%" border="0" cellspacing="0" cellpadding="0" id="tdrightSeparator">
-          <tr><td class="Popup_Client_Selector_DataGrid_RightMargin"></td></tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-
-</form>
-</body>
-</html>
--- a/src/org/openbravo/erpCommon/info/Account_F2.xml	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +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-2007 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<REPORT>
-  <template file="Account_F2.html"/>
-  <PARAMETER id="paramLanguage" name="language" default=""/>
-  <PARAMETER id="paramDirection" name="direction" default=""/>
-	<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
-  <PARAMETER id="param2" name="param2" default="2"/>
-  <structure name="structure1">
-    <FIELD id="fieldRownum">position</FIELD>
-    <FUNCTION id="funcEvenOddRowxx" name="MODULE" arg1="fieldRownum" arg2="param2" format="integerEdition" attribute="class" replace="yy"/>
-    <FIELD id="funcEvenOddRowxx" attribute="id" replace="xx">position</FIELD>
-    <FIELD id="CheckNumxx" attribute="id" replace="xx">position</FIELD>
-    <FIELD id="CheckNumxx" attribute="value">cValidcombinationId</FIELD>
-    <FIELD id="funcEvenOddRowxx" attribute="onclick" replace="xx" replaceCharacters="htmlJavaScript">combination</FIELD>
-    <FIELD id="funcEvenOddRowxx" attribute="onclick" replace="hh" replaceCharacters="htmlJavaScript">position</FIELD>
-    <FIELD id="fieldAlias">alias</FIELD>
-    <FIELD id="fieldCombination">combination</FIELD>
-    <FIELD id="fieldDescription">description</FIELD>
-    <FIELD id="fieldOrganization">adOrgIdD</FIELD>
-    <FIELD id="fieldAccount">accountIdD</FIELD>
-    <FIELD id="fieldProduct">mProductIdD</FIELD>
-    <FIELD id="fieldBPartner">cBpartnerIdD</FIELD>
-    <FIELD id="fieldProject">cProjectIdD</FIELD>
-    <FIELD id="fieldCampaign">cCampaignIdD</FIELD>
-    <SECTION id="sectionDetail"/>
-  </structure>
-</REPORT>
--- a/src/org/openbravo/erpCommon/info/Account_F3.html	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2007 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<HTML>
-<HEAD>
-<TITLE>Business Partner selector</TITLE>
-<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"> 
-      <LINK rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"></LINK>
-      <script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/dojoConfig.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript"></script>
-      <SCRIPT language="JavaScript" type="text/javascript" id="paramDirection">var baseDirection = "../../../../../web/";</SCRIPT>
-      <script language="JavaScript" type="text/javascript" id="paramLanguage">var LNG_POR_DEFECTO = "en_US";</script>
-      <SCRIPT language="JavaScript" src="../../../../../web/js/searchs.js" type="text/javascript"></SCRIPT>
-      <SCRIPT language="JavaScript" type="text/javascript">
-function depurarSelector(action) {
-	var clave = radioValue(parent.medio.document.frmSelector.inpClave);
-	var texto = parent.medio.document.frmSelector.inpTexto.value;
-	parent.opener.closeSearch(action, clave, texto, null);
-}
-</SCRIPT>
-	<SCRIPT language="JavaScript" type="text/javascript">
-	function onLoadDo(){
-		this.windowTables = new Array(
-		  new windowTableId('client', 'superior', 'buttonSearch', 'superior'),
-		  new windowTableId('client','medio', 'buttonOK', 'inferior'),
-		  new windowTableId('client','inferior', 'buttonOK', 'inferior')
-		);
-		setWindowTableParentElement();
-		enableShortcuts('popup');
-	}
-
-	function onResizeDo(){
-	}
-	</SCRIPT>
-</HEAD>
-<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
-
-
-<table cellspacing="0" cellpadding="0" width="100%" style="height:100%; vertical-align:middle;">
-  <tr>
-    <td>
-      <div class="Popup_ContentPane_Client" style="overflow: auto;" id="client">
-        <table cellspacing="0" cellpadding="0" class="Popup_Client_TableSelector">
-
-          <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></td>
-            <td></td>
-            <td class="Button_RightAlign_ContentCell">
-              <div>
-                <a class="ButtonLink" href="#"
-                  onfocus="setWindowElementFocus(this); window.status='OK'; return true;"
-                  onblur="window.status=''; return true;"
-                  onkeypress="this.className='ButtonLink_active'; return true;"
-                  onkeyup="this.className='ButtonLink_focus'; return true;"
-                  onclick="depurarSelector('SAVE');return false;"
-                  id="buttonOK">
-                  <table class="Button"
-                    onmousedown="this.className='Button_active'; return true;"
-                    onmouseup="this.className='Button'; return true;"
-                    onmouseover="this.className='Button_hover'; window.status='OK'; return true;"
-                    onmouseout="this.className='Button'; window.status=''; return true;">
-                    <tr>
-                      <td class="Button_left"><img class="Button_Icon Button_Icon_ok" alt="OK" title="OK" src="../../../../../web/images/blank.gif" border=0/></td>
-                      <td class="Button_text Button_width">OK</td>
-                      <td class="Button_right"></td>
-                    </tr>
-                  </table>
-                </a>
-              </div>
-            </td>
-            <td class="Button_LeftAlign_ContentCell">
-              <div>
-                <a class="ButtonLink" href="#"
-                  onfocus="setWindowElementFocus(this); window.status='Cancel'; return true;"
-                  onblur="window.status=''; return true;"
-                  onkeypress="this.className='ButtonLink_active'; return true;"
-                  onkeyup="this.className='ButtonLink_focus'; return true;"
-                  onclick="depurarSelector('CLEAR');return false;">
-                  <table class="Button"
-                    onmousedown="this.className='Button_active'; return true;"
-                    onmouseup="this.className='Button'; return true;"
-                    onmouseover="this.className='Button_hover'; window.status='Cancel'; return true;"
-                    onmouseout="this.className='Button'; window.status=''; return true;">
-                    <tr>
-                      <td class="Button_left"><img class="Button_Icon Button_Icon_cancel" alt="Cancel" title="Cancel" src="../../../../../web/images/blank.gif" border=0/></td>
-                      <td class="Button_text Button_width">Cancel</td>
-                      <td class="Button_right"></td>
-                    </tr>
-                  </table>
-                </a>
-              </div>
-            </td>
-            <td></td>
-            <td></td>
-          </tr>
-        </table>
-      </div>
-    </td>
-  </tr>
-</table>
-</HTML>
-
-
-
-
--- a/src/org/openbravo/erpCommon/info/Account_F3.xml	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<REPORT>
-	<template file="Account_F3.html"/>
-	<PARAMETER id="paramDirection" name="direction" default=""/>
-	<PARAMETER id="paramLanguage" name="language" default=""/>
-	<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
-	<DISCARD id="discard"/>
-</REPORT>
--- a/src/org/openbravo/erpCommon/info/Account_FS.html	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8"></META>
-<TITLE>Account selector</TITLE>
-<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"></LINK></HEAD>
-<FRAMESET rows="235px,*,60px" frameborder="NO" border="0" framespacing="0" cols="*">
-<FRAME name="superior" id="paramFrameSuperior" scrolling="NO" noresize="" src="Account_F1.html?Command=FRAME1"></FRAME>
-<FRAME name="medio" scrolling="NO" noresize="" src="Account_F2.html?Command=FRAME2"></FRAME>
-<FRAME name="inferior" scrolling="NO" noresize="" src="Account_F3.html?Command=FRAME3"></FRAME></FRAMESET>
-</HTML>
--- a/src/org/openbravo/erpCommon/info/Account_FS.xml	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<REPORT>
-	<template file="Account_FS.html"/>
-</REPORT>
--- a/src/org/openbravo/erpCommon/info/Account_data.xsql	Mon Apr 21 19:03:40 2008 +0000
+++ b/src/org/openbravo/erpCommon/info/Account_data.xsql	Mon Apr 21 19:06:47 2008 +0000
@@ -27,25 +27,29 @@
    <SqlMethod name="select" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql> <![CDATA[
-            SELECT C.C_VALIDCOMBINATION_ID, C.ALIAS, C.COMBINATION, C.DESCRIPTION, 
-            C.AD_ORG_ID, (O.VALUE || ' - ' || O.NAME) AS AD_ORG_ID_D, 
-            C.ACCOUNT_ID, (E.VALUE || ' - ' || E.NAME) AS ACCOUNT_ID_D, 
-            C.M_PRODUCT_ID, (P.NAME) AS M_PRODUCT_ID_D, 
-            C.C_BPARTNER_ID, (B.NAME) AS C_BPARTNER_ID_D, 
-            C.C_PROJECT_ID, (J.NAME || ' - ' || J.VALUE) AS C_PROJECT_ID_D, 
-            C.C_CAMPAIGN_ID, (M.NAME) AS C_CAMPAIGN_ID_D 
-            FROM C_VALIDCOMBINATION C left join M_PRODUCT P on C.M_PRODUCT_ID = P.M_PRODUCT_ID 
-                                      left join C_BPARTNER B on C.C_BPARTNER_ID = B.C_BPARTNER_ID 
-                                      left join C_PROJECT J on C.C_PROJECT_ID = J.C_PROJECT_ID
-                                      left join C_CAMPAIGN M on C.C_CAMPAIGN_ID = M.C_CAMPAIGN_ID,
-            AD_ORG O, C_ELEMENTVALUE E
-            WHERE C.AD_ORG_ID = O.AD_ORG_ID 
-            AND C.ACCOUNT_ID = E.C_ELEMENTVALUE_ID 
-            AND C.ISACTIVE = 'Y' 
-            AND C.AD_Client_ID IN ('1') 
-            AND C.AD_Org_ID IN ('1') 
+      		SELECT * FROM ( SELECT '0' AS RN1, A.* FROM (
+	            SELECT C.C_VALIDCOMBINATION_ID, C.ALIAS, C.COMBINATION, C.DESCRIPTION, 
+	            C.AD_ORG_ID, (O.VALUE || ' - ' || O.NAME) AS AD_ORG_ID_D, 
+	            C.ACCOUNT_ID, (E.VALUE || ' - ' || E.NAME) AS ACCOUNT_ID_D, 
+	            C.M_PRODUCT_ID, (P.NAME) AS M_PRODUCT_ID_D, 
+	            C.C_BPARTNER_ID, (B.NAME) AS C_BPARTNER_ID_D, 
+	            C.C_PROJECT_ID, (J.NAME || ' - ' || J.VALUE) AS C_PROJECT_ID_D, 
+	            C.C_CAMPAIGN_ID, (M.NAME) AS C_CAMPAIGN_ID_D, C.C_VALIDCOMBINATION_ID || '#' || C.COMBINATION AS ROWKEY
+	            FROM C_VALIDCOMBINATION C left join M_PRODUCT P on C.M_PRODUCT_ID = P.M_PRODUCT_ID 
+	                                      left join C_BPARTNER B on C.C_BPARTNER_ID = B.C_BPARTNER_ID 
+	                                      left join C_PROJECT J on C.C_PROJECT_ID = J.C_PROJECT_ID
+	                                      left join C_CAMPAIGN M on C.C_CAMPAIGN_ID = M.C_CAMPAIGN_ID,
+	            AD_ORG O, C_ELEMENTVALUE E
+	            WHERE C.AD_ORG_ID = O.AD_ORG_ID 
+	            AND C.ACCOUNT_ID = E.C_ELEMENTVALUE_ID 
+	            AND C.ISACTIVE = 'Y' 
+	            AND C.AD_Client_ID IN ('1') 
+	            AND C.AD_Org_ID IN ('1')
+	            ORDER BY C.ALIAS
+	        	) A ) B
+			WHERE 1=1
       ]]></Sql>
-        <Field name="position" value="count"/>
+        <Parameter name="rownum" type="replace" optional="true" after="FROM ( SELECT " text="'0'" />
         <Parameter name="acctschema" optional="true" after="WHERE "><![CDATA[ C.C_ACCTSCHEMA_ID = TO_NUMBER(?) AND ]]></Parameter>
         <Parameter name="alias" optional="true" after="WHERE "><![CDATA[ (C.ALIAS IS NULL  OR UPPER(C.ALIAS) LIKE UPPER(?)) AND ]]></Parameter>
         <Parameter name="combination" optional="true" after="WHERE "><![CDATA[ UPPER(C.COMBINATION) LIKE UPPER(?) AND ]]></Parameter>
@@ -58,6 +62,9 @@
         <Parameter name="validcombination" optional="true" after="WHERE "><![CDATA[ C.C_VALIDCOMBINATION_ID = TO_NUMBER(?) AND ]]></Parameter>
         <Parameter name="adUserClient" type="replace" optional="true" after="C.AD_Client_ID IN (" text="'1'"/>
         <Parameter name="adUserOrg" type="replace" optional="true" after="C.AD_Org_ID IN (" text="'1'"/>
+        <Parameter name="orderBy" type="replace" optional="true" after="ORDER BY " text="C.ALIAS" />
+        <Parameter name="oraLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[AND RN1 BETWEEN ]]></Parameter>
+        <Parameter name="pgLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[LIMIT ]]></Parameter>
    </SqlMethod>
    <SqlMethod name="set" type="constant" return="multiple">
       <SqlMethodComment></SqlMethodComment>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/erpCommon/info/BusinessPartner.html	Mon Apr 21 19:06:47 2008 +0000
@@ -0,0 +1,356 @@
+<!--
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License. 
+ * The Original Code is Openbravo ERP. 
+ * The Initial Developer of the Original Code is Openbravo SL 
+ * All portions are Copyright (C) 2001-2008 Openbravo SL 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+-->
+<html>
+<head>
+<title>Business Partner selector</title>
+
+<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"></link>
+
+<script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/appStatus.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/dojoConfig.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/openbravo/core.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/openbravo/widget/DataGrid.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/searchs.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/appStatus.js" type="text/javascript"></script>
+<script type="text/javascript">
+  dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
+</script>
+
+
+<link rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"></link> 
+<script language="JavaScript" type="text/javascript" id="paramDirection">var baseDirection = "http://yourSite/web/";</script>
+<script language="JavaScript" type="text/javascript" id="paramLanguage">  LNG_POR_DEFECTO = "en_US";</script>
+
+<script language="JavaScript" type="text/javascript">
+  function depurar() {
+    var frm = document.frmSelector;
+    if ((frm.inpKey.value==null || frm.inpKey.value=="") && (frm.inpName.value==null || frm.inpName.value=="") && (frm.inpContact.value==null || frm.inpContact.value=="") && (frm.inpZIP.value==null || frm.inpZIP.value=="") && (frm.inpPhone.value==null || frm.inpPhone.value=="") && !frm.inpClients.checked) {
+      frm.inpKey.focus();
+      mensaje(7);
+      return false;
+    }
+    return true;
+  }
+</script>
+<script type="text/javascript">    
+  function depurarSelector(action) {
+  	var pos; var keys;  var clave; var texto; var parameter;
+  	if(action == "SAVE") {
+	    pos = getSelectedPos();
+	    keys = getSelectedValues().split("#")
+	    clave = keys[0];
+	    texto = keys[3];
+	    parameter = new Array(
+		    new SearchElements("_LOC", keys[2]),
+		    new SearchElements("_CON", keys[1])
+		);
+    }    
+  	parent.opener.closeSearch(action, clave, texto, parameter);
+  }
+</script>
+<script language="JavaScript" type="text/javascript" id="selectedColumn">
+  
+  dojo.require("openbravo.widget.DataGrid");
+  var selectedRow = 0;
+  var orderByPositions = new Array("1");
+  var orderByDirections = new Array("ASC");
+</script>
+<script language="JavaScript" type="text/javascript">
+  
+  function onLoadDo(){
+    this.windowTables = new Array(
+      new windowTableId('client_top', null, 'buttonSearch', null),
+      new windowTableId('client_middle', null, 'buttonOK', null),
+      new windowTableId('client_bottom', null, 'buttonOK', null)
+    );
+    setWindowTableParentElement();
+    enableShortcuts('popup');
+
+    try {
+      onloadFunctions();
+    } catch (e) {}
+
+    setWindowElementFocus('firstElement');
+    resizeAreaInfo();
+  }
+
+  function onResizeDo(){
+    resizeAreaInfo(true);
+  }
+</script>
+</head>
+<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
+<form name="frmSelector" method="POST" action="BusinessPartner.html">
+  <input type="hidden" name="Command" />
+  <input type="hidden" name="IsPopUpCall" value="1" />
+  <input type="hidden" name="inpAD_Org_ID" value="xx" id="fieldOrgs" />
+  <div class="Popup_ContentPane_CircleLogo">
+    <div class="Popup_WindowLogo">
+      <img class="Popup_WindowLogo_Icon Popup_WindowLogo_Icon_businessPartner" src="../../../../../web/images/blank.gif" border=0/></img>
+    </div>
+  </div>
+  <table cellspacing="0" cellpadding="0" width="100%" id="table_header">
+    <tr>
+      <td>
+        <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_NavBar">
+          <tr class="Popup_NavBar_bg"><td></td>
+            <td class="Popup_NavBar_separator_cell"></td>
+            <td class="Popup_NavBar_bg_logo_left"></td>
+            <td class="Popup_NavBar_bg_logo" width="1" onclick="abrirNuevoBrowser('http://www.openbravo.com', 'Openbravo');return false;"><img src="../../../../../web/images/blank.gif" alt="Openbravo" title="Openbravo" border="0" id="openbravoLogo" class="Popup_NavBar_logo" /></td>
+            <td class="Popup_NavBar_bg_logo_right"></td>
+            <td class="Popup_NavBar_Popup_title_cell"><span>Business Partner selector</span></td>
+            <td class="Popup_NavBar_separator_cell"></td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+
+    <tr>
+      <td>
+        <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_SeparatorBar">
+          <tr>
+            <td class="Popup_SeparatorBar_bg"></td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+
+  </table>
+
+  <table cellspacing="0" cellpadding="0" width="100%">
+
+    <tr>
+      <td>
+        <div class="Popup_ContentPane_Client" style="overflow: auto; height:185px;" id="client_top">
+          <table cellspacing="0" cellpadding="0" class="Popup_Client_TableSelector">
+
+            <tr>
+              <td class="TableEdition_OneCell_width"></td>
+              <td class="TableEdition_OneCell_width"></td>
+              <td class="TableEdition_OneCell_width"></td>
+              <td class="TableEdition_OneCell_width"></td>
+              <td class="TableEdition_OneCell_width"></td>
+              <td class="TableEdition_OneCell_width"></td>
+            </tr>
+
+            <tr>
+              <td colspan="6">
+                <table class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
+                  <tr class="FieldGroup_TopMargin"></tr>
+                  <tr>
+                    <td class="FieldGroupTitle_Left"><img class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"></img></td>
+                    <td class="FieldGroupTitle">Primary Filters</td>
+                    <td class="FieldGroupTitle_Right"><img class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"></img></td>
+                    <td class="FieldGroupContent"></td>
+
+                  </tr>
+                  <tr class="FieldGroup_BottomMargin"></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr>
+              <td class="TitleCell"><span class="LabelText">Key</span></td>
+              <td class="TextBox_ContentCell"><input class="dojoValidateValid TextBox_OneCell_width" type="text" name="inpKey" value="" id="fieldKey"></input></td>
+              <td></td>
+              <td class="TitleCell"><span class="LabelText">Name</span></td>
+              <td class="TextBox_ContentCell" colspan="2"><input type="text" name="inpName" value="" id="fieldName" class="dojoValidateValid TextBox_TwoCells_width"></input></td>
+              <td></td>
+            </tr>
+
+            <tr>
+              <td class="TitleCell"><span class="LabelText">Contact</span></td>
+              <td class="TextBox_ContentCell" colspan="2"><input type="text" name="inpContact" class="dojoValidateValid TextBox_TwoCells_width"></input></td>
+
+              <td class="TitleCell"><span class="LabelText">City</span></td>
+              <td class="TextBox_ContentCell" colspan="2"> <input type="text" name="inpCity" class="dojoValidateValid TextBox_TwoCells_width"></input></td>
+            </tr>
+      
+            <tr>
+              <td class="TitleCell"><span class="LabelText">Postal Code</span></td>
+              <td class="TextBox_ContentCell"><input class="dojoValidateValid TextBox_OneCell_width" type="text" name="inpZIP"></input></td>
+
+              <td></td>
+
+              <td class="TitleCell"><span class="LabelText">Region</span></td>
+              <td class="TextBox_ContentCell" colspan="2"><input type="text" name="inpProvincia" class="dojoValidateValid TextBox_TwoCells_width"></input> </td>
+            </tr>
+        
+            <tr> 
+             <td class="TitleCell"><span class="LabelText">Customer</span></td>
+             <td class="Radio_Check_ContentCell"><span class="Radio_container_NOT_Focused"><input type="radio" name="inpBpartner" value="costumer" id="fieldClientsSelect"></input></span></td>
+
+             <td class="TitleCell"><span class="LabelText">Providers</span></td>
+             <td class="Radio_Check_ContentCell"><span class="Radio_container_NOT_Focused"><input type="radio" name="inpBpartner" value="vendor" id="fieldVendorsSelect"></input></span></td>
+
+             <td class="TitleCell"><span class="LabelText">All</span></td>
+             <td class="Radio_Check_ContentCell"><span class="Radio_container_NOT_Focused"><input type="radio" name="inpBpartner" value="all" id="fieldAllSelect"></input></span></td>
+            </tr>
+
+            <tr>
+              <td></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="setFilters();return false;"
+                    id="buttonSearch">
+                    <table class="Button"
+                      onmousedown="this.className='Button_active'; return true;"
+                      onmouseup="this.className='Button'; return true;"
+                      onmouseover="this.className='Button_hover'; window.status='Search'; return true;"
+                      onmouseout="this.className='Button'; window.status=''; 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></td>
+              <td></td>
+              <td></td>
+              <td></td>
+            </tr>
+          </table>
+        </div>
+      </td>
+    </tr>
+
+    <tr>
+      <td>
+        <div class="Popup_ContentPane_Client" style="overflow: hidden; height: 0px;" id="client_middle">
+          <table summary="" id="sectionDetail">
+            <tr>
+              <td>
+                <table cellspacing="0" cellpadding="0" width="10px" class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;" id="grid_sample">
+                  <tr class="DataGrid_Body_Row" id="grid_sample_header">
+                    <th width="10px" class="DataGrid_Header_Cell">DataGrid</th>
+                  </tr>
+                  <tr class="DataGrid_Body_Row DataGrid_Body_Row_1" onclick="selectActual(this); loadData('BBAccountingUser', '1000012', '', '1'); return true;" id="grid_sample_row">
+                    <td class="DataGrid_Body_Cell">Loading...</td>
+                  </tr>
+                </table>
+                <table width="100%" cellspacing="0" cellpadding="0" border="0" class="Main_Client_TableRelation" id="grid_table">
+                  <tr>
+                    <td>
+                      <div id="grid" dojotype="openbravo:DataGrid"
+                        structureurl="../info/BusinessPartner.html?Command=STRUCTURE"
+                        dataurl="../info/BusinessPartner.html?Command=DATA"
+                        updatesurl="../info/BusinessPartner.html?Command=DATA"
+                        calculatenumrows="true" editable="false" sortable="true"
+                        deleteable="true" oninvalidvalue="alert" onscroll="updateHeader"
+                        ongridload="onGridLoadDo" buffersize="3.0" showlinenumbers="true"
+                        offset="0" sortcols="1" sortdirs="ASC" defaultrow="0"
+                        maxwidth="99%" percentagewidthrelativetoid="client_middle"
+                        multipleRowSelection="false"
+                        preventcache="true" usecache="true" cachecontent="false">
+                      </div>
+                      <script>djConfig.searchIds.push("grid");</script>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </div>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <div class="Popup_ContentPane_Client" style="overflow: auto; height:50px;" id="client_bottom">
+          <table cellspacing="0" cellpadding="0" class="Popup_Client_TableSelector">
+
+            <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></td>
+              <td></td>
+              <td class="Button_RightAlign_ContentCell">
+                <div>
+                  <a class="ButtonLink" href="#"
+                    onfocus="setWindowElementFocus(this); window.status='OK'; return true;"
+                    onblur="window.status=''; return true;"
+                    onkeypress="this.className='ButtonLink_active'; return true;"
+                    onkeyup="this.className='ButtonLink_focus'; return true;"
+                    onclick="depurarSelector('SAVE');return false;"
+                    id="buttonOK">
+                    <table class="Button"
+                      onmousedown="this.className='Button_active'; return true;"
+                      onmouseup="this.className='Button'; return true;"
+                      onmouseover="this.className='Button_hover'; window.status='OK'; return true;"
+                      onmouseout="this.className='Button'; window.status=''; return true;">
+                      <tr>
+                        <td class="Button_left"><img class="Button_Icon Button_Icon_ok" alt="OK" title="OK" src="../../../../../web/images/blank.gif" border=0/></td>
+                        <td class="Button_text Button_width">OK</td>
+                        <td class="Button_right"></td>
+                      </tr>
+                    </table>
+                  </a>
+                </div>
+              </td>
+              <td class="Button_LeftAlign_ContentCell">
+                <div>
+                  <a class="ButtonLink" href="#"
+                    onfocus="setWindowElementFocus(this); window.status='Cancel'; return true;"
+                    onblur="window.status=''; return true;"
+                    onkeypress="this.className='ButtonLink_active'; return true;"
+                    onkeyup="this.className='ButtonLink_focus'; return true;"
+                    onclick="depurarSelector('CLEAR');return false;">
+                    <table class="Button"
+                      onmousedown="this.className='Button_active'; return true;"
+                      onmouseup="this.className='Button'; return true;"
+                      onmouseover="this.className='Button_hover'; window.status='Cancel'; return true;"
+                      onmouseout="this.className='Button'; window.status=''; return true;">
+                      <tr>
+                        <td class="Button_left"><img class="Button_Icon Button_Icon_cancel" alt="Cancel" title="Cancel" src="../../../../../web/images/blank.gif" border=0/></td>
+                        <td class="Button_text Button_width">Cancel</td>
+                        <td class="Button_right"></td>
+                      </tr>
+                    </table>
+                  </a>
+                </div>
+              </td>
+              <td></td>
+              <td></td>
+            </tr>
+          </table>
+        </div>
+      </td>
+    </tr>
+  </table>
+</form>
+</body>
+</html>
\ No newline at end of file
--- a/src/org/openbravo/erpCommon/info/BusinessPartner.java	Mon Apr 21 19:03:40 2008 +0000
+++ b/src/org/openbravo/erpCommon/info/BusinessPartner.java	Mon Apr 21 19:06:47 2008 +0000
@@ -20,10 +20,16 @@
 
 import org.openbravo.base.secureApp.*;
 import org.openbravo.xmlEngine.XmlDocument;
+import org.openbravo.data.FieldProvider;
+import org.openbravo.erpCommon.utility.OBError;
+import org.openbravo.erpCommon.utility.SQLReturnObject;
 import org.openbravo.erpCommon.utility.Utility;
 import java.io.*;
+import java.util.Vector;
+
 import javax.servlet.*;
 import javax.servlet.http.*;
+
 import org.openbravo.utils.Replace;
 
 
@@ -43,11 +49,15 @@
       String strWindowId = vars.getStringParameter("WindowID");
       String strNameValue = vars.getRequestGlobalVariable("inpNameValue", "BusinessPartner.name");
       String strIDValue = vars.getStringParameter("inpIDValue");
+      String strKeyValue = vars.getGlobalVariable("inpKey", "BusinessPartner.key", "");
+      String strBpartners = vars.getGlobalVariable("inpBpartner", "BusinessPartner.bpartner", "all");
       if (!strIDValue.equals("")) {
         String strNameAux = BusinessPartnerData.existsActual(this, strNameValue, strIDValue);
         if (!strNameAux.equals("")) strNameValue = strNameAux;
       }
+      
       vars.removeSessionValue("BusinessPartner.key");
+           
       String strIsSOTrxTab = vars.getStringParameter("inpisSOTrxTab");
       String strBpartner = strIsSOTrxTab;
       if (strIsSOTrxTab.equals("")) strBpartner = Utility.getContext(this, vars, "isSOTrx", strWindowId);
@@ -57,12 +67,13 @@
       else strSelected = "all";
       vars.setSessionValue("BusinessPartner.bpartner", strSelected);
       if (!strNameValue.equals("")) vars.setSessionValue("BusinessPartner.name", strNameValue + "%");
-      printPageFS(response, vars);
+      printPage(response, vars, strKeyValue, strNameValue.concat("%"), strBpartners);
     } else if (vars.commandIn("KEY")) {
       String strWindowId = vars.getStringParameter("WindowID");
       String strIsSOTrxTab = vars.getStringParameter("inpisSOTrxTab");
       String strKeyValue = vars.getRequestGlobalVariable("inpNameValue", "BusinessPartner.key");
       String strIDValue = vars.getStringParameter("inpIDValue");
+      String strOrg = vars.getStringParameter("inpAD_Org_ID");
       if (!strIDValue.equals("")) {
         String strNameAux = BusinessPartnerData.existsActualValue(this, strKeyValue, strIDValue);
         if (!strNameAux.equals("")) strKeyValue = strNameAux;
@@ -76,73 +87,68 @@
       else if (strBpartner.equals("N")) strSelected = "vendor";
       else strSelected = "all";
       vars.setSessionValue("BusinessPartner.bpartner", strSelected);
-      BusinessPartnerData[] data = BusinessPartnerData.selectKey(this, Utility.getContext(this, vars, "#User_Client", "BusinessPartner"), Utility.getContext(this, vars, "#User_Org", "BusinessPartner"), (strSelected.equals("costumer")?"clients":""), (strSelected.equals("vendor")?"vendors":""), strKeyValue + "%");
+      BusinessPartnerData[] data = BusinessPartnerData.selectKey(this, Utility.getContext(this, vars, "#User_Client", "BusinessPartner"), Utility.getSelectorOrgs(this, vars, strOrg), (strSelected.equals("costumer")?"clients":""), (strSelected.equals("vendor")?"vendors":""), strKeyValue + "%");
       if (data!=null && data.length==1) {
         printPageKey(response, vars, data);
-      } else printPageFS(response, vars);
-    } else if (vars.commandIn("FRAME1")) {
-      String strKeyValue = vars.getGlobalVariable("inpKey", "BusinessPartner.key", "");
-      String strNameValue = vars.getGlobalVariable("inpName", "BusinessPartner.name", "");
-      String strBpartners = vars.getGlobalVariable("inpBpartner", "BusinessPartner.bpartner", "all");
-      printPageFrame1(response, vars, strKeyValue, strNameValue, strBpartners);
-    } else if (vars.commandIn("FRAME2")) {
-      String strKey = vars.getGlobalVariable("inpKey", "BusinessPartner.key", "");
-      String strName = vars.getGlobalVariable("inpName", "BusinessPartner.name", "");
-      String strContact = vars.getStringParameter("inpContact");
-      String strZIP = vars.getStringParameter("inpZIP");
-      String strProvincia = vars.getStringParameter("inpProvincia");
-      String strBpartners = vars.getGlobalVariable("inpBpartner", "BusinessPartner.bpartner", "all");
-      String strCity = vars.getStringParameter("inpCity");
-      printPageFrame2(response, vars, strKey, strName, strContact, strZIP, strProvincia, strBpartners, strCity);
-    } else if (vars.commandIn("FIND")) {
-      String strKey = vars.getRequestGlobalVariable("inpKey", "BusinessPartner.key");
-      String strName = vars.getRequestGlobalVariable("inpName", "BusinessPartner.name");
-      String strContact = vars.getStringParameter("inpContact");
-      String strZIP = vars.getStringParameter("inpZIP");
-      String strProvincia = vars.getStringParameter("inpProvincia");
-      String strBpartners = vars.getStringParameter("inpBpartner");
-      String strCity = vars.getStringParameter("inpCity");
-
-      vars.setSessionValue("BusinessPartner.initRecordNumber", "0");
-
-      printPageFrame2(response, vars, strKey, strName, strContact, strZIP, strProvincia, strBpartners, strCity);
-    } else if (vars.commandIn("FRAME3")) {
-      printPageFrame3(response, vars);
-    } else if (vars.commandIn("PREVIOUS")) {
-      String strInitRecord = vars.getSessionValue("BusinessPartner.initRecordNumber");
-      String strRecordRange = Utility.getContext(this, vars, "#RecordRangeInfo", "BusinessPartner");
-      int intRecordRange = strRecordRange.equals("")?0:Integer.parseInt(strRecordRange);
-      if (strInitRecord.equals("") || strInitRecord.equals("0")) vars.setSessionValue("BusinessPartner.initRecordNumber", "0");
-      else {
-        int initRecord = (strInitRecord.equals("")?0:Integer.parseInt(strInitRecord));
-        initRecord -= intRecordRange;
-        strInitRecord = ((initRecord<0)?"0":Integer.toString(initRecord));
-        vars.setSessionValue("BusinessPartner.initRecordNumber", strInitRecord);
-      }
-
-      request.getRequestDispatcher(request.getServletPath() + "?Command=FRAME2").forward(request, response);
-    } else if (vars.commandIn("NEXT")) {
-      String strInitRecord = vars.getSessionValue("BusinessPartner.initRecordNumber");
-      String strRecordRange = Utility.getContext(this, vars, "#RecordRangeInfo", "BusinessPartner");
-      int intRecordRange = strRecordRange.equals("")?0:Integer.parseInt(strRecordRange);
-      int initRecord = (strInitRecord.equals("")?0:Integer.parseInt(strInitRecord));
-      if (initRecord==0) initRecord=1;
-      initRecord += intRecordRange;
-      strInitRecord = ((initRecord<0)?"0":Integer.toString(initRecord));
-      vars.setSessionValue("BusinessPartner.initRecordNumber", strInitRecord);
-
-      request.getRequestDispatcher(request.getServletPath() + "?Command=FRAME2").forward(request, response);
+      } else printPage(response, vars,"","","");
+    } else if(vars.commandIn("STRUCTURE")) {
+    	printGridStructure(response, vars);
+    } else if(vars.commandIn("DATA")) {
+    	if(vars.getStringParameter("clear").equals("true")){
+    		vars.removeSessionValue("BusinessPartner.key");
+    		vars.removeSessionValue("BusinessPartner.name");
+    		vars.removeSessionValue("BusinessPartner.adorgid");
+    		vars.removeSessionValue("BusinessPartner.contact");
+    		vars.removeSessionValue("BusinessPartner.zip");
+    		vars.removeSessionValue("BusinessPartner.provincia");
+    		vars.removeSessionValue("BusinessPartner.bpartner");
+    		vars.removeSessionValue("BusinessPartner.city");
+    	}
+    	String strKey = vars.getGlobalVariable("inpKey" , "BusinessPartner.key", "");
+        String strName = vars.getGlobalVariable("inpName", "BusinessPartner.name", "");
+        String strOrg = vars.getGlobalVariable("inpAD_Org_ID", "BusinessPartner.adorgid", "");
+        String strContact = vars.getGlobalVariable("inpContact", "BusinessPartner.contact", "");
+        String strZIP = vars.getGlobalVariable("inpZIP", "BusinessPartner.zip", "");
+        String strProvincia = vars.getGlobalVariable("inpProvincia", "BusinessPartner.provincia", "");
+        String strBpartners = vars.getGlobalVariable("inpBpartner" , "BusinessPartner.bpartner", "all"); //all
+        String strCity = vars.getGlobalVariable("inpCity", "BusinessPartner.city", "");
+        String strNewFilter = vars.getStringParameter("newFilter");
+        String strOffset = vars.getStringParameter("offset");
+        String strPageSize = vars.getStringParameter("page_size");
+        String strSortCols = vars.getStringParameter("sort_cols").toUpperCase();
+        String strSortDirs = vars.getStringParameter("sort_dirs").toUpperCase();
+    	printGridData(response, vars, strKey, strName, strOrg, strContact, strZIP, strProvincia, strBpartners, strCity, strSortCols + " " + strSortDirs, strOffset, strPageSize, strNewFilter);
     } else pageError(response);
   }
-
-  void printPageFS(HttpServletResponse response, VariablesSecureApp vars) throws IOException, ServletException {
-    if (log4j.isDebugEnabled()) log4j.debug("Output: business partners seeker Frame Set");
-    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/BusinessPartner_FS").createXmlDocument();
-
-    response.setContentType("text/html; charset=UTF-8");
-    PrintWriter out = response.getWriter();
-    out.println(xmlDocument.print());
-    out.close();
+  
+  void printPage(HttpServletResponse response, VariablesSecureApp vars, String strKeyValue, String strNameValue, String strBpartners) throws IOException, ServletException {
+   	  
+	  if (log4j.isDebugEnabled()) log4j.debug("Output: Frame 1 of business partners seeker");
+	    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/BusinessPartner").createXmlDocument();
+	    if (strKeyValue.equals("") && strNameValue.equals("")) {
+	      xmlDocument.setParameter("key", "%");
+	    } else {
+	      xmlDocument.setParameter("key", strKeyValue);
+	    }
+	    xmlDocument.setParameter("direction", "var baseDirection = \"" + strReplaceWith + "/\";\n");
+	    xmlDocument.setParameter("language", "LNG_POR_DEFECTO=\"" + vars.getLanguage() + "\";");
+	    xmlDocument.setParameter("theme", vars.getTheme());
+	    xmlDocument.setParameter("name", strNameValue);
+	    xmlDocument.setParameter("clients", strBpartners);
+	    xmlDocument.setParameter("vendors", strBpartners);
+	    xmlDocument.setParameter("all", strBpartners);
+	    xmlDocument.setParameter("orgs", vars.getStringParameter("inpAD_Org_ID"));
+	    
+	    xmlDocument.setParameter("grid", "20");
+	    xmlDocument.setParameter("grid_Offset", "");
+	    xmlDocument.setParameter("grid_SortCols", "1");
+	    xmlDocument.setParameter("grid_SortDirs", "ASC");
+	    xmlDocument.setParameter("grid_Default", "0");
+	    
+	    response.setContentType("text/html; charset=UTF-8");
+	    PrintWriter out = response.getWriter();
+	    out.println(xmlDocument.print());
+	    out.close();
   }
 
   void printPageKey(HttpServletResponse response, VariablesSecureApp vars, BusinessPartnerData[] data) throws IOException, ServletException {
@@ -171,74 +177,147 @@
     return html.toString();
   }
 
-  void printPageFrame1(HttpServletResponse response, VariablesSecureApp vars, String strKeyValue, String strNameValue, String strBpartners) throws IOException, ServletException {
-    if (log4j.isDebugEnabled()) log4j.debug("Output: Frame 1 of business partners seeker");
-    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/BusinessPartner_F1").createXmlDocument();
-    if (strKeyValue.equals("") && strNameValue.equals("")) {
-      xmlDocument.setParameter("key", "%");
-    } else {
-      xmlDocument.setParameter("key", strKeyValue);
+  void printGridStructure(HttpServletResponse response, VariablesSecureApp vars) throws IOException, ServletException {
+	  if (log4j.isDebugEnabled()) log4j.debug("Output: print page structure");
+	    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/utility/DataGridStructure").createXmlDocument();
+	    
+	    SQLReturnObject[] data = getHeaders(vars);
+	    String type = "Hidden";
+	    String title = "";
+	    String description = "";
+	   	    
+	    xmlDocument.setParameter("type", type);
+	    xmlDocument.setParameter("title", title);
+	    xmlDocument.setParameter("description", description);
+	    xmlDocument.setData("structure1", data);
+	    response.setContentType("text/xml; charset=UTF-8");
+	    response.setHeader("Cache-Control", "no-cache");
+	    PrintWriter out = response.getWriter();
+	    if (log4j.isDebugEnabled()) log4j.debug(xmlDocument.print());
+	    out.println(xmlDocument.print());
+	    out.close();
+  }
+  
+  private SQLReturnObject[] getHeaders(VariablesSecureApp vars) {
+	  SQLReturnObject[] data = null;
+	  Vector<SQLReturnObject> vAux = new Vector<SQLReturnObject>();	  
+	  String[] colNames = {"value", "name","so_creditavailable","so_creditused", "contact", "phone", "pc", "city", "income", "c_bpartner_id", "c_bpartner_contact_id", "c_bpartner_location_id", "rowkey"};
+	  String[] colWidths = {"98", "172", "50", "83", "104", "63", "43", "100", "63", "0", "0", "0", "0"};
+	  for(int i=0; i < colNames.length; i++) {
+		  SQLReturnObject dataAux = new SQLReturnObject();
+		  dataAux.setData("columnname", colNames[i]);
+	      dataAux.setData("gridcolumnname", colNames[i]);
+	      dataAux.setData("adReferenceId", "AD_Reference_ID");
+	      dataAux.setData("adReferenceValueId", "AD_ReferenceValue_ID");	      
+	      dataAux.setData("isidentifier", (colNames[i].equals("rowkey")?"true":"false"));
+	      dataAux.setData("iskey", (colNames[i].equals("rowkey")?"true":"false"));
+	      dataAux.setData("isvisible", (colNames[i].endsWith("_id") || colNames[i].equals("rowkey")?"false":"true"));
+	      String name = Utility.messageBD(this, "BPS_" + colNames[i].toUpperCase(), vars.getLanguage());
+	      dataAux.setData("name", (name.startsWith("BPS_")?colNames[i]:name));
+	      dataAux.setData("type", "string");
+	      dataAux.setData("width", colWidths[i]);
+	      vAux.addElement(dataAux);
+	  }
+	  data = new SQLReturnObject[vAux.size()];
+	  vAux.copyInto(data);
+	  return data;
+  }
+  
+  void printGridData(HttpServletResponse response, VariablesSecureApp vars, String strKey, String strName, String strOrg, String strContact, String strZIP, String strProvincia, String strBpartners, String strCity, String strOrderBy, String strOffset, String strPageSize, String strNewFilter ) throws IOException, ServletException {
+    if (log4j.isDebugEnabled()) log4j.debug("Output: print page rows");
+    
+    SQLReturnObject[] headers = getHeaders(vars);
+    FieldProvider[] data = null;
+    String type = "Hidden";
+    String title = "";
+    String description = "";
+    String strNumRows = "0";
+    
+    if (headers!=null) {
+      try{
+	  	if(strNewFilter.equals("1") || strNewFilter.equals("")) { // New filter or first load    	
+	  		data = BusinessPartnerData.select(this, "1", Utility.getContext(this, vars, "#User_Client", "BusinessPartner"), Utility.getSelectorOrgs(this, vars, strOrg), strKey, strName, strContact, strZIP, strProvincia, (strBpartners.equals("costumer")?"clients":""), (strBpartners.equals("vendor")?"vendors":""), strCity, strOrderBy, "", "");
+	  		strNumRows = String.valueOf(data.length);
+	  		vars.setSessionValue("BusinessPartnerInfo.numrows", strNumRows);
+	  	}
+  		else {
+  			strNumRows = vars.getSessionValue("BusinessPartnerInfo.numrows");
+  		}
+	  			
+  		// Filtering result
+    	if(this.myPool.getRDBMS().equalsIgnoreCase("ORACLE")) {
+    		String oraLimit = strOffset + " AND " + String.valueOf(Integer.valueOf(strOffset).intValue() + Integer.valueOf(strPageSize));    		
+    		data = BusinessPartnerData.select(this, "ROWNUM", Utility.getContext(this, vars, "#User_Client", "BusinessPartner"), Utility.getSelectorOrgs(this, vars, strOrg), strKey, strName, strContact, strZIP, strProvincia, (strBpartners.equals("costumer")?"clients":""), (strBpartners.equals("vendor")?"vendors":""), strCity, strOrderBy, oraLimit, "");
+    	}
+    	else {
+    		String pgLimit = strPageSize + " OFFSET " + strOffset;
+    		data = BusinessPartnerData.select(this, "1", Utility.getContext(this, vars, "#User_Client", "BusinessPartner"), Utility.getSelectorOrgs(this, vars, strOrg), strKey, strName, strContact, strZIP, strProvincia, (strBpartners.equals("costumer")?"clients":""), (strBpartners.equals("vendor")?"vendors":""), strCity, strOrderBy, "", pgLimit);
+    	}    	
+      } catch (ServletException e) {
+        log4j.error("Error in print page data: " + e);
+        e.printStackTrace();
+        OBError myError = Utility.translateError(this, vars, vars.getLanguage(), e.getMessage());
+        if (!myError.isConnectionAvailable()) {
+          bdErrorAjax(response, "Error", "Connection Error", "No database connection");
+          return;
+        } else {
+          type = myError.getType();
+          title = myError.getTitle();
+          if (!myError.getMessage().startsWith("<![CDATA[")) description = "<![CDATA[" + myError.getMessage() + "]]>";
+          else description = myError.getMessage();
+        }
+      } catch (Exception e) { 
+        if (log4j.isDebugEnabled()) log4j.debug("Error obtaining rows data");
+        type = "Error";
+        title = "Error";
+        if (e.getMessage().startsWith("<![CDATA[")) description = "<![CDATA[" + e.getMessage() + "]]>";
+        else description = e.getMessage();
+        e.printStackTrace();
+      }
     }
-    xmlDocument.setParameter("direction", "var baseDirection = \"" + strReplaceWith + "/\";\n");
-    xmlDocument.setParameter("language", "LNG_POR_DEFECTO=\"" + vars.getLanguage() + "\";");
-    xmlDocument.setParameter("theme", vars.getTheme());
-    xmlDocument.setParameter("name", strNameValue);
-    xmlDocument.setParameter("clients", strBpartners);
-    xmlDocument.setParameter("vendors", strBpartners);
-    xmlDocument.setParameter("all", strBpartners);
-    response.setContentType("text/html; charset=UTF-8");
+    
+    if (!type.startsWith("<![CDATA[")) type = "<![CDATA[" + type + "]]>";
+    if (!title.startsWith("<![CDATA[")) title = "<![CDATA[" + title + "]]>";
+    if (!description.startsWith("<![CDATA[")) description = "<![CDATA[" + description + "]]>";
+    StringBuffer strRowsData = new StringBuffer();
+    strRowsData.append("<xml-data>\n");
+    strRowsData.append("  <status>\n");
+    strRowsData.append("    <type>").append(type).append("</type>\n");
+    strRowsData.append("    <title>").append(title).append("</title>\n");
+    strRowsData.append("    <description>").append(description).append("</description>\n");
+    strRowsData.append("  </status>\n");
+    strRowsData.append("  <rows numRows=\"").append(strNumRows).append("\">\n");
+    if (data!=null && data.length>0) {
+      for (int j=0;j<data.length;j++) {
+        strRowsData.append("    <tr>\n");
+        for (int k=0;k<headers.length;k++) {
+          strRowsData.append("      <td><![CDATA[");
+          String columnname = headers[k].getField("columnname");
+          
+          if ((data[j].getField(columnname)) != null) {
+            if (headers[k].getField("adReferenceId").equals("32")) strRowsData.append(strReplaceWith).append("/images/");
+            strRowsData.append(data[j].getField(columnname).replaceAll("<b>","").replaceAll("<B>","").replaceAll("</b>","").replaceAll("</B>","").replaceAll("<i>","").replaceAll("<I>","").replaceAll("</i>","").replaceAll("</I>","").replaceAll("<p>","&nbsp;").replaceAll("<P>","&nbsp;").replaceAll("<br>","&nbsp;").replaceAll("<BR>","&nbsp;"));
+          } else {
+            if (headers[k].getField("adReferenceId").equals("32")) {
+              strRowsData.append(strReplaceWith).append("/images/blank.gif");
+            } else strRowsData.append("&nbsp;");
+          }
+          strRowsData.append("]]></td>\n");
+        }
+        strRowsData.append("    </tr>\n");
+      }
+    }
+    strRowsData.append("  </rows>\n");
+    strRowsData.append("</xml-data>\n");
+        
+    response.setContentType("text/xml; charset=UTF-8");
+    response.setHeader("Cache-Control", "no-cache");
     PrintWriter out = response.getWriter();
-    out.println(xmlDocument.print());
+    if (log4j.isDebugEnabled()) log4j.debug(strRowsData.toString());  
+    out.print(strRowsData.toString());
     out.close();
   }
-
-  void printPageFrame2(HttpServletResponse response, VariablesSecureApp vars, String strKey, String strName, String strContact, String strZIP, String strProvincia, String strBpartners, String strCity) throws IOException, ServletException {
-    if (log4j.isDebugEnabled()) log4j.debug("Output: Frame 2 of the business partners seeker");
-    XmlDocument xmlDocument;
-
-    String strRecordRange = Utility.getContext(this, vars, "#RecordRangeInfo", "BusinessPartner");
-    int intRecordRange = (strRecordRange.equals("")?0:Integer.parseInt(strRecordRange));
-    String strInitRecord = vars.getSessionValue("BusinessPartner.initRecordNumber");
-    int initRecordNumber = (strInitRecord.equals("")?0:Integer.parseInt(strInitRecord));
-
-    if (strKey.equals("") && strName.equals("") && strContact.equals("") && strZIP.equals("") && strProvincia.equals("") && strCity.equals("")) {
-      String[] discard = {"sectionDetail", "hasPrevious", "hasNext"};
-      xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/BusinessPartner_F2", discard).createXmlDocument();
-      xmlDocument.setData("structure1", BusinessPartnerData.set());
-    } else {
-      String[] discard = {"withoutPrevious", "withoutNext"};
-      BusinessPartnerData[] data = BusinessPartnerData.select(this, Utility.getContext(this, vars, "#User_Client", "BusinessPartner"), Utility.getContext(this, vars, "#User_Org", "BusinessPartner"), strKey, strName, strContact, strZIP, strProvincia, (strBpartners.equals("costumer")?"clients":""), (strBpartners.equals("vendor")?"vendors":""), strCity, initRecordNumber, intRecordRange);
-      if (data==null || initRecordNumber<=1) discard[0] = new String("hasPrevious");
-      if (data==null || data.length==0 || data.length<intRecordRange) discard[1] = new String("hasNext");
-      xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/BusinessPartner_F2", discard).createXmlDocument();
-      xmlDocument.setData("structure1", data);
-    }
-    xmlDocument.setParameter("direction", "var baseDirection = \"" + strReplaceWith + "/\";\n");
-    xmlDocument.setParameter("language", "LNG_POR_DEFECTO=\"" + vars.getLanguage() + "\";");
-    xmlDocument.setParameter("theme", vars.getTheme());
-
-    response.setContentType("text/html; charset=UTF-8");
-    PrintWriter out = response.getWriter();
-    out.println(xmlDocument.print());
-    out.close();
-  }
-
-  void printPageFrame3(HttpServletResponse response, VariablesSecureApp vars) throws IOException, ServletException {
-    if (log4j.isDebugEnabled()) log4j.debug("Output: Frame 3 of the business partners seeker");
-    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/BusinessPartner_F3").createXmlDocument();
-
-    xmlDocument.setParameter("direction", "var baseDirection = \"" + strReplaceWith + "/\";\n");
-    xmlDocument.setParameter("language", "LNG_POR_DEFECTO=\"" + vars.getLanguage() + "\";");
-    xmlDocument.setParameter("theme", vars.getTheme());
-
-    response.setContentType("text/html; charset=UTF-8");
-
-
-    PrintWriter out = response.getWriter();
-    out.println(xmlDocument.print());
-    out.close();
-  }
-
+  
   public String getServletInfo() {
     return "Servlet that presents the business partners seeker";
   } // end of getServletInfo() method
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/erpCommon/info/BusinessPartner.xml	Mon Apr 21 19:06:47 2008 +0000
@@ -0,0 +1,43 @@
+<?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="BusinessPartner.html"/>
+	<PARAMETER id="paramCheckClient" name="checkClient" default="costumer"/>
+	<PARAMETER id="paramCheckVendor" name="checkVendor" default="vendor"/>
+	<PARAMETER id="paramCheckAll" name="checkAll" default="all"/>
+	<PARAMETER id="paramDirection" name="direction" default=""/>
+	<PARAMETER id="paramLanguage" name="language" default=""/>
+	<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
+	
+	<PARAMETER id="fieldKey" name="key" attribute="value"/>
+	<PARAMETER id="fieldName" name="name" attribute="value"/>
+	<PARAMETER id="fieldClientsSelect" name="clients" boolean="checked" withId="paramCheckClient"/>
+	<PARAMETER id="fieldVendorsSelect" name="vendors" boolean="checked" withId="paramCheckVendor"/>
+	<PARAMETER id="fieldAllSelect" name="all" boolean="checked" withId="paramCheckAll"/>
+	<PARAMETER id="fieldOrgs" name="orgs" replace="xx" attribute="value" />
+
+	<PARAMETER id="grid" name="grid" attribute="numrows" />
+	<PARAMETER id="grid" name="grid_Offset" attribute="offset" />
+	<PARAMETER id="grid" name="grid_SortCols" attribute="sortcols" />
+	<PARAMETER id="grid" name="grid_SortDirs" attribute="sortdirs" />
+	<PARAMETER id="grid" name="grid_Default" attribute="defaultrow" />
+
+	<DISCARD id="discard"/>
+</REPORT>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.html	Mon Apr 21 19:06:47 2008 +0000
@@ -0,0 +1,346 @@
+<!--
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License. 
+ * The Original Code is Openbravo ERP. 
+ * The Initial Developer of the Original Code is Openbravo SL 
+ * All portions are Copyright (C) 2001-2008 Openbravo SL 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+-->
+<html>
+<head>
+<title>Business Partner selector</title>
+<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"></link>
+<script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/appStatus.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/dojoConfig.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/openbravo/core.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/openbravo/widget/DataGrid.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/searchs.js" type="text/javascript"></script>
+<script type="text/javascript">
+        dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
+</script>
+<link rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"></link>
+<script language="JavaScript" type="text/javascript" id="paramDirection">var baseDirection = "http://yourSite/web/";</script>
+<script language="JavaScript" type="text/javascript" id="paramLanguage">LNG_POR_DEFECTO = "en_US";</script>
+<script language="JavaScript" type="text/javascript">
+function depurar() {	
+	var frm = document.forms[0];
+	if ((frm.inpKey.value==null || frm.inpKey.value=="") && (frm.inpName.value==null || frm.inpName.value=="") && (frm.inpContact.value==null || frm.inpContact.value=="") && (frm.inpZIP.value==null || frm.inpZIP.value=="") && (frm.inpPhone.value==null || frm.inpPhone.value=="") && !frm.inpClients.checked) {
+		frm.inpKey.focus();
+		mensaje(7);
+		return false;
+	}	
+	return true;
+}
+</script>
+<script language="JavaScript" type="text/javascript">
+	function onLoadDo(){
+    this.windowTables = new Array(
+      new windowTableId('client_top', null, 'buttonSearch', null),
+      new windowTableId('client_middle', null, 'buttonOK', null),
+      new windowTableId('client_bottom', null, 'buttonOK', null)
+    );
+    setWindowTableParentElement();
+    enableShortcuts('popup');
+
+    try {
+      onloadFunctions();
+    } catch (e) {}
+
+    setWindowElementFocus('firstElement');
+    resizeAreaInfo();
+  }
+
+  function onResizeDo(){
+    resizeAreaInfo(true);
+  }
+  
+  function depurarSelector(action) {
+  	var pos; var keys;  var clave; var texto; var parameter; var data;
+  	if(action == "SAVE") {
+  		data = new Array();
+  		rows = dojo.widget.byId('grid').getSelectedRows();
+  		for(var i=0; i < rows.length; i++) {
+  			var rowkey = rows[i].split("#");
+  			var rval = new Array(rowkey[0], rowkey[1]);
+  			data.push(rval);
+  		}
+    }
+  	parent.opener.closeMultiSearch(action, data);
+  }
+</script>
+<script language="JavaScript" type="text/javascript" id="selectedColumn">  
+  dojo.require("openbravo.widget.DataGrid");
+  var selectedRow = 0;
+  var orderByPositions = new Array("1");
+  var orderByDirections = new Array("ASC");
+</script>
+</head>
+<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
+<form name="frmSelector" method="POST" action="BusinessPartnerMultiple.html">
+  <input type="hidden" name="Command" />
+  <input type="hidden" name="IsPopUpCall" value="1" />
+  <input type="hidden" name="inpAD_Org_ID" value="xx" id="fieldOrgs" />
+  <div class="Popup_ContentPane_CircleLogo">
+    <div class="Popup_WindowLogo">
+      <img class="Popup_WindowLogo_Icon Popup_WindowLogo_Icon_businessPartner" src="../../../../../web/images/blank.gif" border=0/></img>
+    </div>
+  </div>
+  <table cellspacing="0" cellpadding="0" width="100%" id="table_header">
+    <tr>
+      <td>
+        <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_NavBar">
+          <tr class="Popup_NavBar_bg"><td></td>
+            <td class="Popup_NavBar_separator_cell"></td>
+            <td class="Popup_NavBar_bg_logo_left"></td>
+            <td class="Popup_NavBar_bg_logo" width="1" onclick="abrirNuevoBrowser('http://www.openbravo.com', 'Openbravo');return false;"><img src="../../../../../web/images/blank.gif" alt="Openbravo" title="Openbravo" border="0" id="openbravoLogo" class="Popup_NavBar_logo" /></td>
+            <td class="Popup_NavBar_bg_logo_right"></td>
+            <td class="Popup_NavBar_Popup_title_cell"><span>Business Partner selector</span></td>
+            <td class="Popup_NavBar_separator_cell"></td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+
+    <tr>
+      <td>
+        <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_SeparatorBar">
+          <tr>
+            <td class="Popup_SeparatorBar_bg"></td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+
+  </table>
+
+  <table cellspacing="0" cellpadding="0" width="100%">
+
+    <tr>
+      <td>
+        <div class="Popup_ContentPane_Client" style="overflow: auto; height:185px;" id="client_top">
+          <table cellspacing="0" cellpadding="0" class="Popup_Client_TableSelector">
+
+            <tr>
+              <td class="TableEdition_OneCell_width"></td>
+              <td class="TableEdition_OneCell_width"></td>
+              <td class="TableEdition_OneCell_width"></td>
+              <td class="TableEdition_OneCell_width"></td>
+              <td class="TableEdition_OneCell_width"></td>
+              <td class="TableEdition_OneCell_width"></td>
+            </tr>
+
+            <tr>
+              <td colspan="6">
+                <table class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
+                  <tr class="FieldGroup_TopMargin"></tr>
+                  <tr>
+                    <td class="FieldGroupTitle_Left"><img class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"></img></td>
+                    <td class="FieldGroupTitle">Primary Filters</td>
+                    <td class="FieldGroupTitle_Right"><img class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"></img></td>
+                    <td class="FieldGroupContent"></td>
+
+                  </tr>
+                  <tr class="FieldGroup_BottomMargin"></tr>
+                </table>
+              </td>
+            </tr>
+
+            <tr>
+              <td class="TitleCell"><span class="LabelText">Key</span></td>
+              <td class="TextBox_ContentCell"><input class="dojoValidateValid TextBox_OneCell_width" type="text" name="inpKey" value="" id="fieldKey"></input></td>
+              <td></td>
+              <td class="TitleCell"><span class="LabelText">Name</span></td>
+              <td class="TextBox_ContentCell" colspan="2"><input type="text" name="inpName" value="" id="fieldName" class="dojoValidateValid TextBox_TwoCells_width"></input></td>
+              <td></td>
+            </tr>
+
+            <tr>
+              <td class="TitleCell"><span class="LabelText">Contact</span></td>
+              <td class="TextBox_ContentCell" colspan="2"><input type="text" name="inpContact" class="dojoValidateValid TextBox_TwoCells_width"></input></td>
+
+              <td class="TitleCell"><span class="LabelText">City</span></td>
+              <td class="TextBox_ContentCell" colspan="2"> <input type="text" name="inpCity" class="dojoValidateValid TextBox_TwoCells_width"></input></td>
+            </tr>
+      
+            <tr>
+              <td class="TitleCell"><span class="LabelText">Postal Code</span></td>
+              <td class="TextBox_ContentCell"><input class="dojoValidateValid TextBox_OneCell_width" type="text" name="inpZIP"></input></td>
+
+              <td></td>
+
+              <td class="TitleCell"><span class="LabelText">Region</span></td>
+              <td class="TextBox_ContentCell" colspan="2"><input type="text" name="inpProvincia" class="dojoValidateValid TextBox_TwoCells_width"></input> </td>
+            </tr>
+        
+            <tr> 
+             <td class="TitleCell"><span class="LabelText">Customer</span></td>
+             <td class="Radio_Check_ContentCell"><span class="Radio_container_NOT_Focused"><input type="radio" name="inpBpartner" value="costumer" id="fieldClientsSelect"></input></span></td>
+
+             <td class="TitleCell"><span class="LabelText">Providers</span></td>
+             <td class="Radio_Check_ContentCell"><span class="Radio_container_NOT_Focused"><input type="radio" name="inpBpartner" value="vendor" id="fieldVendorsSelect"></input></span></td>
+
+             <td class="TitleCell"><span class="LabelText">All</span></td>
+             <td class="Radio_Check_ContentCell"><span class="Radio_container_NOT_Focused"><input type="radio" name="inpBpartner" value="all" id="fieldAllSelect"></input></span></td>
+            </tr>
+
+            <tr>
+              <td></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="setFilters();return false;"
+                    id="buttonSearch">
+                    <table class="Button"
+                      onmousedown="this.className='Button_active'; return true;"
+                      onmouseup="this.className='Button'; return true;"
+                      onmouseover="this.className='Button_hover'; window.status='Search'; return true;"
+                      onmouseout="this.className='Button'; window.status=''; 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></td>
+              <td></td>
+              <td></td>
+              <td></td>
+            </tr>
+          </table>
+        </div>
+      </td>
+    </tr>
+
+    <tr>
+      <td>
+        <div class="Popup_ContentPane_Client" style="overflow: hidden; height: 0px;" id="client_middle">
+          <table summary="" id="sectionDetail">
+            <tr>
+              <td>
+                <table cellspacing="0" cellpadding="0" width="10px" class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;" id="grid_sample">
+                  <tr class="DataGrid_Body_Row" id="grid_sample_header">
+                    <th width="10px" class="DataGrid_Header_Cell">DataGrid</th>
+                  </tr>
+                  <tr class="DataGrid_Body_Row DataGrid_Body_Row_1" onclick="selectActual(this); loadData('BBAccountingUser', '1000012', '', '1'); return true;" id="grid_sample_row">
+                    <td class="DataGrid_Body_Cell">Loading...</td>
+                  </tr>
+                </table>
+                <table width="100%" cellspacing="0" cellpadding="0" border="0" class="Main_Client_TableRelation" id="grid_table">
+                  <tr>
+                    <td>
+                      <div id="grid" dojotype="openbravo:DataGrid"
+                        structureurl="../info/BusinessPartnerMultiple.html?Command=STRUCTURE"
+                        dataurl="../info/BusinessPartnerMultiple.html?Command=DATA"
+                        updatesurl="../info/BusinessPartnerMultiple.html?Command=DATA"
+                        calculatenumrows="true" editable="false" sortable="true"
+                        deleteable="true" oninvalidvalue="alert" onscroll="updateHeader"
+                        ongridload="onGridLoadDo" buffersize="3.0" showlinenumbers="true"
+                        offset="0" sortcols="1" sortdirs="ASC" defaultrow="0"
+                        maxwidth="99%" percentagewidthrelativetoid="client_middle"
+                        multipleRowSelection="true"
+                        preventcache="true" usecache="true" cachecontent="false">
+                      </div>
+                      <script>djConfig.searchIds.push("grid");</script>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </div>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <div class="Popup_ContentPane_Client" style="overflow: auto; height:50px;" id="client_bottom">
+          <table cellspacing="0" cellpadding="0" class="Popup_Client_TableSelector">
+
+            <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></td>
+              <td></td>
+              <td class="Button_RightAlign_ContentCell">
+                <div>
+                  <a class="ButtonLink" href="#"
+                    onfocus="setWindowElementFocus(this); window.status='OK'; return true;"
+                    onblur="window.status=''; return true;"
+                    onkeypress="this.className='ButtonLink_active'; return true;"
+                    onkeyup="this.className='ButtonLink_focus'; return true;"
+                    onclick="depurarSelector('SAVE');return false;"
+                    id="buttonOK">
+                    <table class="Button"
+                      onmousedown="this.className='Button_active'; return true;"
+                      onmouseup="this.className='Button'; return true;"
+                      onmouseover="this.className='Button_hover'; window.status='OK'; return true;"
+                      onmouseout="this.className='Button'; window.status=''; return true;">
+                      <tr>
+                        <td class="Button_left"><img class="Button_Icon Button_Icon_ok" alt="OK" title="OK" src="../../../../../web/images/blank.gif" border=0/></td>
+                        <td class="Button_text Button_width">OK</td>
+                        <td class="Button_right"></td>
+                      </tr>
+                    </table>
+                  </a>
+                </div>
+              </td>
+              <td class="Button_LeftAlign_ContentCell">
+                <div>
+                  <a class="ButtonLink" href="#"
+                    onfocus="setWindowElementFocus(this); window.status='Cancel'; return true;"
+                    onblur="window.status=''; return true;"
+                    onkeypress="this.className='ButtonLink_active'; return true;"
+                    onkeyup="this.className='ButtonLink_focus'; return true;"
+                    onclick="depurarSelector('CLEAR');return false;">
+                    <table class="Button"
+                      onmousedown="this.className='Button_active'; return true;"
+                      onmouseup="this.className='Button'; return true;"
+                      onmouseover="this.className='Button_hover'; window.status='Cancel'; return true;"
+                      onmouseout="this.className='Button'; window.status=''; return true;">
+                      <tr>
+                        <td class="Button_left"><img class="Button_Icon Button_Icon_cancel" alt="Cancel" title="Cancel" src="../../../../../web/images/blank.gif" border=0/></td>
+                        <td class="Button_text Button_width">Cancel</td>
+                        <td class="Button_right"></td>
+                      </tr>
+                    </table>
+                  </a>
+                </div>
+              </td>
+              <td></td>
+              <td></td>
+            </tr>
+          </table>
+        </div>
+      </td>
+    </tr>
+  </table>
+</form>
+</body>
+</html>
--- a/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.java	Mon Apr 21 19:03:40 2008 +0000
+++ b/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.java	Mon Apr 21 19:06:47 2008 +0000
@@ -20,8 +20,13 @@
 
 import org.openbravo.base.secureApp.*;
 import org.openbravo.xmlEngine.XmlDocument;
+import org.openbravo.data.FieldProvider;
+import org.openbravo.erpCommon.utility.OBError;
+import org.openbravo.erpCommon.utility.SQLReturnObject;
 import org.openbravo.erpCommon.utility.Utility;
 import java.io.*;
+import java.util.Vector;
+
 import javax.servlet.*;
 import javax.servlet.http.*;
 
@@ -43,20 +48,20 @@
       String strNameValue = vars.getRequestGlobalVariable("inpNameValue", "BusinessPartnerMultiple.name");
       String strIsSOTrxTab = vars.getStringParameter("inpisSOTrxTab");
       String strBpartner = strIsSOTrxTab;
+      String strKeyValue = vars.getGlobalVariable("inpKey", "BusinessPartnerMultiple.key", "");
+      String strBpartners = vars.getStringParameter("inpBpartner","all");
+      
       if (strIsSOTrxTab.equals("")) strBpartner = Utility.getContext(this, vars, "isSOTrx", strWindowId);
       String strSelected = "all";
       if (strBpartner.equals("Y")) strSelected = "costumer";
       else if (strBpartner.equals("N")) strSelected = "vendor";
       else strSelected = "all";
       vars.setSessionValue("BusinessPartnerMultiple.bpartner", strSelected);
-      if (!strNameValue.equals("")) vars.setSessionValue("BusinessPartnerMultiple.name", strNameValue + "%");
-      printPageFS(response, vars);
-    } else if (vars.commandIn("FRAME1")) {
-      String strKeyValue = vars.getGlobalVariable("inpKey", "BusinessPartnerMultiple.key", "");
-      String strNameValue = vars.getGlobalVariable("inpName", "BusinessPartnerMultiple.name", "");
-      String strBpartners = vars.getGlobalVariable("inpBpartner", "BusinessPartnerMultiple.bpartner", "all");
-      printPageFrame1(response, vars, strKeyValue, strNameValue, strBpartners);
-    } else if (vars.commandIn("FRAME2")) {
+      if (!strNameValue.equals("")) vars.setSessionValue("BusinessPartnerMultiple.name", strNameValue + "%");  
+      printPage(response, vars, strKeyValue, strNameValue, strBpartners);
+    } else if(vars.commandIn("STRUCTURE")) {
+      printGridStructure(response, vars);
+    } else if(vars.commandIn("DATA")) {
       String strKey = vars.getGlobalVariable("inpKey", "BusinessPartnerMultiple.key", "");
       String strName = vars.getGlobalVariable("inpName", "BusinessPartnerMultiple.name", "");
       String strContact = vars.getStringParameter("inpContact");
@@ -64,62 +69,18 @@
       String strProvincia = vars.getStringParameter("inpProvincia");
       String strBpartners = vars.getGlobalVariable("inpBpartner", "BusinessPartnerMultiple.bpartner", "all");
       String strCity = vars.getStringParameter("inpCity");
-      printPageFrame2(response, vars, strKey, strName, strContact, strZIP, strProvincia, strBpartners, strCity);
-    } else if (vars.commandIn("FIND")) {
-      String strKey = vars.getRequestGlobalVariable("inpKey", "BusinessPartnerMultiple.key");
-      String strName = vars.getRequestGlobalVariable("inpName", "BusinessPartnerMultiple.name");
-      String strContact = vars.getStringParameter("inpContact");
-      String strZIP = vars.getStringParameter("inpZIP");
-      String strProvincia = vars.getStringParameter("inpProvincia");
-      String strBpartners = vars.getStringParameter("inpBpartner");
-      String strCity = vars.getStringParameter("inpCity");
-
-      vars.setSessionValue("BusinessPartnerMultiple.initRecordNumber", "0");
-
-      printPageFrame2(response, vars, strKey, strName, strContact, strZIP, strProvincia, strBpartners, strCity);
-    } else if (vars.commandIn("FRAME3")) {
-      printPageFrame3(response, vars);
-    } else if (vars.commandIn("PREVIOUS")) {
-      String strInitRecord = vars.getSessionValue("BusinessPartnerMultiple.initRecordNumber");
-      String strRecordRange = Utility.getContext(this, vars, "#RecordRangeInfo", "BusinessPartnerMultiple");
-      int intRecordRange = strRecordRange.equals("")?0:Integer.parseInt(strRecordRange);
-      if (strInitRecord.equals("") || strInitRecord.equals("0")) vars.setSessionValue("BusinessPartnerMultiple.initRecordNumber", "0");
-      else {
-        int initRecord = (strInitRecord.equals("")?0:Integer.parseInt(strInitRecord));
-        initRecord -= intRecordRange;
-        strInitRecord = ((initRecord<0)?"0":Integer.toString(initRecord));
-        vars.setSessionValue("BusinessPartnerMultiple.initRecordNumber", strInitRecord);
-      }
-
-      request.getRequestDispatcher(request.getServletPath() + "?Command=FRAME2").forward(request, response);
-    } else if (vars.commandIn("NEXT")) {
-      String strInitRecord = vars.getSessionValue("BusinessPartnerMultiple.initRecordNumber");
-      String strRecordRange = Utility.getContext(this, vars, "#RecordRangeInfo", "BusinessPartnerMultiple");
-      int intRecordRange = strRecordRange.equals("")?0:Integer.parseInt(strRecordRange);
-      int initRecord = (strInitRecord.equals("")?0:Integer.parseInt(strInitRecord));
-      if (initRecord==0) initRecord=1;
-      initRecord += intRecordRange;
-      strInitRecord = ((initRecord<0)?"0":Integer.toString(initRecord));
-      vars.setSessionValue("BusinessPartnerMultiple.initRecordNumber", strInitRecord);
-
-      request.getRequestDispatcher(request.getServletPath() + "?Command=FRAME2").forward(request, response);
+      String strNewFilter = vars.getStringParameter("newFilter");
+      String strOffset = vars.getStringParameter("offset");
+      String strPageSize = vars.getStringParameter("page_size");
+      String strSortCols = vars.getStringParameter("sort_cols").toUpperCase();
+      String strSortDirs = vars.getStringParameter("sort_dirs").toUpperCase();
+      printGridData(response, vars, strKey, strName, strContact, strZIP, strProvincia, strBpartners, strCity, strSortCols + " " + strSortDirs, strOffset, strPageSize, strNewFilter);
     } else pageError(response);
   }
 
-  void printPageFS(HttpServletResponse response, VariablesSecureApp vars) throws IOException, ServletException {
-    if (log4j.isDebugEnabled()) log4j.debug("Output: multiple business partners seeker Frame Set");
-    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/BusinessPartnerMultiple_FS").createXmlDocument();
-
-    response.setContentType("text/html; charset=UTF-8");
-    PrintWriter out = response.getWriter();
-    out.println(xmlDocument.print());
-    out.close();
-  }
-
-
-  void printPageFrame1(HttpServletResponse response, VariablesSecureApp vars, String strKeyValue, String strNameValue, String strBpartners) throws IOException, ServletException {
+  void printPage(HttpServletResponse response, VariablesSecureApp vars, String strKeyValue, String strNameValue, String strBpartners) throws IOException, ServletException {
     if (log4j.isDebugEnabled()) log4j.debug("Output: Frame 1 of the multiple business partners seeker");
-    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/BusinessPartnerMultiple_F1").createXmlDocument();
+    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/BusinessPartnerMultiple").createXmlDocument();
     if (strKeyValue.equals("") && strNameValue.equals("")) {
       xmlDocument.setParameter("key", "%");
     } else {
@@ -138,47 +99,144 @@
     out.close();
   }
 
-  void printPageFrame2(HttpServletResponse response, VariablesSecureApp vars, String strKey, String strName, String strContact, String strZIP, String strProvincia, String strBpartners, String strCity) throws IOException, ServletException {
-    if (log4j.isDebugEnabled()) log4j.debug("Output: Frame 2 of the multiple business partners seeker");
-    XmlDocument xmlDocument;
-
-    String strRecordRange = Utility.getContext(this, vars, "#RecordRangeInfo", "BusinessPartnerMultiple");
-    int intRecordRange = (strRecordRange.equals("")?0:Integer.parseInt(strRecordRange));
-    String strInitRecord = vars.getSessionValue("BusinessPartnerMultiple.initRecordNumber");
-    int initRecordNumber = (strInitRecord.equals("")?0:Integer.parseInt(strInitRecord));
-
-    if (strKey.equals("") && strName.equals("") && strContact.equals("") && strZIP.equals("") && strProvincia.equals("") && strCity.equals("")) {
-      String[] discard = {"sectionDetail", "hasPrevious", "hasNext"};
-      xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/BusinessPartnerMultiple_F2", discard).createXmlDocument();
-      xmlDocument.setData("structure1", BusinessPartnerMultipleData.set());
-    } else {
-      String[] discard = {"withoutPrevious", "withoutNext"};
-      BusinessPartnerMultipleData[] data = BusinessPartnerMultipleData.select(this, Utility.getContext(this, vars, "#User_Client", "BusinessPartnerMultiple"), Utility.getContext(this, vars, "#User_Org", "BusinessPartnerMultiple"), strKey, strName, strContact, strZIP, strProvincia, (strBpartners.equals("costumer")?"clients":""), (strBpartners.equals("vendor")?"vendors":""), strCity, initRecordNumber, intRecordRange);
-      if (data==null || initRecordNumber<=1) discard[0] = new String("hasPrevious");
-      if (data==null || data.length==0 || data.length<intRecordRange) discard[1] = new String("hasNext");
-      xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/BusinessPartnerMultiple_F2", discard).createXmlDocument();
+  void printGridStructure(HttpServletResponse response, VariablesSecureApp vars) throws IOException, ServletException {
+    if (log4j.isDebugEnabled()) log4j.debug("Output: print page structure");
+      XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/utility/DataGridStructure").createXmlDocument();
+      
+      SQLReturnObject[] data = getHeaders(vars);
+      String type = "Hidden";
+      String title = "";
+      String description = "";
+          
+      xmlDocument.setParameter("type", type);
+      xmlDocument.setParameter("title", title);
+      xmlDocument.setParameter("description", description);
       xmlDocument.setData("structure1", data);
+      response.setContentType("text/xml; charset=UTF-8");
+      response.setHeader("Cache-Control", "no-cache");
+      PrintWriter out = response.getWriter();
+      if (log4j.isDebugEnabled()) log4j.debug(xmlDocument.print());
+      out.println(xmlDocument.print());
+      out.close();
+  }
+  
+  private SQLReturnObject[] getHeaders(VariablesSecureApp vars) {
+    SQLReturnObject[] data = null;
+    Vector<SQLReturnObject> vAux = new Vector<SQLReturnObject>();   
+    String[] colNames = {"Value", "Name", "SO_CreditAvailable", "SO_CreditUsed", "SalesRep", "Url", "Email", "ActualLifetimeValue", "C_BPartner_ID", "RowKey"};
+    String[] colWidths = {"87", "165", "73", "77", "117", "100", "110", "51", "0", "0"};
+    for(int i=0; i < colNames.length; i++) {
+      SQLReturnObject dataAux = new SQLReturnObject();
+      dataAux.setData("columnname", colNames[i]);
+        dataAux.setData("gridcolumnname", colNames[i]);
+        dataAux.setData("adReferenceId", "AD_Reference_ID");
+        dataAux.setData("adReferenceValueId", "AD_ReferenceValue_ID");        
+        dataAux.setData("isidentifier", (colNames[i].equals("RowKey")?"true":"false"));
+        dataAux.setData("iskey", (colNames[i].equals("RowKey")?"true":"false"));
+        dataAux.setData("isvisible", (colNames[i].endsWith("_ID") || colNames[i].equalsIgnoreCase("RowKey")?"false":"true"));
+        String name = Utility.messageBD(this, "MBPS_" + colNames[i].toUpperCase(), vars.getLanguage());
+        dataAux.setData("name", (name.startsWith("MBPS_")?colNames[i]:name));
+        dataAux.setData("type", "string");
+        dataAux.setData("width", colWidths[i]);
+        vAux.addElement(dataAux);
     }
-    xmlDocument.setParameter("direction", "var baseDirection = \"" + strReplaceWith + "/\";\n");
-    xmlDocument.setParameter("language", "LNG_POR_DEFECTO=\"" + vars.getLanguage() + "\";");
-    xmlDocument.setParameter("theme", vars.getTheme());
-    response.setContentType("text/html; charset=UTF-8");
+    data = new SQLReturnObject[vAux.size()];
+    vAux.copyInto(data);
+    return data;
+  }
+  
+  void printGridData(HttpServletResponse response, VariablesSecureApp vars, String strKey, String strName, String strContact, String strZIP, String strProvincia, String strBpartners, String strCity, String strOrderBy, String strOffset, String strPageSize, String strNewFilter) throws IOException, ServletException {
+    if (log4j.isDebugEnabled()) log4j.debug("Output: print page rows");
+    
+    SQLReturnObject[] headers = getHeaders(vars);
+    FieldProvider[] data = null;
+    String type = "Hidden";
+    String title = "";
+    String description = "";
+    String strNumRows = "0";
+    
+    if (headers!=null) {
+      try{
+      if(strNewFilter.equals("1") || strNewFilter.equals("")) { // New filter or first load
+        data = BusinessPartnerMultipleData.select(this, "1", Utility.getContext(this, vars, "#User_Client", "BusinessPartner"), Utility.getContext(this, vars, "#User_Org", "BusinessPartnerMultiple"), strKey, strName, strContact, strZIP, strProvincia, (strBpartners.equals("costumer")?"clients":""), (strBpartners.equals("vendor")?"vendors":""), strCity, strOrderBy, "", "");
+        strNumRows = String.valueOf(data.length);
+        vars.setSessionValue("BusinessPartnerMultipleInfo.numrows", strNumRows);
+      }
+      else {
+        strNumRows = vars.getSessionValue("BusinessPartnerMultipleInfo.numrows");
+      }
+          
+      // Filtering result
+      if(this.myPool.getRDBMS().equalsIgnoreCase("ORACLE")) {
+        String oraLimit = strOffset + " AND " + String.valueOf(Integer.valueOf(strOffset).intValue() + Integer.valueOf(strPageSize));       
+        data = BusinessPartnerMultipleData.select(this, "ROWNUM", Utility.getContext(this, vars, "#User_Client", "BusinessPartner"), Utility.getContext(this, vars, "#User_Org", "BusinessPartnerMultiple"), strKey, strName, strContact, strZIP, strProvincia, (strBpartners.equals("costumer")?"clients":""), (strBpartners.equals("vendor")?"vendors":""), strCity, strOrderBy, oraLimit, "");
+      }
+      else {
+        String pgLimit = strPageSize + " OFFSET " + strOffset;
+        data = BusinessPartnerMultipleData.select(this, "1", Utility.getContext(this, vars, "#User_Client", "BusinessPartner"), Utility.getContext(this, vars, "#User_Org", "BusinessPartnerMultiple"), strKey, strName, strContact, strZIP, strProvincia, (strBpartners.equals("costumer")?"clients":""), (strBpartners.equals("vendor")?"vendors":""), strCity, strOrderBy, "", pgLimit);
+      }     
+      } catch (ServletException e) {
+        log4j.error("Error in print page data: " + e);
+        e.printStackTrace();
+        OBError myError = Utility.translateError(this, vars, vars.getLanguage(), e.getMessage());
+        if (!myError.isConnectionAvailable()) {
+          bdErrorAjax(response, "Error", "Connection Error", "No database connection");
+          return;
+        } else {
+          type = myError.getType();
+          title = myError.getTitle();
+          if (!myError.getMessage().startsWith("<![CDATA[")) description = "<![CDATA[" + myError.getMessage() + "]]>";
+          else description = myError.getMessage();
+        }
+      } catch (Exception e) { 
+        if (log4j.isDebugEnabled()) log4j.debug("Error obtaining rows data");
+        type = "Error";
+        title = "Error";
+        if (e.getMessage().startsWith("<![CDATA[")) description = "<![CDATA[" + e.getMessage() + "]]>";
+        else description = e.getMessage();
+        e.printStackTrace();
+      }
+    }
+    
+    if (!type.startsWith("<![CDATA[")) type = "<![CDATA[" + type + "]]>";
+    if (!title.startsWith("<![CDATA[")) title = "<![CDATA[" + title + "]]>";
+    if (!description.startsWith("<![CDATA[")) description = "<![CDATA[" + description + "]]>";
+    StringBuffer strRowsData = new StringBuffer();
+    strRowsData.append("<xml-data>\n");
+    strRowsData.append("  <status>\n");
+    strRowsData.append("    <type>").append(type).append("</type>\n");
+    strRowsData.append("    <title>").append(title).append("</title>\n");
+    strRowsData.append("    <description>").append(description).append("</description>\n");
+    strRowsData.append("  </status>\n");
+    strRowsData.append("  <rows numRows=\"").append(strNumRows).append("\">\n");
+    if (data!=null && data.length>0) {
+      for (int j=0;j<data.length;j++) {
+        strRowsData.append("    <tr>\n");
+        for (int k=0;k<headers.length;k++) {
+          strRowsData.append("      <td><![CDATA[");
+          String columnname = headers[k].getField("columnname");          
+                    
+          if ((data[j].getField(columnname)) != null) {
+            if (headers[k].getField("adReferenceId").equals("32")) strRowsData.append(strReplaceWith).append("/images/");
+            strRowsData.append(data[j].getField(columnname).replaceAll("<b>","").replaceAll("<B>","").replaceAll("</b>","").replaceAll("</B>","").replaceAll("<i>","").replaceAll("<I>","").replaceAll("</i>","").replaceAll("</I>","").replaceAll("<p>","&nbsp;").replaceAll("<P>","&nbsp;").replaceAll("<br>","&nbsp;").replaceAll("<BR>","&nbsp;"));
+          } else {
+            if (headers[k].getField("adReferenceId").equals("32")) {
+              strRowsData.append(strReplaceWith).append("/images/blank.gif");
+            } else strRowsData.append("&nbsp;");
+          }
+          strRowsData.append("]]></td>\n");
+        }
+        strRowsData.append("    </tr>\n");
+      }
+    }
+    strRowsData.append("  </rows>\n");
+    strRowsData.append("</xml-data>\n");
+        
+    response.setContentType("text/xml; charset=UTF-8");
+    response.setHeader("Cache-Control", "no-cache");
     PrintWriter out = response.getWriter();
-    out.println(xmlDocument.print());
-    out.close();
-  }
-
-  void printPageFrame3(HttpServletResponse response, VariablesSecureApp vars) throws IOException, ServletException {
-    if (log4j.isDebugEnabled()) log4j.debug("Output: Frame 3 of the multiple business partners seeker");
-    XmlDocument xmlDocument = xmlEngine.readXmlTemplate("org/openbravo/erpCommon/info/BusinessPartnerMultiple_F3").createXmlDocument();
-
-    xmlDocument.setParameter("direction", "var baseDirection = \"" + strReplaceWith + "/\";\n");
-    xmlDocument.setParameter("language", "LNG_POR_DEFECTO=\"" + vars.getLanguage() + "\";");
-    xmlDocument.setParameter("theme", vars.getTheme());
-
-    response.setContentType("text/html; charset=UTF-8");
-    PrintWriter out = response.getWriter();
-    out.println(xmlDocument.print());
+    if (log4j.isDebugEnabled()) log4j.debug(strRowsData.toString());  
+    out.print(strRowsData.toString());
     out.close();
   }
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.xml	Mon Apr 21 19:06:47 2008 +0000
@@ -0,0 +1,34 @@
+<?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="BusinessPartnerMultiple.html"/>
+	<PARAMETER id="paramCheckClient" name="checkClient" default="costumer"/>
+	<PARAMETER id="paramCheckVendor" name="checkVendor" default="vendor"/>
+	<PARAMETER id="paramCheckAll" name="checkAll" default="all"/>
+	<PARAMETER id="paramDirection" name="direction" default=""/>
+	<PARAMETER id="paramLanguage" name="language" default=""/>
+	<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
+	<PARAMETER id="fieldKey" name="key" attribute="value"/>
+	<PARAMETER id="fieldName" name="name" attribute="value"/>
+	<PARAMETER id="fieldClientsSelect" name="clients" boolean="checked" withId="paramCheckClient"/>
+	<PARAMETER id="fieldVendorsSelect" name="vendors" boolean="checked" withId="paramCheckVendor"/>
+	<PARAMETER id="fieldAllSelect" name="all" boolean="checked" withId="paramCheckAll"/>
+	<DISCARD id="discard"/>
+</REPORT>
--- a/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_F1.html	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,217 +0,0 @@
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2007 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<HTML>
-<HEAD>
-<TITLE>Business Partner selector</TITLE>
-<LINK rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"></LINK>
-
-      <script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/dojoConfig.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript"></script>
-
-      <script type="text/javascript">
-        dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
-      </script>
-
-
-  <LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"></LINK> 
-  <SCRIPT language="JavaScript" type="text/javascript" id="paramDirection">var baseDirection = "http://yourSite/web/";</SCRIPT>
-  <SCRIPT language="JavaScript" type="text/javascript" id="paramLanguage">	LNG_POR_DEFECTO = "en_US";</SCRIPT>
-<SCRIPT language="JavaScript" type="text/javascript">
-function depurar() {
-	var frm = document.frmSelector;
-	if ((frm.inpKey.value==null || frm.inpKey.value=="") && (frm.inpName.value==null || frm.inpName.value=="") && (frm.inpContact.value==null || frm.inpContact.value=="") && (frm.inpZIP.value==null || frm.inpZIP.value=="") && (frm.inpPhone.value==null || frm.inpPhone.value=="") && !frm.inpClients.checked) {
-		frm.inpKey.focus();
-		mensaje(7);
-		return false;
-	}
-	return true;
-}
-
-function onloadFunctions(){
-	keyArray[keyArray.length] = new keyArrayItem("B", "submitCommandForm('FIND', false, null, null, 'medio');", null, "ctrlKey");
-}
-</SCRIPT>
-	<SCRIPT language="JavaScript" type="text/javascript">
-	function onLoadDo(){
-		this.windowTables = new Array(
-		  new windowTableId('client', 'superior', 'buttonSearch', 'superior'),
-		  new windowTableId('client', 'medio', 'buttonOK', 'inferior'),
-		  new windowTableId('client', 'inferior', 'buttonOK', 'inferior')
-		);
-		setWindowTableParentElement();
-		enableShortcuts('popup');
-		
-		try {
-		  onloadFunctions();
-		} catch (e) {}
-
-		setWindowElementFocus('firstElement');
-	}
-
-	function onResizeDo(){
-	}
-	</SCRIPT>
-</HEAD>
-<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
-<FORM name="frmSelector" method="POST" action="BusinessPartnerMultiple_F2.html" target="medio">
-  <INPUT type="hidden" name="Command">
-<INPUT type="hidden" name="IsPopUpCall" value="1"></INPUT>
- 
-  
-  <div class="Popup_ContentPane_CircleLogo">
-  <div class="Popup_WindowLogo">
-    <img class="Popup_WindowLogo_Icon Popup_WindowLogo_Icon_businessPartner" src="../../../../../web/images/blank.gif" border=0/></img>
-  </div>
-</div>
-<table cellspacing="0" cellpadding="0" width="100%">
-
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_NavBar">
-        <tr class="Popup_NavBar_bg"><td></td>
-          <td class="Popup_NavBar_separator_cell"></td>
-          <td class="Popup_NavBar_bg_logo_left"></td>
-          <td class="Popup_NavBar_bg_logo" width="1" onclick="abrirNuevoBrowser('http://www.openbravo.com', 'Openbravo');return false;"><IMG src="../../../../../web/images/blank.gif" alt="Openbravo" title="Openbravo" border="0" id="openbravoLogo" class="Popup_NavBar_logo" /></td>
-          <td class="Popup_NavBar_bg_logo_right"></td>
-          <td class="Popup_NavBar_Popup_title_cell"><span>Business Partner Selector</a></td>
-          <td class="Popup_NavBar_separator_cell"></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_SeparatorBar">
-        <tr>
-          <td class="Popup_SeparatorBar_bg"></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-
-
-    <td>
-      <div class="Popup_ContentPane_Client" style="overflow: auto;" id="client">
-        <table cellspacing="0" cellpadding="0" class="Popup_Client_TableSelector">
-
-          <tr>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-          </tr>
-
-          <TR>
-          <TD colspan="6">
-            <TABLE class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
-              <TR class="FieldGroup_TopMargin"></TR>
-              <TR>
-                <TD class="FieldGroupTitle_Left"><IMG class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
-                <TD class="FieldGroupTitle">Primary Filters</TD>
-                <TD class="FieldGroupTitle_Right"><IMG class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
-                <TD class="FieldGroupContent"></TD>
-
-              </TR>
-              <TR class="FieldGroup_BottomMargin"></TR>
-            </TABLE>
-          </TD>
-          </TR>
-
-  
-    <tr>
-      <TD class="TitleCell"><SPAN class="LabelText">Key</SPAN></TD>
-      <TD class="TextBox_ContentCell"><INPUT class="dojoValidateValid TextBox_OneCell_width" type="text" name="inpKey" value="" id="fieldKey"></INPUT></TD>
-      <td></td>
-      <TD class="TitleCell"><SPAN class="LabelText">Name</SPAN></TD>
-      <TD class="TextBox_ContentCell" colspan="2"><INPUT type="text" name="inpName" value="" id="fieldName" class="dojoValidateValid TextBox_TwoCells_width"></INPUT></TD>
-      <td></td>
-    </tr>
-
-    <tr>
-      <TD class="TitleCell"><SPAN class="LabelText">Contact</SPAN></TD>
-      <TD class="TextBox_ContentCell" colspan="2"><INPUT type="text" name="inpContact" class="dojoValidateValid TextBox_TwoCells_width"></INPUT></TD>
-
-      <TD class="TitleCell"><SPAN class="LabelText">City</SPAN></TD>
-      <TD class="TextBox_ContentCell" colspan="2"> <INPUT type="text" name="inpCity" class="dojoValidateValid TextBox_TwoCells_width"></INPUT></TD>
-    </tr>
-    
-    <tr>
-      <TD class="TitleCell"><SPAN class="LabelText">Postal Code</SPAN></TD>
-      <TD class="TextBox_ContentCell"><INPUT class="dojoValidateValid TextBox_OneCell_width" type="text" name="inpZIP"></INPUT></TD>
-
-      <td></td>
-
-      <TD class="TitleCell"><SPAN class="LabelText">Region</SPAN></TD>
-      <TD class="TextBox_ContentCell" colspan="2"><INPUT type="text" name="inpProvincia" class="dojoValidateValid TextBox_TwoCells_width"></INPUT> </TD>
-    </tr>
-      
-    <tr> 
-     <TD class="TitleCell"><SPAN class="LabelText">Customer</SPAN></TD>
-     <TD class="Radio_Check_ContentCell"><SPAN class="Radio_container_NOT_Focused"><INPUT type="radio" name="inpBpartner" value="costumer" id="fieldClientsSelect"></INPUT></SPAN></TD>
-
-     <TD class="TitleCell"><SPAN class="LabelText">Providers</SPAN></TD>
-     <TD class="Radio_Check_ContentCell"><SPAN class="Radio_container_NOT_Focused"><INPUT type="radio" name="inpBpartner" value="vendor" id="fieldVendorsSelect"></INPUT></SPAN></TD>
-
-     <TD class="TitleCell"><SPAN class="LabelText">All</SPAN></TD>
-     <TD class="Radio_Check_ContentCell"><SPAN class="Radio_container_NOT_Focused"><INPUT type="radio" name="inpBpartner" value="all" id="fieldAllSelect"></INPUT></SPAN></TD>
-    </tr>
-
-    <tr>
-      <td></td>
-      <td class="Button_LeftAlign_ContentCell">
-        <div>
-          <a class="ButtonLink" href="#"
-            onfocus="setWindowElementFocus(this); window.status='Search'; return true;"
-            onblur="window.status=''; return true;"
-            onkeypress="this.className='ButtonLink_active'; return true;"
-            onkeyup="this.className='ButtonLink_focus'; return true;"
-            onclick="submitCommandForm('FIND', true);return false;"
-            id="buttonSearch">
-            <table class="Button"
-              onmousedown="this.className='Button_active'; return true;"
-              onmouseup="this.className='Button'; return true;"
-              onmouseover="this.className='Button_hover'; window.status='Search'; return true;"
-              onmouseout="this.className='Button'; window.status=''; 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></td>
-      <td></td>
-      <td></td>
-      <td></td>
-  </tr>
-</table>
- 
-  
-</FORM>
-</BODY>
-</HTML>
--- a/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_F1.xml	Mon Apr 21 19:03:40 2008 +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="BusinessPartnerMultiple_F1.html"/>
-	<PARAMETER id="paramCheckClient" name="checkClient" default="costumer"/>
-	<PARAMETER id="paramCheckVendor" name="checkVendor" default="vendor"/>
-	<PARAMETER id="paramCheckAll" name="checkAll" default="all"/>
-	<PARAMETER id="paramDirection" name="direction" default=""/>
-	<PARAMETER id="paramLanguage" name="language" default=""/>
-	<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
-	<PARAMETER id="fieldKey" name="key" attribute="value"/>
-	<PARAMETER id="fieldName" name="name" attribute="value"/>
-	<PARAMETER id="fieldClientsSelect" name="clients" boolean="checked" withId="paramCheckClient"/>
-	<PARAMETER id="fieldVendorsSelect" name="vendors" boolean="checked" withId="paramCheckVendor"/>
-	<PARAMETER id="fieldAllSelect" name="all" boolean="checked" withId="paramCheckAll"/>
-	<DISCARD id="discard"/>
-</REPORT>
--- a/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_F2.html	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2007 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-
-<html>
-<head>
-  <title>Business Partner list</title>
-
-  <link rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"></link>
-  <link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"></link>
-  <script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
-  <script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
-  <script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
-  <script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
-  <script language="JavaScript" src="../../../../../web/js/dojoConfig.js" type="text/javascript"></script>
-  <script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript"></script>
-  <script language="JavaScript" type="text/javascript" id="paramDirection">var baseDirection = "../../../../../web/";</script>
-  <script language="JavaScript" type="text/javascript" id="paramLanguage">  LNG_POR_DEFECTO = "en_US";</script>
-  <script type="text/javascript">
-    dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
-  </script>
-  <script language="JavaScript" type="text/javascript">
-    var selectedRow = "";
-    function selectActual(obj) {
-      if (selectedRow != "") {
-        selectedRow.className = selectedRow.className.replace(' DataGrid_Body_Row_selected', '');
-      }
-      selectedRow = obj;
-      selectedRow.className += " DataGrid_Body_Row_selected";
-    }
-
-    function checkActual(obj) {
-      selectedCheck = selectedRow.id.toString().replace('funcEvenOddRow', 'CheckNum');
-      document.getElementById(selectedCheck).checked = !document.getElementById(selectedCheck).checked;
-    }
-
-    function HoverCell(cell) {
-      cell.className = cell.className + ' DataGrid_Body_Cell_hover';
-    }
-
-    function unHoverCell(cell) {
-      cell.className = cell.className.replace(' DataGrid_Body_Cell_hover', '');
-    }
-  </script>
-	<SCRIPT language="JavaScript" type="text/javascript">
-	function onLoadDo(){
-		this.windowTables = new Array(
-		  new windowTableId('client', 'superior', 'buttonSearch', 'superior'),
-		  new windowTableId('client', 'medio', 'buttonOK', 'inferior'),
-		  new windowTableId('client', 'inferior', 'buttonOK', 'inferior')
-		);
-		setWindowTableParentElement();
-		enableShortcuts('popup');
-		
-		resizeArea();
-	}
-
-	function onResizeDo(){
-		resizeArea();
-	}
-	</SCRIPT>
-</HEAD>
-
-<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
-<form name="frmSelector" method="POST" action="">
-<INPUT type="hidden" name="IsPopUpCall" value="1">
-  <table height="100%" border="0" cellpadding="0" cellspacing="0" id="main">
-    <tr>
-      <td valign="top" class="Popup_Client_Selector_DataGrid_LeftMargin">
-        <table width="100%" border="0" cellspacing="0" cellpadding="0" id="tdleftSeparator">
-          <tr><td class="Popup_Client_Selector_DataGrid_LeftMargin"></td></tr>
-        </table>
-      </td>
-      <td valign="top">
-
-        <div style="overflow: auto; display: none;" id="client">
-
-          <table cellspacing="0" cellpadding="0" width="100%" class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;">
-            <tr class="DataGrid_Body_Row"> 
-              <th width="4%"  class="DataGrid_Header_LineNoCell DataGrid_Body_Cell_CheckBox">
-                <input class="DataGrid_CheckBox" type="checkbox" name="inpTodos" value="Y" onclick="marcarTodos(document.frmSelector.inpClave, this.checked);return true;"></input>
-              </th>
-              <th width="10%" class="DataGrid_Header_Cell">Key</th>
-              <th width="19%" class="DataGrid_Header_Cell">Name</th>
-              <th width="8%"  class="DataGrid_Header_Cell">Disp. Credit</th>
-              <th width="9%"  class="DataGrid_Header_Cell">Credit used</th>
-              <th width="17%" class="DataGrid_Header_Cell">Sales represent</th>
-              <th width="13%" class="DataGrid_Header_Cell">URL</th>
-              <th width="14%" class="DataGrid_Header_Cell">Email</th>
-              <th width="7%"  class="DataGrid_Header_Cell">Income</th>
-            </tr>
-
-            <div id="sectionDetail"> 
-              <tr class="DataGrid_Body_Row DataGrid_Body_Row_yy" onclick="selectActual(this); return true;" ondblclick="checkActual(this); return true;" id="funcEvenOddRowxx">
-                <td class="DataGrid_Body_LineNoCell DataGrid_Body_Cell_CheckBox">
-                  <input name="inpClave" type="checkbox" id="CheckNumxx" value="xx">
-                  <INPUT name="inpTextxx" type="hidden" id="fieldText" value="xx">
-                </td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldClaveTD">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldNombreTD">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldCreditoDispTD">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldCreditoUsadoTD">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldContactoTD">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldURLTD">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldEMAILTD">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldIngresosTD">xx</td>
-              </tr>
-            </div>
-          </table>
-
-          <table cellspacing="0" cellpadding="0" width="100%" style="text-align:-moz-center;_text-align:center;border-collapse:collapse;">
-            <td align=left width=50% style="padding-left: 7px;">
-              <table cellspacing="0" cellpadding="0" id="hasPrevious">
-                <td class="Main_ToolBar_textlabel_bg_left">
-                  <a href="#"
-                  onClick="submitCommandForm('PREVIOUS', false, parent.superior.document.forms[0], 'BusinessPartnerMultiple_F2.html', null, null, false);return false;" class="Main_ToolBar_Button" onMouseOver="window.status='Reference';return true;" onMouseOut="window.status='';return true;" onclick="this.hideFocus=true" onblur="this.hideFocus=false" id="linkButtonRelatedInfo"><img class="Main_ToolBar_Button_Icon Main_ToolBar_Button_Icon_Previous" src="../../../../../web/images/blank.gif" title="Reference" border="0" id="buttonRelatedInfo"></a>
-                </td>
-                <td class="Main_ToolBar_textlabel_bg_body" width=65px align="center"><a href="#" 
-                  onClick="submitCommandForm('PREVIOUS', false, parent.superior.document.forms[0], 'BusinessPartnerMultiple_F2.html', null, null, false);return false;" class="Main_ToolBar_text_relatedinfo">Previous</a></td>
-                <td width="1"><img src="../../../../../web/images/blank.gif" class="Main_ToolBar_textlabel_bg_right" border="0"></img></td>
-              </table>
-              <span id="withoutPrevious"></span>
-            </td>
-            <td align=right width=50% style="padding-right: 7px;">
-              <table cellspacing="0" cellpadding="0" id="hasNext">
-                <td width="1"><img src="../../../../../web/images/blank.gif" class="Main_ToolBar_textlabel_bg_left" border="0"></img></td>
-                <td class="Main_ToolBar_textlabel_bg_body" width=65px align=center><a href="#" 
-                   onClick="submitCommandForm('NEXT', false, parent.superior.document.forms[0], 'BusinessPartnerMultiple_F2.html', null, null, false);return false;" class="Main_ToolBar_text_relatedinfo">Next</a></td>
-                <td class="Main_ToolBar_textlabel_bg_right">
-                  <a href="#" 
-                   onClick="submitCommandForm('NEXT', false, parent.superior.document.forms[0], 'BusinessPartnerMultiple_F2.html', null, null, false);return false;" class="Main_ToolBar_Button" onMouseOver="window.status='Reference';return true;" onMouseOut="window.status='';return true;" onclick="this.hideFocus=true" onblur="this.hideFocus=false" id="linkButtonRelatedInfo"><img class="Main_ToolBar_Button_Icon Main_ToolBar_Button_Icon_Next" src="../../../../../web/images/blank.gif" title="Reference" border="0" id="buttonRelatedInfo"></a>
-                </td>
-              </table>
-              <span id="withoutNext"></span>
-            </td>
-          </table>
-
-        </div>
-
-      </td>
-
-      <td valign="top" class="Popup_Client_Selector_DataGrid_RightMargin">
-        <table width="100%" border="0" cellspacing="0" cellpadding="0" id="tdrightSeparator">
-          <tr><td class="Popup_Client_Selector_DataGrid_RightMargin"></td></tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-
-</form>
-</body>
-</html>
--- a/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_F2.xml	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +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-2007 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<REPORT>
-  <template file="BusinessPartnerMultiple_F2.html"/>
-  <PARAMETER id="paramDirection" name="direction" default=""/>
-	<PARAMETER id="paramLanguage" name="language" default=""/>
-	<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
-  <PARAMETER id="param2" name="param2" default="2"/>
-  <structure name="structure1">
-    <FIELD id="fieldRownum">position</FIELD>
-    <FUNCTION id="funcEvenOddRowxx" name="MODULE" arg1="fieldRownum" arg2="param2" format="integerEdition" attribute="class" replace="yy"/>
-
-    <FIELD id="funcEvenOddRowxx" attribute="id" replace="xx">position</FIELD>
-
-    <FIELD id="CheckNumxx" attribute="id" replace="xx">position</FIELD>
-    <FIELD id="CheckNumxx" attribute="value">cBpartnerId</FIELD>
-    <FIELD id="fieldText" attribute="name" replace="xx">cBpartnerId</FIELD>
-    <FIELD id="fieldText" attribute="value" replaceCharacters="html">nameHidden</FIELD>
-    <FIELD id="fieldClaveTD">value</FIELD>
-    <FIELD id="fieldNombreTD">name</FIELD>
-    <FIELD id="fieldCreditoDispTD" format="euroEdition">soCreditavailable</FIELD>
-    <FIELD id="fieldCreditoUsadoTD" format="euroEdition">soCreditused</FIELD>
-    <FIELD id="fieldContactoTD">salesrep</FIELD>
-    <FIELD id="fieldURLTD">url</FIELD>
-    <FIELD id="fieldEMAILTD">email</FIELD>
-    <FIELD id="fieldIngresosTD" format="euroEdition">actuallifetimevalue</FIELD>
-    <SECTION id="sectionDetail"/>
-  </structure>
-  <DISCARD id="discard"/>
-</REPORT>
--- a/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_F3.html	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2007 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<HTML>
-<HEAD>
-<TITLE>Business Partner selector</TITLE>
-<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"> 
-      <LINK rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"></LINK>
-      <script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/dojoConfig.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript"></script>
-      <SCRIPT language="JavaScript" type="text/javascript" id="paramDirection">var baseDirection = "../../../../../web/";</SCRIPT>
-      <script language="JavaScript" type="text/javascript" id="paramLanguage">var LNG_POR_DEFECTO = "en_US";</script>
-      <SCRIPT language="JavaScript" src="../../../../../web/js/searchs.js" type="text/javascript"></SCRIPT>
-      <SCRIPT language="JavaScript" type="text/javascript">
-function depurarSelector(action) {
-  var data = new Array();
-  var frm = parent.medio.document.frmSelector;
-  parent.medio.generarArrayChecks(frm, frm.inpClave, "inpText", data);
-  parent.opener.closeMultiSearch(action, data);
-}
-</SCRIPT>
-	<SCRIPT language="JavaScript" type="text/javascript">
-	function onLoadDo(){
-		this.windowTables = new Array(
-		  new windowTableId('client', 'superior', 'buttonSearch', 'superior'),
-		  new windowTableId('client', 'medio', 'buttonOK', 'inferior'),
-		  new windowTableId('client', 'inferior', 'buttonOK', 'inferior')
-		);
-		setWindowTableParentElement();
-		enableShortcuts('popup');
-	}
-
-	function onResizeDo(){
-	}
-	</SCRIPT>
-</HEAD>
-<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
-
-
-<table cellspacing="0" cellpadding="0" width="100%" style="height:100%; vertical-align:middle;">
-  <tr>
-    <td>
-      <div class="Popup_ContentPane_Client" style="overflow: auto;" id="client">
-        <table cellspacing="0" cellpadding="0" class="Popup_Client_TableSelector">
-
-          <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></td>
-            <td></td>
-            <td class="Button_RightAlign_ContentCell">
-              <div>
-                <a class="ButtonLink" href="#"
-                  onfocus="setWindowElementFocus(this); window.status='OK'; return true;"
-                  onblur="window.status=''; return true;"
-                  onkeypress="this.className='ButtonLink_active'; return true;"
-                  onkeyup="this.className='ButtonLink_focus'; return true;"
-                  onclick="depurarSelector('SAVE');return false;"
-                  id="buttonOK">
-                  <table class="Button"
-                    onmousedown="this.className='Button_active'; return true;"
-                    onmouseup="this.className='Button'; return true;"
-                    onmouseover="this.className='Button_hover'; window.status='OK'; return true;"
-                    onmouseout="this.className='Button'; window.status=''; return true;">
-                    <tr>
-                      <td class="Button_left"><img class="Button_Icon Button_Icon_ok" alt="OK" title="OK" src="../../../../../web/images/blank.gif" border=0/></td>
-                      <td class="Button_text Button_width">OK</td>
-                      <td class="Button_right"></td>
-                    </tr>
-                  </table>
-                </a>
-              </div>
-            </td>
-            <td class="Button_LeftAlign_ContentCell">
-              <div>
-                <a class="ButtonLink" href="#"
-                  onfocus="setWindowElementFocus(this); window.status='Cancel'; return true;"
-                  onblur="window.status=''; return true;"
-                  onkeypress="this.className='ButtonLink_active'; return true;"
-                  onkeyup="this.className='ButtonLink_focus'; return true;"
-                  onclick="depurarSelector('CLEAR');return false;">
-                  <table class="Button"
-                    onmousedown="this.className='Button_active'; return true;"
-                    onmouseup="this.className='Button'; return true;"
-                    onmouseover="this.className='Button_hover'; window.status='Cancel'; return true;"
-                    onmouseout="this.className='Button'; window.status=''; return true;">
-                    <tr>
-                      <td class="Button_left"><img class="Button_Icon Button_Icon_cancel" alt="Cancel" title="Cancel" src="../../../../../web/images/blank.gif" border=0/></td>
-                      <td class="Button_text Button_width">Cancel</td>
-                      <td class="Button_right"></td>
-                    </tr>
-                  </table>
-                </a>
-              </div>
-            </td>
-            <td></td>
-            <td></td>
-          </tr>
-        </table>
-      </div>
-    </td>
-  </tr>
-</table>
-</HTML>
-
--- a/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_F3.xml	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<REPORT>
-	<template file="BusinessPartnerMultiple_F3.html"/>
-	<PARAMETER id="paramDirection" name="direction" default=""/>
-	<PARAMETER id="paramLanguage" name="language" default=""/>
-	<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
-	<DISCARD id="discard"/>
-</REPORT>
--- a/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_FS.html	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8"></META>
-<TITLE>Business Partner selector</TITLE>
-<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"></LINK></HEAD>
-<FRAMESET rows="235px,*,60px" frameborder="NO" border="0" framespacing="0" cols="*">
-<FRAME name="superior" id="paramFrameSuperior" scrolling="NO" noresize="" src="BusinessPartnerMultiple_F1.html?Command=FRAME1"></FRAME>
-<FRAME name="medio" scrolling="NO" noresize="" src="BusinessPartnerMultiple_F2.html?Command=FRAME2"></FRAME>
-<FRAME name="inferior" scrolling="NO" noresize="" src="BusinessPartnerMultiple_F3.html?Command=FRAME3"></FRAME></FRAMESET>
-</HTML>
--- a/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_FS.xml	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<REPORT>
-	<template file="BusinessPartnerMultiple_FS.html"/>
-</REPORT>
--- a/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_data.xsql	Mon Apr 21 19:03:40 2008 +0000
+++ b/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple_data.xsql	Mon Apr 21 19:06:47 2008 +0000
@@ -27,24 +27,27 @@
    <SqlMethod name="select" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql> <![CDATA[
-        SELECT bp.C_BPartner_ID, bp.VALUE, bp.NAME as name, replace(bp.NAME, '''', CHR(92) || '''') as name_hidden, 
-        (bp.SO_CreditLimit-bp.SO_CreditUsed) AS SO_CreditAvailable, bp.SO_CreditUsed, 
-        bp.ActualLifetimeValue, bp.URL, MAX(s.EMAIL) AS EMAIL, MAX(s.NAME) as SALESREP
-        FROM C_BPARTNER_LOCATION l left join AD_USER c on l.C_BPartner_Location_ID = c.C_BPartner_Location_ID
-                                   left join C_LOCATION a on l.C_Location_ID=a.C_Location_ID
-                                   left join C_REGION on a.C_REGION_ID = C_REGION.C_REGION_ID,
-             C_BPARTNER bp left join  AD_USER s on bp.SALESREP_ID = s.AD_USER_ID
-        WHERE bp.C_BPARTNER_ID = l.C_BPartner_ID
-        AND COALESCE(c.IsActive, 'Y')='Y' 
-        AND bp.IsSummary='N' 
-        AND bp.AD_Client_ID IN ('1') 
-        AND bp.AD_Org_ID IN ('1') 
-        AND COALESCE(l.IsActive, 'Y')='Y'
-        GROUP BY bp.C_BPartner_ID, bp.VALUE, bp.NAME, bp.SO_CreditLimit, bp.SO_CreditUsed, bp.ActualLifetimeValue, 
-        bp.URL
-        ORDER BY bp.NAME
+      	SELECT * FROM ( SELECT '0' AS RN1, A.* FROM (
+	        SELECT bp.C_BPartner_ID, bp.VALUE, bp.NAME as name, replace(bp.NAME, '''', CHR(92) || '''') as name_hidden, 
+	        (bp.SO_CreditLimit-bp.SO_CreditUsed) AS SO_CreditAvailable, bp.SO_CreditUsed, 
+	        bp.ActualLifetimeValue, bp.URL, MAX(s.EMAIL) AS EMAIL, MAX(s.NAME) as SALESREP, bp.C_BPartner_ID || '#' || bp.NAME AS RowKey
+	        FROM C_BPARTNER_LOCATION l left join AD_USER c on l.C_BPartner_Location_ID = c.C_BPartner_Location_ID
+	                                   left join C_LOCATION a on l.C_Location_ID=a.C_Location_ID
+	                                   left join C_REGION on a.C_REGION_ID = C_REGION.C_REGION_ID,
+	             C_BPARTNER bp left join  AD_USER s on bp.SALESREP_ID = s.AD_USER_ID
+	        WHERE bp.C_BPARTNER_ID = l.C_BPartner_ID
+	        AND COALESCE(c.IsActive, 'Y')='Y' 
+	        AND bp.IsSummary='N' 
+	        AND bp.AD_Client_ID IN ('1') 
+	        AND bp.AD_Org_ID IN ('1') 
+	        AND COALESCE(l.IsActive, 'Y')='Y'
+	        GROUP BY bp.C_BPartner_ID, bp.VALUE, bp.NAME, bp.SO_CreditLimit, bp.SO_CreditUsed, bp.ActualLifetimeValue, bp.URL
+	        ORDER BY bp.NAME
+	    	) A ) B
+		WHERE 1=1
       ]]></Sql>
         <Field name="position" value="count"/>
+        <Parameter name="rownum" type="replace" optional="true" after="FROM ( SELECT " text="'0'" />
         <Parameter name="adUserClient" type="replace" optional="true" after="bp.AD_Client_ID IN (" text="'1'"/>
         <Parameter name="adUserOrg" type="replace" optional="true" after="bp.AD_Org_ID IN (" text="'1'"/>
         <Parameter name="key" optional="true" after="AND COALESCE(l.IsActive, 'Y')='Y'"><![CDATA[AND UPPER(bp.Value) LIKE UPPER(?) ]]></Parameter>
@@ -55,6 +58,9 @@
         <Parameter name="clients" optional="true" type="none" after="AND COALESCE(l.IsActive, 'Y')='Y'"><![CDATA[AND ISCUSTOMER = 'Y' ]]></Parameter>
         <Parameter name="vendors" optional="true" type="none" after="AND COALESCE(l.IsActive, 'Y')='Y'"><![CDATA[AND ISVENDOR ='Y']]></Parameter>
         <Parameter name="ciudad" optional="true" after="AND COALESCE(l.IsActive, 'Y')='Y'"><![CDATA[AND UPPER(a.City) LIKE UPPER(?) ]]></Parameter>
+        <Parameter name="orderBy" type="replace" optional="true" after="ORDER BY " text="bp.NAME" />
+        <Parameter name="oraLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[AND RN1 BETWEEN ]]></Parameter>
+        <Parameter name="pgLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[LIMIT ]]></Parameter>
    </SqlMethod>
    <SqlMethod name="set" type="constant" return="multiple">
       <SqlMethodComment></SqlMethodComment>
--- a/src/org/openbravo/erpCommon/info/BusinessPartner_F1.html	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,217 +0,0 @@
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2007 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<HTML>
-<HEAD>
-<TITLE>Business Partner selector</TITLE>
-
-<LINK rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"></LINK>
-
-      <script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/dojoConfig.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript"></script>
-
-      <script type="text/javascript">
-        dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
-      </script>
-
-
-  <LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"></LINK> 
-  <SCRIPT language="JavaScript" type="text/javascript" id="paramDirection">var baseDirection = "http://yourSite/web/";</SCRIPT>
-  <SCRIPT language="JavaScript" type="text/javascript" id="paramLanguage">	LNG_POR_DEFECTO = "en_US";</SCRIPT>
-
-<SCRIPT language="JavaScript" type="text/javascript">
-function depurar() {
-	var frm = document.frmSelector;
-	if ((frm.inpKey.value==null || frm.inpKey.value=="") && (frm.inpName.value==null || frm.inpName.value=="") && (frm.inpContact.value==null || frm.inpContact.value=="") && (frm.inpZIP.value==null || frm.inpZIP.value=="") && (frm.inpPhone.value==null || frm.inpPhone.value=="") && !frm.inpClients.checked) {
-		frm.inpKey.focus();
-		mensaje(7);
-		return false;
-	}
-	return true;
-}
-
-function onloadFunctions(){
-	keyArray[keyArray.length] = new keyArrayItem("B", "submitCommandForm('FIND', false, null, null, 'medio');", null, "ctrlKey");
-}
-</SCRIPT>
-	<SCRIPT language="JavaScript" type="text/javascript">
-	function onLoadDo(){
-		this.windowTables = new Array(
-		  new windowTableId('client', 'superior', 'buttonSearch', 'superior'),
-		  new windowTableId('client', 'medio', 'buttonOK', 'inferior'),
-		  new windowTableId('client', 'inferior', 'buttonOK', 'inferior')
-		);
-		setWindowTableParentElement();
-		enableShortcuts('popup');
-		
-		try {
-		  onloadFunctions();
-		} catch (e) {}
-
-		setWindowElementFocus('firstElement');
-	}
-
-	function onResizeDo(){
-	}
-	</SCRIPT>
-</HEAD>
-
-
-<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
-<FORM name="frmSelector" method="POST" action="BusinessPartner_F2.html" target="medio">
-  <INPUT type="hidden" name="Command">
-<INPUT type="hidden" name="IsPopUpCall" value="1"></INPUT>
-<div class="Popup_ContentPane_CircleLogo">
-  <div class="Popup_WindowLogo">
-    <img class="Popup_WindowLogo_Icon Popup_WindowLogo_Icon_businessPartner" src="../../../../../web/images/blank.gif" border=0/></img>
-  </div>
-</div>
-<table cellspacing="0" cellpadding="0" width="100%">
-
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_NavBar">
-        <tr class="Popup_NavBar_bg"><td></td>
-          <td class="Popup_NavBar_separator_cell"></td>
-          <td class="Popup_NavBar_bg_logo_left"></td>
-          <td class="Popup_NavBar_bg_logo" width="1" onclick="abrirNuevoBrowser('http://www.openbravo.com', 'Openbravo');return false;"><IMG src="../../../../../web/images/blank.gif" alt="Openbravo" title="Openbravo" border="0" id="openbravoLogo" class="Popup_NavBar_logo" /></td>
-          <td class="Popup_NavBar_bg_logo_right"></td>
-          <td class="Popup_NavBar_Popup_title_cell"><span>Business Partner selector</a></td>
-          <td class="Popup_NavBar_separator_cell"></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td>
-      <table cellspacing="0" cellpadding="0" class="Popup_ContentPane_SeparatorBar">
-        <tr>
-          <td class="Popup_SeparatorBar_bg"></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-
-
-    <td>
-      <div class="Popup_ContentPane_Client" style="overflow: auto;" id="client">
-        <table cellspacing="0" cellpadding="0" class="Popup_Client_TableSelector">
-
-          <tr>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-            <td class="TableEdition_OneCell_width"></td>
-          </tr>
-
-          <TR>
-          <TD colspan="6">
-            <TABLE class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
-              <TR class="FieldGroup_TopMargin"></TR>
-              <TR>
-                <TD class="FieldGroupTitle_Left"><IMG class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
-                <TD class="FieldGroupTitle">Primary Filters</TD>
-                <TD class="FieldGroupTitle_Right"><IMG class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"></IMG></TD>
-                <TD class="FieldGroupContent"></TD>
-
-              </TR>
-              <TR class="FieldGroup_BottomMargin"></TR>
-            </TABLE>
-          </TD>
-          </TR>
-
-  
-    <tr>
-      <TD class="TitleCell"><SPAN class="LabelText">Key</SPAN></TD>
-      <TD class="TextBox_ContentCell"><INPUT class="dojoValidateValid TextBox_OneCell_width" type="text" name="inpKey" value="" id="fieldKey"></INPUT></TD>
-      <td></td>
-      <TD class="TitleCell"><SPAN class="LabelText">Name</SPAN></TD>
-      <TD class="TextBox_ContentCell" colspan="2"><INPUT type="text" name="inpName" value="" id="fieldName" class="dojoValidateValid TextBox_TwoCells_width"></INPUT></TD>
-      <td></td>
-    </tr>
-
-    <tr>
-      <TD class="TitleCell"><SPAN class="LabelText">Contact</SPAN></TD>
-      <TD class="TextBox_ContentCell" colspan="2"><INPUT type="text" name="inpContact" class="dojoValidateValid TextBox_TwoCells_width"></INPUT></TD>
-
-      <TD class="TitleCell"><SPAN class="LabelText">City</SPAN></TD>
-      <TD class="TextBox_ContentCell" colspan="2"> <INPUT type="text" name="inpCity" class="dojoValidateValid TextBox_TwoCells_width"></INPUT></TD>
-    </tr>
-    
-    <tr>
-      <TD class="TitleCell"><SPAN class="LabelText">Postal Code</SPAN></TD>
-      <TD class="TextBox_ContentCell"><INPUT class="dojoValidateValid TextBox_OneCell_width" type="text" name="inpZIP"></INPUT></TD>
-
-      <td></td>
-
-      <TD class="TitleCell"><SPAN class="LabelText">Region</SPAN></TD>
-      <TD class="TextBox_ContentCell" colspan="2"><INPUT type="text" name="inpProvincia" class="dojoValidateValid TextBox_TwoCells_width"></INPUT> </TD>
-    </tr>
-      
-    <tr> 
-     <TD class="TitleCell"><SPAN class="LabelText">Customer</SPAN></TD>
-     <TD class="Radio_Check_ContentCell"><SPAN class="Radio_container_NOT_Focused"><INPUT type="radio" name="inpBpartner" value="costumer" id="fieldClientsSelect"></INPUT></SPAN></TD>
-
-     <TD class="TitleCell"><SPAN class="LabelText">Providers</SPAN></TD>
-     <TD class="Radio_Check_ContentCell"><SPAN class="Radio_container_NOT_Focused"><INPUT type="radio" name="inpBpartner" value="vendor" id="fieldVendorsSelect"></INPUT></SPAN></TD>
-
-     <TD class="TitleCell"><SPAN class="LabelText">All</SPAN></TD>
-     <TD class="Radio_Check_ContentCell"><SPAN class="Radio_container_NOT_Focused"><INPUT type="radio" name="inpBpartner" value="all" id="fieldAllSelect"></INPUT></SPAN></TD>
-    </tr>
-
-    <tr>
-      <td></td>
-      <td class="Button_LeftAlign_ContentCell">
-        <div>
-          <a class="ButtonLink" href="#"
-            onfocus="setWindowElementFocus(this); window.status='Search'; return true;"
-            onblur="window.status=''; return true;"
-            onkeypress="this.className='ButtonLink_active'; return true;"
-            onkeyup="this.className='ButtonLink_focus'; return true;"
-            onclick="submitCommandForm('FIND', true);return false;"
-            id="buttonSearch">
-            <table class="Button"
-              onmousedown="this.className='Button_active'; return true;"
-              onmouseup="this.className='Button'; return true;"
-              onmouseover="this.className='Button_hover'; window.status='Search'; return true;"
-              onmouseout="this.className='Button'; window.status=''; 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></td>
-      <td></td>
-      <td></td>
-      <td></td>
-  </tr>
-</table>
-</FORM>
-</BODY>
-</HTML>
--- a/src/org/openbravo/erpCommon/info/BusinessPartner_F1.xml	Mon Apr 21 19:03:40 2008 +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="BusinessPartner_F1.html"/>
-	<PARAMETER id="paramCheckClient" name="checkClient" default="costumer"/>
-	<PARAMETER id="paramCheckVendor" name="checkVendor" default="vendor"/>
-	<PARAMETER id="paramCheckAll" name="checkAll" default="all"/>
-	<PARAMETER id="paramDirection" name="direction" default=""/>
-	<PARAMETER id="paramLanguage" name="language" default=""/>
-	<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
-	<PARAMETER id="fieldKey" name="key" attribute="value"/>
-	<PARAMETER id="fieldName" name="name" attribute="value"/>
-	<PARAMETER id="fieldClientsSelect" name="clients" boolean="checked" withId="paramCheckClient"/>
-	<PARAMETER id="fieldVendorsSelect" name="vendors" boolean="checked" withId="paramCheckVendor"/>
-	<PARAMETER id="fieldAllSelect" name="all" boolean="checked" withId="paramCheckAll"/>
-	<DISCARD id="discard"/>
-</REPORT>
--- a/src/org/openbravo/erpCommon/info/BusinessPartner_F2.html	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,175 +0,0 @@
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2007 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-
-<html>
-<head>
-  <title>Business Partner list</title>
-
-  <link rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"></link>
-  <link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"></link>
-  <script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
-  <script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
-  <script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
-  <script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
-  <script language="JavaScript" src="../../../../../web/js/dojoConfig.js" type="text/javascript"></script>
-  <script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript"></script>
-  <script language="JavaScript" type="text/javascript" id="paramDirection">var baseDirection = "../../../../../web/";</script>
-  <script language="JavaScript" type="text/javascript" id="paramLanguage">  LNG_POR_DEFECTO = "en_US";</script>
-  <script type="text/javascript">
-    dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
-  </script>
-  <script language="JavaScript" type="text/javascript">
-    function loadData(text, location, contact, position) {
-      document.frmSelector.inpLastKeySelected.value = position;
-      document.frmSelector.inpTexto.value=text;
-      document.frmSelector.inpLocation.value=location;
-      document.frmSelector.inpContact.value=contact;
-      return true;
-    }
-
-    var selectedRow = "";
-    function selectActual(obj) {
-      if (selectedRow != "") {
-        selectedRow.className = selectedRow.className.replace(' DataGrid_Body_Row_selected', '');
-      }
-      selectedRow = obj;
-      selectedRow.className += " DataGrid_Body_Row_selected";
-      selectedCheck = selectedRow.id.toString().replace('funcEvenOddRow', 'CheckNum');
-      document.getElementById(selectedCheck).checked = true;
-    }
-
-    function HoverCell(cell) {
-      cell.className = cell.className + ' DataGrid_Body_Cell_hover';
-    }
-
-    function unHoverCell(cell) {
-      cell.className = cell.className.replace(' DataGrid_Body_Cell_hover', '');
-    }
-  </script>
-	<SCRIPT language="JavaScript" type="text/javascript">
-	function onLoadDo(){
-		this.windowTables = new Array(
-		  new windowTableId('client', 'superior', 'buttonSearch', 'superior'),
-		  new windowTableId('client', 'medio', 'buttonOK', 'inferior'),
-		  new windowTableId('client', 'inferior', 'buttonOK', 'inferior')
-		);
-		setWindowTableParentElement();
-		enableShortcuts('popup');
-		
-		resizeArea();
-	}
-
-	function onResizeDo(){
-		resizeArea();
-	}
-	</SCRIPT>
-</HEAD>
-
-<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
-<form name="frmSelector" method="POST" action="">
-  <INPUT type="hidden" name="Command">
-  <input type="hidden" name="inpTexto">
-  <input type="hidden" name="inpLocation">
-  <input type="hidden" name="inpContact">
-  <input type="hidden" name="inpLastKeySelected">
-  <INPUT type="hidden" name="IsPopUpCall" value="1">
-
-  <table height="100%" border="0" cellpadding="0" cellspacing="0" id="main">
-    <tr>
-      <td valign="top" class="Popup_Client_Selector_DataGrid_LeftMargin">
-        <table width="100%" border="0" cellspacing="0" cellpadding="0" id="tdleftSeparator">
-          <tr><td class="Popup_Client_Selector_DataGrid_LeftMargin"></td></tr>
-        </table>
-      </td>
-      <td valign="top">
-
-        <div style="overflow: auto; display: none;" id="client">
-
-          <table cellspacing="0" cellpadding="0" width="100%" class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;">
-            <tr class="DataGrid_Body_Row"> 
-              <th width="4%"  class="DataGrid_Header_LineNoCell">&nbsp;</th>
-              <th width="7%"  class="DataGrid_Header_Cell">Key</th>
-              <th width="14%" class="DataGrid_Header_Cell">Name</th>
-              <th width="11%" class="DataGrid_Header_Cell">Disp. Credit</th>
-              <th width="12%" class="DataGrid_Header_Cell">Credit used</th>
-              <th width="15%" class="DataGrid_Header_Cell">Contact</th>
-              <th width="9%"  class="DataGrid_Header_Cell">Phone no.</th>
-              <th width="6%"  class="DataGrid_Header_Cell">PC</th>
-              <th width="13%" class="DataGrid_Header_Cell">City</th>
-              <th width="9%"  class="DataGrid_Header_Cell">Income</th>
-            </tr>
-
-            <div id="sectionDetail"> 
-              <tr class="DataGrid_Body_Row DataGrid_Body_Row_yy" onclick="selectActual(this); loadData('xx', 'yy', 'zz', 'hh'); return true;"  ondblclick="parent.inferior.depurarSelector('SAVE'); return true;" id="funcEvenOddRowxx">
-                <td class="DataGrid_Body_LineNoCell DataGrid_Body_Cell_RadioButton">
-                  <input type="radio" name="inpClave" value="xx" id="CheckNumxx" class="DataGrid_RadioButton">
-                </td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldClaveTD">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldNombreTD">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldCreditoDispTD">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldCreditoUsadoTD">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldContactoTD">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldTelefonoTD">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldCPTD">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldCiudadTD">xx</td>
-                <td class="DataGrid_Body_Cell" onmouseover="HoverCell(this);" onmouseout="unHoverCell(this);" id="fieldIngresosTD">xx</td>
-              </tr>
-            </div>
-          </table>
-
-          <table cellspacing="0" cellpadding="0" width="100%" style="text-align:-moz-center;_text-align:center;border-collapse:collapse;">
-            <td align=left width=50% style="padding-left: 7px;">
-              <table cellspacing="0" cellpadding="0" id="hasPrevious">
-                <td class="Main_ToolBar_textlabel_bg_left">
-                  <a href="#" onClick="submitCommandForm('PREVIOUS', false, parent.superior.document.forms[0], 'BusinessPartner_F2.html', null, null, false);return false;" class="Main_ToolBar_Button" onMouseOver="window.status='Reference';return true;" onMouseOut="window.status='';return true;" onclick="this.hideFocus=true" onblur="this.hideFocus=false" id="linkButtonRelatedInfo"><img class="Main_ToolBar_Button_Icon Main_ToolBar_Button_Icon_Previous" src="../../../../../web/images/blank.gif" title="Reference" border="0" id="buttonRelatedInfo"></a>
-                </td>
-                <td class="Main_ToolBar_textlabel_bg_body" width=65px align="center"><a href="#" 
-                			  onClick="submitCommandForm('PREVIOUS', false, parent.superior.document.forms[0], 'BusinessPartner_F2.html', null, null, false);return false;" class="Main_ToolBar_text_relatedinfo">Previous</a></td>
-                <td width="1"><img src="../../../../../web/images/blank.gif" class="Main_ToolBar_textlabel_bg_right" border="0"></img></td>
-              </table>
-              <span id="withoutPrevious"></span>
-            </td>
-            <td align=right width=50% style="padding-right: 7px;">
-              <table cellspacing="0" cellpadding="0" id="hasNext">
-                <td width="1"><img src="../../../../../web/images/blank.gif" class="Main_ToolBar_textlabel_bg_left" border="0"></img></td>
-                <td class="Main_ToolBar_textlabel_bg_body" width=65px align=center><a href="#" 
-                              onClick="submitCommandForm('NEXT', false, parent.superior.document.forms[0], 'BusinessPartner_F2.html', null, null, false);return false;" class="Main_ToolBar_text_relatedinfo">Next</a></td>
-                <td class="Main_ToolBar_textlabel_bg_right">
-                  <a href="#" onClick="submitCommandForm('NEXT', false, parent.superior.document.forms[0], 'BusinessPartner_F2.html', null, null, false);return false;" class="Main_ToolBar_Button" onMouseOver="window.status='Reference';return true;" onMouseOut="window.status='';return true;" onclick="this.hideFocus=true" onblur="this.hideFocus=false" id="linkButtonRelatedInfo"><img class="Main_ToolBar_Button_Icon Main_ToolBar_Button_Icon_Next" src="../../../../../web/images/blank.gif" title="Reference" border="0" id="buttonRelatedInfo"></a>
-                </td>
-              </table>
-              <span id="withoutNext"></span>
-            </td>
-          </table>
-
-        </div>
-
-      </td>
-
-      <td valign="top" class="Popup_Client_Selector_DataGrid_RightMargin">
-        <table width="100%" border="0" cellspacing="0" cellpadding="0" id="tdrightSeparator">
-          <tr><td class="Popup_Client_Selector_DataGrid_RightMargin"></td></tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-
-</form>
-</body>
-</html>
--- a/src/org/openbravo/erpCommon/info/BusinessPartner_F2.xml	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +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="BusinessPartner_F2.html"/>
-  <PARAMETER id="paramLanguage" name="language" default=""/>
-  <PARAMETER id="paramDirection" name="direction" default=""/>
-	<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
-  <PARAMETER id="param2" name="param2" default="2"/>
-  <structure name="structure1">
-    <FIELD id="fieldRownum">position</FIELD>
-    <FUNCTION id="funcEvenOddRowxx" name="MODULE" arg1="fieldRownum" arg2="param2" format="integerEdition" attribute="class" replace="yy"/>
-    <FIELD id="funcEvenOddRowxx" attribute="id" replace="xx">position</FIELD>
-    <FIELD id="CheckNumxx" attribute="id" replace="xx">position</FIELD>
-    <FIELD id="CheckNumxx" attribute="value">cBpartnerId</FIELD>
-    <FIELD id="funcEvenOddRowxx" attribute="onclick" replace="xx" replaceCharacters="htmlJavaScript">nameHidden</FIELD>
-    <FIELD id="funcEvenOddRowxx" attribute="onclick" replace="yy" replaceCharacters="htmlJavaScript">cBpartnerLocationId</FIELD>
-    <FIELD id="funcEvenOddRowxx" attribute="onclick" replace="zz" replaceCharacters="htmlJavaScript">cBpartnerContactId</FIELD>
-    <FIELD id="funcEvenOddRowxx" attribute="onclick" replace="hh" replaceCharacters="htmlJavaScript">position</FIELD>
-    <FIELD id="fieldClaveTD">value</FIELD>
-    <FIELD id="fieldNombreTD">name</FIELD>
-    <FIELD id="fieldCreditoDispTD" format="euroEdition">soCreditavailable</FIELD>
-    <FIELD id="fieldCreditoUsadoTD" format="euroEdition">soCreditused</FIELD>
-    <FIELD id="fieldContactoTD">contact</FIELD>
-    <FIELD id="fieldTelefonoTD">phone</FIELD>
-    <FIELD id="fieldCPTD">postal</FIELD>
-    <FIELD id="fieldCiudadTD">city</FIELD>
-    <FIELD id="fieldIngresosTD" format="euroEdition">actuallifetimevalue</FIELD>
-    <SECTION id="sectionDetail"/>
-  </structure>
-</REPORT>
--- a/src/org/openbravo/erpCommon/info/BusinessPartner_F3.html	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2007 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<HTML>
-<HEAD>
-<TITLE>Business Partner selector</TITLE>
-<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"> 
-      <LINK rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"></LINK>
-      <script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/dojoConfig.js" type="text/javascript"></script>
-      <script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript"></script>
-      <SCRIPT language="JavaScript" type="text/javascript" id="paramDirection">var baseDirection = "../../../../../web/";</SCRIPT>
-      <script language="JavaScript" type="text/javascript" id="paramLanguage">var LNG_POR_DEFECTO = "en_US";</script>
-      <SCRIPT language="JavaScript" src="../../../../../web/js/searchs.js" type="text/javascript"></SCRIPT>
-      <SCRIPT language="JavaScript" type="text/javascript">
-function depurarSelector(action) {
-	var clave = radioValue(parent.medio.document.frmSelector.inpClave);
-	var texto = parent.medio.document.frmSelector.inpTexto.value;
-	var parameter = new Array(
-	new SearchElements("_LOC", true, parent.medio.document.frmSelector.inpLocation.value),
-	new SearchElements("_CON", true, parent.medio.document.frmSelector.inpContact.value)
-	);
-	parent.opener.closeSearch(action, clave, texto, parameter);
-}
-</SCRIPT>
-	<SCRIPT language="JavaScript" type="text/javascript">
-	function onLoadDo(){
-		this.windowTables = new Array(
-		  new windowTableId('client', 'superior', 'buttonSearch', 'superior'),
-		  new windowTableId('client', 'medio', 'buttonOK', 'inferior'),
-		  new windowTableId('client', 'inferior', 'buttonOK', 'inferior')
-		);
-		setWindowTableParentElement();
-		enableShortcuts('popup');
-	}
-
-	function onResizeDo(){
-	}
-	</SCRIPT>
-</HEAD>
-<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
-
-
-<table cellspacing="0" cellpadding="0" width="100%" style="height:100%; vertical-align:middle;">
-  <tr>
-    <td>
-      <div class="Popup_ContentPane_Client" style="overflow: auto;" id="client">
-        <table cellspacing="0" cellpadding="0" class="Popup_Client_TableSelector">
-
-          <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></td>
-            <td></td>
-            <td class="Button_RightAlign_ContentCell">
-              <div>
-                <a class="ButtonLink" href="#"
-                  onfocus="setWindowElementFocus(this); window.status='OK'; return true;"
-                  onblur="window.status=''; return true;"
-                  onkeypress="this.className='ButtonLink_active'; return true;"
-                  onkeyup="this.className='ButtonLink_focus'; return true;"
-                  onclick="depurarSelector('SAVE');return false;"
-                  id="buttonOK">
-                  <table class="Button"
-                    onmousedown="this.className='Button_active'; return true;"
-                    onmouseup="this.className='Button'; return true;"
-                    onmouseover="this.className='Button_hover'; window.status='OK'; return true;"
-                    onmouseout="this.className='Button'; window.status=''; return true;">
-                    <tr>
-                      <td class="Button_left"><img class="Button_Icon Button_Icon_ok" alt="OK" title="OK" src="../../../../../web/images/blank.gif" border=0/></td>
-                      <td class="Button_text Button_width">OK</td>
-                      <td class="Button_right"></td>
-                    </tr>
-                  </table>
-                </a>
-              </div>
-            </td>
-            <td class="Button_LeftAlign_ContentCell">
-              <div>
-                <a class="ButtonLink" href="#"
-                  onfocus="setWindowElementFocus(this); window.status='Cancel'; return true;"
-                  onblur="window.status=''; return true;"
-                  onkeypress="this.className='ButtonLink_active'; return true;"
-                  onkeyup="this.className='ButtonLink_focus'; return true;"
-                  onclick="depurarSelector('CLEAR');return false;">
-                  <table class="Button"
-                    onmousedown="this.className='Button_active'; return true;"
-                    onmouseup="this.className='Button'; return true;"
-                    onmouseover="this.className='Button_hover'; window.status='Cancel'; return true;"
-                    onmouseout="this.className='Button'; window.status=''; return true;">
-                    <tr>
-                      <td class="Button_left"><img class="Button_Icon Button_Icon_cancel" alt="Cancel" title="Cancel" src="../../../../../web/images/blank.gif" border=0/></td>
-                      <td class="Button_text Button_width">Cancel</td>
-                      <td class="Button_right"></td>
-                    </tr>
-                  </table>
-                </a>
-              </div>
-            </td>
-            <td></td>
-            <td></td>
-          </tr>
-        </table>
-      </div>
-    </td>
-  </tr>
-</table>
-</HTML>
--- a/src/org/openbravo/erpCommon/info/BusinessPartner_F3.xml	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<REPORT>
-	<template file="BusinessPartner_F3.html"/>
-	<PARAMETER id="paramDirection" name="direction" default=""/>
-	<PARAMETER id="paramLanguage" name="language" default=""/>
-	<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
-	<DISCARD id="discard"/>
-</REPORT>
--- a/src/org/openbravo/erpCommon/info/BusinessPartner_FS.html	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8"></META>
-<TITLE>Business Partner selector</TITLE>
-<LINK rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"></LINK></HEAD>
-<FRAMESET rows="235px,*,60px" frameborder="NO" border="0" framespacing="0" cols="*">
-<FRAME name="superior" id="paramFrameSuperior" scrolling="NO" noresize="" src="BusinessPartner_F1.html?Command=FRAME1"></FRAME>
-<FRAME name="medio" scrolling="NO" noresize="" src="BusinessPartner_F2.html?Command=FRAME2"></FRAME>
-<FRAME name="inferior" scrolling="NO" noresize="" src="BusinessPartner_F3.html?Command=FRAME3"></FRAME></FRAMESET>
-</HTML>
--- a/src/org/openbravo/erpCommon/info/BusinessPartner_FS.xml	Mon Apr 21 19:03:40 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
- * Version 1.1  with a permitted attribution clause; you may not  use this
- * file except in compliance with the License. You  may  obtain  a copy of
- * the License at http://www.openbravo.com/legal/license.html 
- * Software distributed under the License  is  distributed  on  an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific  language  governing  rights  and  limitations
- * under the License. 
- * The Original Code is Openbravo ERP. 
- * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2006 Openbravo SL 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
--->
-<REPORT>
-	<template file="BusinessPartner_FS.html"/>
-</REPORT>
--- a/src/org/openbravo/erpCommon/info/BusinessPartner_data.xsql	Mon Apr 21 19:03:40 2008 +0000
+++ b/src/org/openbravo/erpCommon/info/BusinessPartner_data.xsql	Mon Apr 21 19:06:47 2008 +0000
@@ -12,7 +12,7 @@
  * 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 portions are Copyright (C) 2001-2008 Openbravo SL 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -27,38 +27,46 @@
    <SqlMethod name="select" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql> <![CDATA[
-        SELECT DISTINCT bp.C_BPartner_ID, bp.value, bp.name as name, 
-        bp.name as name_hidden, 
-        (bp.SO_CreditLimit-bp.SO_CreditUsed) AS SO_CreditAvailable, bp.SO_CreditUsed, 
-        COALESCE(c.name,u.name) AS Contact, COALESCE(c.ad_user_id,u.ad_user_id) as C_BPartner_Contact_ID, bpl.Phone, l.Postal, 
-        bpl.c_bpartner_location_id as C_BPartner_Location_ID,
-        l.City, bp.ActualLifetimeValue
-        FROM C_BPARTNER bp left join C_BPARTNER_LOCATION bpl on bp.c_bpartner_id = bpl.c_bpartner_id
-                                                             and bpl.IsActive = 'Y'
-                           left join AD_USER c on bpl.c_bpartner_location_id = c.C_BPartner_Location_ID
-                                                             and c.IsActive ='Y'
-                           left join C_LOCATION l on bpl.c_location_id=l.C_Location_ID 
-                           left join  C_REGION r on l.c_region_id = r.c_region_id 
-                           left join
-                (SELECT c_bpartner_id, ad_user_id, name from ad_user where c_bpartner_id is not null 
-                and c_bpartner_location_id is null and isactive='Y') u on bp.c_bpartner_id = u.c_bpartner_id
-        WHERE bp.AD_Client_ID IN ('1') 
-        AND bp.AD_Org_ID IN ('1') 
-        AND bp.IsSummary='N' 
-        AND bp.IsActive='Y'
-        ORDER BY bp.name, contact
+      		SELECT * FROM ( SELECT '0' AS RN1, A.* FROM (      				   
+					SELECT DISTINCT bp.C_BPartner_ID, bp.value, bp.name as name, 
+					        bp.name as name_hidden, 
+					        (bp.SO_CreditLimit-bp.SO_CreditUsed) AS SO_CreditAvailable, bp.SO_CreditUsed, 
+					        COALESCE(c.name,u.name) AS Contact, COALESCE(c.ad_user_id,u.ad_user_id) as C_BPartner_Contact_ID, bpl.Phone, l.Postal AS PC, 
+					        bpl.c_bpartner_location_id as C_BPartner_Location_ID,
+					        l.City, bp.ActualLifetimeValue AS Income, 
+					        bp.C_BPartner_ID || '#' || COALESCE(TO_CHAR(c.ad_user_id), TO_CHAR(u.ad_user_id), '') || '#' || COALESCE(TO_CHAR(bpl.c_bpartner_location_id),'') || '#' || bp.name AS rowKey  
+					        FROM C_BPARTNER bp left join C_BPARTNER_LOCATION bpl on bp.c_bpartner_id = bpl.c_bpartner_id
+					                                                             and bpl.IsActive = 'Y'
+					                           left join AD_USER c on bpl.c_bpartner_location_id = c.C_BPartner_Location_ID
+					                                                             and c.IsActive ='Y'
+					                           left join C_LOCATION l on bpl.c_location_id=l.C_Location_ID 
+					                           left join  C_REGION r on l.c_region_id = r.c_region_id 
+					                           left join
+					                (SELECT c_bpartner_id, ad_user_id, name from ad_user where c_bpartner_id is not null 
+					                and c_bpartner_location_id is null and isactive='Y') u on bp.c_bpartner_id = u.c_bpartner_id
+					        WHERE bp.AD_Client_ID IN ('1') 
+					        AND bp.AD_Org_ID IN ('1') 
+					        AND bp.IsSummary='N' 
+					        AND bp.IsActive='Y'
+					        ORDER BY bp.value
+					) A ) B
+			WHERE 1=1
       ]]></Sql>
         <Field name="position" value="count"/>
+        <Parameter name="rownum" type="replace" optional="true" after="FROM ( SELECT " text="'0'" />
         <Parameter name="adUserClient" type="replace" optional="true" after="bp.AD_Client_ID IN (" text="'1'"/>
         <Parameter name="adUserOrg" type="replace" optional="true" after="bp.AD_Org_ID IN (" text="'1'"/>
         <Parameter name="key" optional="true" after="AND bp.IsActive='Y'"><![CDATA[AND UPPER(bp.Value) LIKE UPPER(?) ]]></Parameter>
         <Parameter name="name" optional="true" after="AND bp.IsActive='Y'"><![CDATA[AND UPPER(bp.Name) LIKE UPPER(?) ]]></Parameter>
-        <Parameter name="contact" optional="true" after="AND bp.IsActive='Y'"><![CDATA[AND UPPER(c.Name) LIKE UPPER(?) ]]></Parameter>
+        <Parameter name="contact" optional="true" after="AND bp.IsActive='Y'"><![CDATA[AND UPPER(COALESCE(c.name,u.name)) LIKE UPPER(?) ]]></Parameter>
         <Parameter name="codigoPostal" optional="true" after="AND bp.IsActive='Y'"><![CDATA[AND UPPER(l.Postal) LIKE UPPER(?) ]]></Parameter>
         <Parameter name="provincia" optional="true" after="AND bp.IsActive='Y'"><![CDATA[AND UPPER(r.NAME) LIKE UPPER(?)]]></Parameter>
         <Parameter name="clients" optional="true" type="none" after="AND bp.IsActive='Y'"><![CDATA[AND ISCUSTOMER = 'Y' ]]></Parameter>
         <Parameter name="vendors" optional="true" type="none" after="AND bp.IsActive='Y'"><![CDATA[AND ISVENDOR ='Y']]></Parameter>
         <Parameter name="ciudad" optional="true" after="AND bp.IsActive='Y'"><![CDATA[AND UPPER(l.City) LIKE UPPER(?) ]]></Parameter>
+        <Parameter name="orderBy" type="replace" optional="true" after="ORDER BY " text="bp.value" />
+        <Parameter name="oraLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[AND RN1 BETWEEN ]]></Parameter>
+        <Parameter name="pgLimit" type="argument" optional="true" after="WHERE 1=1"><![CDATA[LIMIT ]]></Parameter>
    </SqlMethod>
    <SqlMethod name="set" type="constant" return="multiple">
       <SqlMethodComment></SqlMethodComment>
--- a/src/org/openbravo/erpCommon/info/CashJournal_F1.html	Mon Apr 21 19:03:40 2008 +0000
+++ b/src/org/openbravo/erpCommon/info/CashJournal_F1.html	Mon Apr 21 19:06:47 2008 +0000
@@ -46,7 +46,7 @@
 
 function onloadFunctions() {
 	new TypeAheadCombo("sectionCashBook");
-	keyArray[keyArray.length] = new keyArrayItem("ENTER", "openSearch(null, null, '../info/DebtPayment_FS.html', 'SELECTOR_DEBT', false, 'frmCash', 'inpcDebtPaymentId',  'inpcDebtPaymentId_DES', document.frmCash.inpcDebtPaymentId_DES.value, 'Command', 'KEY');", "inpcInvoiceId_DES", "null");
+	keyArray[keyArray.length] = new keyArrayItem("ENTER", "openSearch(null, null, '../info/DebtPayment.html', 'SELECTOR_DEBT', false, 'frmCash', 'inpcDebtPaymentId',  'inpcDebtPaymentId_DES', document.frmCash.inpcDebtPaymentId_DES.value, 'Command', 'KEY');", "inpcInvoiceId_DES", "null");
 	keyArray[keyArray.length] = new keyArrayItem("B", "submitCommandForm('FIND', false, null, null, 'medio');", null, "ctrlKey");
 	
 }
@@ -318,7 +318,7 @@
                       onblur="window.status=''; return true;"
                       onkeypress="this.className='FieldButtonLink_active'; return true;"
                       onkeyup="this.className='FieldButtonLink_focus'; return true;"
-                      onclick="openSearch(null, null, '../info/DebtPayment_FS.html', 'SELECTOR_DEBT', false, 'frmCash', 'inpcDebtPaymentId',  'inpcDebtPaymentId_DES', document.frmCash.inpcDebtPaymentId_DES.value);return false;">
+                      onclick="openSearch(null, null, '../info/DebtPayment.html', 'SELECTOR_DEBT', false, 'frmCash', 'inpcDebtPaymentId',  'inpcDebtPaymentId_DES', document.frmCash.inpcDebtPaymentId_DES.value);return false;">
                       <table class="FieldButton"
                         onmousedown="this.className='FieldButton_active'; return true;"
                         onmouseup="this.className='FieldButton'; return true;"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/erpCommon/info/DebtPayment.html	Mon Apr 21 19:06:47 2008 +0000
@@ -0,0 +1,823 @@
+<!--
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License. 
+ * The Original Code is Openbravo ERP. 
+ * The Initial Developer of the Original Code is Openbravo SL 
+ * All portions are Copyright (C) 2001-2008 Openbravo SL 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+-->
+<html>
+<head>
+<title>Debt-payment selector</title>
+
+<link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Popup/Popup.css" id="paramCSS"></link>
+<script language="JavaScript" type="text/javascript" id="paramDirection">var baseDirection = "http://yourSite/web/";</script>
+<script language="JavaScript" type="text/javascript" id="paramLanguage">LNG_POR_DEFECTO = "en_US";</script>
+<script language="JavaScript" src="../../../../../web/js/ajax.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/shortcuts.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/utils.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/appStatus.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/searchs.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/jscalendar/calendar.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/jscalendar/lang/calendar-es.js" type="text/javascript" id="fieldCalendar"></script>
+<script language="JavaScript" src="../../../../../web/js/dojoConfig.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/dojo/dojo.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/openbravo/core.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/openbravo/widget/DataGrid.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/default/ValidationDateTextBox.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/default/ValidationNumberBox.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/default/ValidationIntegerBox.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/default/ValidationTextBox.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/default/DateTextBox.js" type="text/javascript"></script>
+<script language="JavaScript" src="../../../../../web/js/calculator.js" type="text/javascript"></script>
+
+<script type="text/javascript">
+  dojo.hostenv.writeIncludes(); //makes debugging in Venkman possible
+</script>
+<link rel="SHORTCUT ICON" href="../../../../../web/images/favicon.ico"></link>
+
+<script language="JavaScript" type="text/javascript">
+
+  function depurar() {
+    return true;
+  }
+</script>
+<script type="text/javascript">    
+  function depurarSelector(action) {
+  	var pos; var keys;  var clave; var texto; var parameter;
+  	if(action == "SAVE") {
+	    pos = getSelectedPos();
+	    keys = getSelectedValues().split("#")
+	    clave = keys[0];
+	    texto = keys[1];
+    }    
+  	parent.opener.closeSearch(action, clave, texto);
+  }
+</script>
+<script language="JavaScript" type="text/javascript" id="selectedColumn">
+  
+  dojo.require("openbravo.widget.DataGrid");
+  var selectedRow = 0;
+  var orderByPositions = new Array("1");
+  var orderByDirections = new Array("ASC");
+</script>
+<script language="JavaScript" type="text/javascript">
+function onloadFunctions() {
+	new TypeAheadCombo("inpCPaymentRuleId");
+	keyArray[keyArray.length] = new keyArrayItem("ENTER", "openSearch(null, null, 'BusinessPartner.html', 'SELECTOR_BUSINESS', false, 'frmEfecto', 'inpBpartnerId', 'inpBpartnerId_DES', document.frmEfecto.inpBpartnerId_DES.value, 'Command', 'KEY');", "inpBpartnerId_DES", "null");
+	keyArray[keyArray.length] = new keyArrayItem("B", "submitCommandForm('FIND', false, null, null, 'medio');", null, "ctrlKey");	
+}
+</script>
+<script language="JavaScript" type="text/javascript">
+  
+  function onLoadDo(){
+    this.windowTables = new Array(
+      new windowTableId('client_top', null, 'buttonSearch', null),
+      new windowTableId('client_middle', null, 'buttonOK', null),
+      new windowTableId('client_bottom', null, 'buttonOK', null)
+    );
+    setWindowTableParentElement();
+    enableShortcuts('popup');
+
+    try {
+      onloadFunctions();
+    } catch (e) {}
+
+    setWindowElementFocus('firstElement');
+    resizeAreaInfo();
+  }
+
+  function onResizeDo(){
+    resizeAreaInfo(true);
+  }
+</script>
+</head>
+<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onload="onLoadDo();" onresize="onResizeDo();">
+
+<form name="frmEfecto" method="POST" action="DebtPayment.html" >
+	<input type="hidden" name="Command" />
+	<input type="hidden" name="IsPopUpCall" value="1" />
+
+<div class="Popup_ContentPane_CircleLogo">
+	<div class="Popup_WindowLogo">
+		<img class="Popup_WindowLogo_Icon Popup_WindowLogo_Icon_debtPayment" src="../../../../../web/images/blank.gif" border="0" />
+	</div>
+</div>
+
+<table cellspacing="0" cellpadding="0" width="100%" id="table_header">
+	<tr>
+		<td>
+			<table cellspacing="0" cellpadding="0" class="Popup_ContentPane_NavBar">
+				<tr class="Popup_NavBar_bg">
+					<td></td>
+					<td class="Popup_NavBar_separator_cell"></td>
+					<td class="Popup_NavBar_bg_logo_left"></td>
+					<td class="Popup_NavBar_bg_logo" width="1" onclick="abrirNuevoBrowser('http://www.openbravo.com', 'Openbravo');return false;">
+						<img src="../../../../../web/images/blank.gif" alt="Openbravo"
+							title="Openbravo" border="0" id="openbravoLogo"
+							class="Popup_NavBar_logo" />
+					</td>
+					<td class="Popup_NavBar_bg_logo_right"></td>
+					<td class="Popup_NavBar_Popup_title_cell">
+						<span>Debt Payment Selector</span>
+					</td>
+					<td class="Popup_NavBar_separator_cell"></td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<table cellspacing="0" cellpadding="0" class="Popup_ContentPane_SeparatorBar">
+				<tr>
+					<td class="Popup_SeparatorBar_bg"></td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+	</table>
+	<table cellspacing="0" cellpadding="0" width="100%">
+	<tr>
+		<td>
+		<div class="Popup_ContentPane_Client" style="overflow: auto;" id="client_top">
+			<table cellspacing="0" cellpadding="0" class="Popup_Client_TableSelector">
+				<tr>
+					<td class="TableEdition_OneCell_width"></td>
+					<td class="TableEdition_OneCell_width"></td>
+					<td class="TableEdition_OneCell_width"></td>
+					<td class="TableEdition_OneCell_width"></td>
+					<td class="TableEdition_OneCell_width"></td>
+					<td class="TableEdition_OneCell_width"></td>
+				</tr>
+				<tr>
+					<td colspan="6">
+						<table class="FieldGroup" cellspacing="0" cellpadding="0" border="0">
+							<tr class="FieldGroup_TopMargin"></tr>
+							<tr>
+								<td class="FieldGroupTitle_Left">
+									<img class="FieldGroupTitle_Left_bg" border="0"
+										src="../../../../../web/images/blank.gif" />
+								</td>
+								<td class="FieldGroupTitle">Primary Filters</td>
+								<td class="FieldGroupTitle_Right">
+									<img class="FieldGroupTitle_Right_bg" border="0"
+									src="../../../../../web/images/blank.gif" />
+								</td>
+								<td class="FieldGroupContent"></td>
+							</tr>
+							<tr class="FieldGroup_BottomMargin"></tr>
+						</table>
+					</td>
+				</tr>
+				</tr>
+				<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" /> 
+									<input class="dojoValidateValid TextBox_btn_TwoCells_width" type="text"
+									name="inpBpartnerId_DES" id="fieldcBpartnerId_DES" maxlength="20"
+									value="" />
+								</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, 'BusinessPartner.html', 'SELECTOR_BUSINESS', false, 'frmEfecto', 'inpBpartnerId', 'inpBpartnerId_DES', document.frmEfecto.inpBpartnerId_DES.value);return false;">
+										<table class="FieldButton"
+											onmousedown="this.className='FieldButton_active'; return true;"
+											onmouseup="this.className='FieldButton'; return true;"
+											onmouseover="this.className='FieldButton_hover'; window.status='Business Partner'; return true;"
+											onmouseout="this.className='FieldButton'; window.status=''; 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" "/>
+												</td>
+											</tr>
+										</table>
+									</a>
+								</td>
+							</tr>
+						</table>
+					</td>	
+					<td class="TitleCell">
+						<span class="LabelText">Payment Rule</span>
+					</td>	
+					<td class="Combo_ContentCell">
+						<select class="Combo Combo_OneCell_width" name="inpCPaymentRuleId" id="inpCPaymentRuleId">
+							<option value=""></option>
+							<div id="reportPaymentRule">
+								<option value="T.Ambiente" id="discard">Accounted shipment</option>
+								<option value="T.Ambiente" id="discard">Bank draft</option>
+							</div>
+						</select>
+					</td>
+					<td />
+				</tr>	
+				<tr>	
+					<td class="TitleCell">
+						<span class="LabelText">Date planned from</span>
+					</td>
+					<td colspan="2" class="TextBox_btn_ContentCell" id="paramDateFrom_inp_td">
+						<div id="editDiscard">
+						<div id="paramDateFrom_inp">
+						<table border="0" cellspacing="0" cellpadding="0" summary="" class="">
+							<tr>
+								<td class="TextBox_ContentCell">
+								<table style="border: 0px; border-collapse: collapse;">						
+									<tr>
+										<td style="padding-top: 0px;">
+											<input type="text" id="paramDateFrom"
+											class="dojoValidateValid TextBox_btn_OneCell_width"
+											required="false" value="" maxlength="10" name="inpDateFrom"
+											onkeyup="auto_complete_date(this);"
+											onchange="validateDateTextBox(this.id);logChanges(this);return true;"
+											displayformat="DD-MM-YYYY" saveformat="DD-MM-YYYY"></input>
+										</td>
+									</tr>
+								</table>
+								<span class="TextBox_MsgContainer_span" style="display: none;" id="paramDateFrominvalidSpan">
+								<table class="TextBox_MsgContainer_table">
+									<tr class="TextBox_MsgContainer_tr">						
+										<td class="TextBox_MsgContainer_td">
+											<div class="TextBox_MsgContainer_div"></div>
+										</td>
+										<td></td>
+									</tr>
+									<tr>
+										<td colspan="2" class="invalid">
+											<div class="TextBox_MsgContainer_div2" id="paramDateFrominvalidSpanText">* The value entered is not valid.</div>
+										</td>
+									</tr>
+								</table>
+								</span><span class="TextBox_MsgContainer_span" style="display: none;" id="paramDateFrommissingSpan">						
+								<table class="TextBox_MsgContainer_table">
+									<tr class="TextBox_MsgContainer_tr">
+										<td class="TextBox_MsgContainer_td">
+											<div class="TextBox_MsgContainer_div"></div>
+										</td>
+										<td></td>
+									</tr>
+									<tr>
+										<td colspan="2" class="missing">
+											<div class="TextBox_MsgContainer_div2" id="paramDateFrommissingSpanText">* This value is required.</div>
+										</td>
+									</tr>
+								</table>						
+								</span><span class="TextBox_MsgContainer_span" style="display: none;" id="paramDateFromrangeSpan">
+								<table class="TextBox_MsgContainer_table">
+									<tr class="TextBox_MsgContainer_tr">
+										<td class="TextBox_MsgContainer_td">
+											<div class="TextBox_MsgContainer_div"></div>
+										</td>
+										<td></td>
+									</tr>
+									<tr>
+										<td colspan="2" class="range">
+										<div class="TextBox_MsgContainer_div2"
+											id="paramDateFromrangeSpanText">* This value is out of range.</div>
+										</td>						
+									</tr>
+								</table>
+								</span></td>
+								<td class="FieldButton_ContentCell">
+									<a class="FieldButtonLink"
+										href="#"
+										onfocus="setWindowElementFocus(this); window.status='Date of First Sale'; return true;"
+										onblur="window.status=''; return true;"
+										onkeypress="this.className='FieldButtonLink_active'; return true;"
+										onkeyup="this.className='FieldButtonLink_focus'; return true;"
+										onclick="showCalendar('frmEfecto.inpDateFrom', document.frmEfecto.inpDateFrom.value, false);return false;">
+									<table class="FieldButton"
+										onmousedown="this.className='FieldButton_active'; return true;"
+										onmouseup="this.className='FieldButton'; return true;"
+										onmouseover="this.className='FieldButton_hover'; window.status='Date of First Sale'; return true;"
+										onmouseout="this.className='FieldButton'; window.status=''; return true;"
+										id="paramDateFromlinkCalendar">
+										<tr>
+											<td class="FieldButton_bg">
+												<img alt="Date of First Sale" class="FieldButton_Icon FieldButton_Icon_Calendar"
+												title="Date of First Sale" src="../web/images/blank.gif" border="0"
+												id="buttonCalendar"></img>
+											</td>
+										</tr>
+									</table>
+									</a>
+								</td>
+							</tr>
+						</table>
+						</div>
+						</div>
+					</td>					
+					<td class="TitleCell"><span class="LabelText">To</span></td>	
+					<td colspan="3" class="TextBox_btn_ContentCell" id="paramDateTo_inp_td">
+						<div id="editDiscard">
+						<div id="paramDateTo_inp">
+						<table border="0" cellspacing="0" cellpadding="0" summary="" class="">
+							<tr>
+								<td class="TextBox_ContentCell">
+								<table style="border: 0px; border-collapse: collapse;">						
+									<tr>
+										<td style="padding-top: 0px;">
+											<input type="text" id="paramDateTo"
+												class="dojoValidateValid TextBox_btn_OneCell_width"
+												required="false" value="" maxlength="10" name="inpDateTo"
+												onkeyup="auto_complete_date(this);"
+												onchange="validateDateTextBox(this.id);logChanges(this);return true;"
+												displayformat="DD-MM-YYYY" saveformat="DD-MM-YYYY"></input>
+											</td>
+									</tr>
+								</table>
+								<span class="TextBox_MsgContainer_span" style="display: none;" id="paramDateToinvalidSpan">
+								<table class="TextBox_MsgContainer_table">
+									<tr class="TextBox_MsgContainer_tr">						
+										<td class="TextBox_MsgContainer_td">
+											<div class="TextBox_MsgContainer_div"></div>
+										</td>
+										<td></td>
+									</tr>
+									<tr>
+										<td colspan="2" class="invalid">
+											<div class="TextBox_MsgContainer_div2" id="paramDateToinvalidSpanText">* The value entered is not valid.</div>
+										</td>
+									</tr>
+								</table>
+								</span> <span class="TextBox_MsgContainer_span" style="display: none;" id="paramDateTomissingSpan">						
+								<table class="TextBox_MsgContainer_table">
+									<tr class="TextBox_MsgContainer_tr">
+										<td class="TextBox_MsgContainer_td">
+											<div class="TextBox_MsgContainer_div"></div>
+										</td>
+										<td></td>
+									</tr>
+									<tr>
+										<td colspan="2" class="missing">
+											<div class="TextBox_MsgContainer_div2" id="paramDateTomissingSpanText">* This value is required.</div>
+										</td>
+									</tr>
+								</table>						
+								</span> <span class="TextBox_MsgContainer_span" style="display: none;" id="paramDateTorangeSpan">
+								<table class="TextBox_MsgContainer_table">
+									<tr class="TextBox_MsgContainer_tr">
+										<td class="TextBox_MsgContainer_td">
+											<div class="TextBox_MsgContainer_div"></div>
+										</td>
+										<td></td>
+									</tr>
+									<tr>
+										<td colspan="2" class="range">
+											<div class="TextBox_MsgContainer_div2" id="paramDateTorangeSpanText">* This value is out of range.</div>
+										</td>						
+									</tr>
+								</table>
+								</span></td>
+								<td class="FieldButton_ContentCell">
+									<a class="FieldButtonLink"
+										href="#"
+										onfocus="setWindowElementFocus(this); window.status='Date of First Sale'; return true;"
+										onblur="window.status=''; return true;"
+										onkeypress="this.className='FieldButtonLink_active'; return true;"
+										onkeyup="this.className='FieldButtonLink_focus'; return true;"
+										onclick="showCalendar('frmEfecto.inpDateTo', document.frmEfecto.inpDateTo.value, false);return false;">
+										<table class="FieldButton"
+											onmousedown="this.className='FieldButton_active'; return true;"
+											onmouseup="this.className='FieldButton'; return true;"
+											onmouseover="this.className='FieldButton_hover'; window.status='Date of First Sale'; return true;"
+											onmouseout="this.className='FieldButton'; window.status=''; return true;"
+											id="paramDateTolinkCalendar">
+											<tr>
+												<td class="FieldButton_bg">
+													<img alt="Date of First Sale" class="FieldButton_Icon FieldButton_Icon_Calendar"
+													title="Date of First Sale" src="../web/images/blank.gif" border="0"
+													id="buttonCalendar"></img>
+												</td>
+											</tr>
+										</table>
+									</a>
+								</td>
+							</tr>
+						</table>
+						</div>
+						</div>
+					</td>
+					<td />
+				</tr>	
+				<tr>
+					<td class="TitleCell">
+						<span class="LabelText">Order</span>
+					</td>
+					<td class="TextBox_ContentCell" colspan="2">
+						<input class="dojoValidateValid TextBox_OneCell_width" type="text"
+						name="inpOrder" />
+					</td>	
+					<td class="TitleCell"><span class="LabelText">Invoice</span></td>
+					<td class="TextBox_ContentCell" colspan="2">
+						<input class="dojoValidateValid TextBox_OneCell_width" type="text" name="inpInvoice" />
+					</td>
+				</tr>
+				<tr>
+					<td class="TitleCell">
+						<span class="LabelText">Amount From</span>
+					</td>
+					<td id="inpCal1_inp_td" class="TextBox_btn_ContentCell" colspan="2">
+						<div id="newDiscard">
+						<div id="Cal1_inp">
+							<table cellspacing="0" cellpadding="0" border="0" class="" summary="">
+								<tbody>
+									<tr>
+										<td class="TextBox_ContentCell">
+										<table style="border: 0px none; border-collapse: collapse;">
+											<tbody>
+												<tr>
+													<td style="padding-top: 0px;">
+														<input type="text" onchange="validateNumberBox(this.id);return true;"
+														onkeyup="" name="inpCal1" maxlength="10" value=""
+														class="dojoValidateValid TextBox_btn_OneCell_width number TextBox"
+														id="inpCal1" />
+													</td>
+												</tr>
+											</tbody>
+										</table>
+										<span id="inpCal1invalidSpan" style="display: none;" class="TextBox_MsgContainer_span">
+										<table class="TextBox_MsgContainer_table">
+											<tbody>
+												<tr class="TextBox_MsgContainer_tr">
+													<td class="TextBox_MsgContainer_td">
+													<div class="TextBox_MsgContainer_div" />
+													</td>
+													<td />
+												</tr>
+												<tr>
+													<td class="invalid" colspan="2">
+													<div id="Cal1invalidSpanText" class="TextBox_MsgContainer_div2">* The value entered is not valid.</div>
+													</td>
+												</tr>
+											</tbody>
+										</table>
+										</span> <span id="inpCal1missingSpan" style="display: none;" class="TextBox_MsgContainer_span">
+										<table class="TextBox_MsgContainer_table">
+											<tbody>
+												<tr class="TextBox_MsgContainer_tr">
+													<td class="TextBox_MsgContainer_td">
+														<div class="TextBox_MsgContainer_div" />
+													</td>
+													<td />
+												</tr>
+												<tr>
+													<td class="missing" colspan="2">
+														<div id="Cal1missingSpanText" class="TextBox_MsgContainer_div2">* This value is required.</div>
+													</td>
+												</tr>
+											</tbody>
+										</table>
+										</span> <span id="inpCal1rangeSpan" style="display: none;" class="TextBox_MsgContainer_span">
+										<table class="TextBox_MsgContainer_table">
+											<tbody>
+												<tr class="TextBox_MsgContainer_tr">
+													<td class="TextBox_MsgContainer_td">
+														<div class="TextBox_MsgContainer_div" />
+													</td>
+													<td />
+												</tr>
+												<tr>
+													<td class="range" colspan="2">
+														<div id="inpCal1rangeSpanText" class="TextBox_MsgContainer_div2">* This value is out of range.</div>
+													</td>
+												</tr>
+											</tbody>
+										</table>
+										</span>
+										</td>
+										<td class="FieldButton_ContentCell">
+											<a onclick="calculator('frmEfecto.inpCal1', document.frmEfecto.inpCal1.value, false);return false;"
+												onkeyup="this.className='FieldButtonLink_focus'; return true;"
+												onkeypress="this.className='FieldButtonLink_active'; return true;"
+												onblur="window.status=''; return true;"
+												onfocus="setWindowElementFocus(this); window.status='Cal1 No.'; return true;"
+												href="#" class="FieldButtonLink">
+												<table id="Cal1linkCalc"
+													onmouseout="this.className='FieldButton'; window.status=''; return true;"
+													onmouseover="this.className='FieldButton_hover'; window.status='Cal1 No.'; return true;"
+													onmouseup="this.className='FieldButton'; return true;"
+													onmousedown="this.className='FieldButton_active'; return true;"
+													class="FieldButton">
+													<tbody>
+														<tr>
+															<td class="FieldButton_bg">
+																<img border="0" id="buttonCalc" src="../web/images/blank.gif" title="Cal1 No."
+																	class="FieldButton_Icon FieldButton_Icon_Calc" alt="Cal1 No." />
+															</td>
+														</tr>
+													</tbody>
+												</table>
+											</a>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						</div>
+					</td>
+					</td>
+					<td class="TitleCell"><span class="LabelText">To</span></td>
+					<td id="inpCal2_inp_td" class="TextBox_btn_ContentCell" colspan="3">
+						<div id="newDiscard">
+						<div id="inpCal2_inp">
+							<table cellspacing="0" cellpadding="0" border="0" class="" summary="">
+								<tbody>
+									<tr>
+										<td class="TextBox_ContentCell">
+										<table style="border: 0px none; border-collapse: collapse;">
+											<tbody>
+												<tr>
+													<td style="padding-top: 0px;">
+														<input type="text" onchange="validateNumberBox(this.id);return true;"
+														onkeyup="" name="inpCal2" maxlength="10" value=""
+														class="dojoValidateValid TextBox_btn_OneCell_width number TextBox"
+														id="inpCal2" />
+													</td>
+												</tr>
+											</tbody>
+										</table>
+										<span id="inpCal2invalidSpan" style="display: none;" class="TextBox_MsgContainer_span">
+										<table class="TextBox_MsgContainer_table">
+											<tbody>
+												<tr class="TextBox_MsgContainer_tr">
+													<td class="TextBox_MsgContainer_td">
+													<div class="TextBox_MsgContainer_div" />
+													</td>
+													<td />
+												</tr>
+												<tr>
+													<td class="invalid" colspan="2">
+													<div id="inpCal2invalidSpanText" class="TextBox_MsgContainer_div2">* The value entered is not valid.</div>
+													</td>
+												</tr>
+											</tbody>
+										</table>
+										</span> <span id="inpCal2missingSpan" style="display: none;" class="TextBox_MsgContainer_span">
+										<table class="TextBox_MsgContainer_table">
+											<tbody>
+												<tr class="TextBox_MsgContainer_tr">
+													<td class="TextBox_MsgContainer_td">
+														<div class="TextBox_MsgContainer_div" />
+													</td>
+													<td />
+												</tr>
+												<tr>
+													<td class="missing" colspan="2">
+														<div id="inpCal2missingSpanText" class="TextBox_MsgContainer_div2">* This value is required.</div>
+													</td>
+												</tr>
+											</tbody>
+										</table>
+										</span> <span id="inpCal2rangeSpan" style="display: none;" class="TextBox_MsgContainer_span">
+										<table class="TextBox_MsgContainer_table">
+											<tbody>
+												<tr class="TextBox_MsgContainer_tr">
+													<td class="TextBox_MsgContainer_td">
+														<div class="TextBox_MsgContainer_div" />
+													</td>
+													<td />
+												</tr>
+												<tr>
+													<td class="range" colspan="2">
+														<div id="inpCal2rangeSpanText" class="TextBox_MsgContainer_div2">* This value is out of range.</div>
+													</td>
+												</tr>
+											</tbody>
+										</table>
+										</span></td>
+										<td class="FieldButton_ContentCell">
+											<a onclick="calculator('frmEfecto.inpCal2', document.frmEfecto.inpCal2.value, false);return false;"
+												onkeyup="this.className='FieldButtonLink_focus'; return true;"
+												onkeypress="this.className='FieldButtonLink_active'; return true;"
+												onblur="window.status=''; return true;"
+												onfocus="setWindowElementFocus(this); window.status='Cal2 No.'; return true;"
+												href="#" class="FieldButtonLink">
+												<table id="Cal2linkCalc"
+													onmouseout="this.className='FieldButton'; window.status=''; return true;"
+													onmouseover="this.className='FieldButton_hover'; window.status='Cal2 No.'; return true;"
+													onmouseup="this.className='FieldButton'; return true;"
+													onmousedown="this.className='FieldButton_active'; return true;"
+													class="FieldButton">
+													<tbody>
+														<tr>
+															<td class="FieldButton_bg">
+																<img border="0" id="buttonCalc" src="../web/images/blank.gif" title="Cal2 No."
+																	class="FieldButton_Icon FieldButton_Icon_Calc" alt="Cal2 No." />
+															</td>
+														</tr>
+													</tbody>
+												</table>
+											</a>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						</div>
+					</td>
+					<td></td>
+				</tr>
+				<tr>
+				<tr>	
+					<td class="TitleCell">
+						<span class="LabelText">Paid</span>
+					</td>
+					<td class="Radio_Check_ContentCell">
+						<span class="Checkbox_container_NOT_Focused">
+							<input type="checkbox" name="inpIsPaid" value="Y" />
+						</span>
+					</td>
+					<td class="TitleCell">
+						<span class="LabelText">Pending</span>
+					</td>
+					<td class="Radio_Check_ContentCell">
+						<span class="Checkbox_container_NOT_Focused">
+							<input type="checkbox" name="inpPending" value="P" id="paramPending" checked="" />
+						</span>
+					</td>
+					<td class="TitleCell">
+						<span class="LabelText">Receipt</span>
+					</td>
+					<td class="Radio_Check_ContentCell">
+						<span class="Checkbox_container_NOT_Focused">
+							<input type="checkbox" name="inpIsReceipt" value="Y" checked="" />
+						</span>
+					</td>
+				</tr>
+				</tr>
+				<tr>
+					<td></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="setFilters();return false;" id="buttonSearch">
+								<table class="Button"
+									onmousedown="this.className='Button_active'; return true;"
+									onmouseup="this.className='Button'; return true;"
+									onmouseover="this.className='Button_hover'; window.status='Search'; return true;"
+									onmouseout="this.className='Button'; window.status=''; 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></td>
+					<td></td>
+					<td></td>
+					<td></td>
+				</tr>
+			</table>
+		</div>
+		</td>
+		</tr>
+		<tr>
+			<td>
+			<div class="Popup_ContentPane_Client" style="overflow: hidden; height: 0px;" id="client_middle">
+				<table summary="" id="sectionDetail">
+					<tr>
+						<td>
+							<table cellspacing="0" cellpadding="0" width="10px"
+								class="DataGrid_Header_Table DataGrid_Body_Table"
+								style="table-layout: auto;" id="grid_sample">
+								<tr class="DataGrid_Body_Row" id="grid_sample_header">
+									<th width="10px" class="DataGrid_Header_Cell">DataGrid</th>
+								</tr>
+								<tr class="DataGrid_Body_Row DataGrid_Body_Row_1"
+									onclick="selectActual(this); loadData('BBAccountingUser', '1000012', '', '1'); return true;"
+									id="grid_sample_row">
+									<td class="DataGrid_Body_Cell">Loading...</td>
+								</tr>
+							</table>
+							<table width="100%" cellspacing="0" cellpadding="0" border="0" class="Main_Client_TableRelation" id="grid_table">
+								<tr>
+									<td>
+										<div id="grid" dojotype="openbravo:DataGrid"
+											structureurl="../info/DebtPayment.html?Command=STRUCTURE"
+											dataurl="../info/DebtPayment.html?Command=DATA"
+											updatesurl="../info/DebtPayment.html?Command=DATA"
+											calculatenumrows="true" editable="false" sortable="true"
+											deleteable="true" oninvalidvalue="alert" onscroll="updateHeader"
+											ongridload="onGridLoadDo" buffersize="3.0" showlinenumbers="true"
+											offset="0" sortcols="1" sortdirs="ASC" defaultrow="0"
+											maxwidth="99%" percentagewidthrelativetoid="client_middle"
+											multiplerowselection="false" preventcache="true" usecache="true"
+											cachecontent="false">
+										</div>
+										<script>djConfig.searchIds.push("grid");</script>
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+			</div>
+			</td>
+		</tr>
+		<tr>
+			<td>
+			<div class="Popup_ContentPane_Client" style="overflow: auto; height: 50px;" id="client_bottom">
+			<table cellspacing="0&qu