details: http://code.openbravo.com/erp/devel/pi/rev/047ee25acc47 changeset: 4003:047ee25acc47 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Fri Jun 12 12:54:26 2009 +0200 summary: Fixed 9334: Fix search popup to work with generated windows in modules - use getTabURL utility function to build url to a tab which works for windows in core and moduels
details: http://code.openbravo.com/erp/devel/pi/rev/3cf464fd4e15 changeset: 4004:3cf464fd4e15 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Fri Jun 12 12:56:18 2009 +0200 summary: Merge details: http://code.openbravo.com/erp/devel/pi/rev/092838f3e887 changeset: 4005:092838f3e887 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Fri Jun 12 12:57:37 2009 +0200 summary: Merge diffstat: src-db/database/lib/dbsourcemanager.jar | src-db/database/model/functions/AD_SYNCHRONIZE.xml | 12 - src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Shipment.html | 2 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Bank.html | 2 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_CRemittance.html | 2 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_DPManagement.html | 2 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice.html | 4 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Settlement.html | 2 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment.html | 4 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.html | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Locator.java | 14 +- src/org/openbravo/erpCommon/ad_reports/ReportBankJR.jrxml | 1262 ++++----- src/org/openbravo/erpCommon/ad_reports/ReportCashJR.jrxml | 1160 +++----- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderOpenItemEdit.jrxml | 1040 +++---- src/org/openbravo/erpCommon/businessUtility/Buscador.java | 9 +- web/js/utils.js | 8 + 16 files changed, 1550 insertions(+), 1977 deletions(-) diffs (truncated from 4405 to 300 lines): diff -r ab553f6100c1 -r 092838f3e887 src-db/database/lib/dbsourcemanager.jar Binary file src-db/database/lib/dbsourcemanager.jar has changed diff -r ab553f6100c1 -r 092838f3e887 src-db/database/model/functions/AD_SYNCHRONIZE.xml --- a/src-db/database/model/functions/AD_SYNCHRONIZE.xml Thu Jun 11 15:31:42 2009 +0200 +++ b/src-db/database/model/functions/AD_SYNCHRONIZE.xml Fri Jun 12 12:57:37 2009 +0200 @@ -1208,7 +1208,6 @@ AD_WINDOW_TRL T WHERE AD_MENU.AD_Window_ID=w.AD_Window_ID AND AD_MENU.AD_Module_ID = M.AD_MODULE_ID - AND M.AD_MODULE_ID = W.AD_MODULE_ID AND w.AD_Window_ID = T.ad_Window_ID AND M.AD_LANGUAGE = T.AD_LANGUAGE UNION @@ -1218,7 +1217,6 @@ WHERE AD_MENU.AD_Window_ID=w.AD_Window_ID AND AD_MENU.AD_Module_ID = M.AD_MODULE_ID AND W.AD_MODULE_ID = M2.AD_MODULE_ID - AND M.AD_MODULE_ID = W.AD_MODULE_ID AND M.AD_LANGUAGE = M2.AD_LANGUAGE ) , Description= @@ -1228,7 +1226,6 @@ AD_WINDOW_TRL T WHERE AD_MENU.AD_Window_ID=w.AD_Window_ID AND AD_MENU.AD_Module_ID = M.AD_MODULE_ID - AND M.AD_MODULE_ID = W.AD_MODULE_ID AND w.AD_Window_ID = T.ad_Window_ID AND M.AD_LANGUAGE = T.AD_LANGUAGE UNION @@ -1238,7 +1235,6 @@ WHERE AD_MENU.AD_Window_ID=w.AD_Window_ID AND AD_MENU.AD_Module_ID = M.AD_MODULE_ID AND W.AD_MODULE_ID = M2.AD_MODULE_ID - AND M.AD_MODULE_ID = W.AD_MODULE_ID AND M.AD_LANGUAGE = M2.AD_LANGUAGE ) WHERE AD_Window_ID IS NOT NULL AND Action='W' @@ -1315,7 +1311,6 @@ AD_PROCESS_TRL T WHERE AD_MENU.AD_Process_ID=w.AD_Process_ID AND AD_MENU.AD_Module_ID = M.AD_MODULE_ID - AND M.AD_MODULE_ID = W.AD_MODULE_ID AND w.AD_Process_ID = T.AD_Process_ID AND M.AD_LANGUAGE = T.AD_LANGUAGE UNION @@ -1325,7 +1320,6 @@ WHERE AD_MENU.AD_Process_ID=w.AD_Process_ID AND AD_MENU.AD_Module_ID = M.AD_MODULE_ID AND W.AD_MODULE_ID = M2.AD_MODULE_ID - AND M.AD_MODULE_ID = W.AD_MODULE_ID AND M.AD_LANGUAGE = M2.AD_LANGUAGE ) , Description= @@ -1335,7 +1329,6 @@ AD_PROCESS_TRL T WHERE AD_MENU.AD_Process_ID=w.AD_Process_ID AND AD_MENU.AD_Module_ID = M.AD_MODULE_ID - AND M.AD_MODULE_ID = W.AD_MODULE_ID AND w.AD_Process_ID = T.AD_Process_ID AND M.AD_LANGUAGE = T.AD_LANGUAGE UNION @@ -1345,7 +1338,6 @@ WHERE AD_MENU.AD_Process_ID=w.AD_Process_ID AND AD_MENU.AD_Module_ID = M.AD_MODULE_ID AND W.AD_MODULE_ID = M2.AD_MODULE_ID - AND M.AD_MODULE_ID = W.AD_MODULE_ID AND M.AD_LANGUAGE = M2.AD_LANGUAGE ) WHERE AD_MENU.AD_Process_ID IS NOT NULL AND AD_MENU.Action IN('R', 'P') @@ -1418,7 +1410,6 @@ AD_Form_TRL T WHERE AD_MENU.AD_Form_ID=w.AD_Form_ID AND AD_MENU.AD_Module_ID = M.AD_MODULE_ID - AND M.AD_MODULE_ID = W.AD_MODULE_ID AND w.AD_Form_ID = T.AD_Form_ID AND M.AD_LANGUAGE = T.AD_LANGUAGE UNION @@ -1428,7 +1419,6 @@ WHERE AD_MENU.AD_Form_ID=w.AD_Form_ID AND AD_MENU.AD_Module_ID = M.AD_MODULE_ID AND W.AD_MODULE_ID = M2.AD_MODULE_ID - AND M.AD_MODULE_ID = W.AD_MODULE_ID AND M.AD_LANGUAGE = M2.AD_LANGUAGE ) , Description= @@ -1438,7 +1428,6 @@ AD_Form_TRL T WHERE AD_MENU.AD_Form_ID=w.AD_Form_ID AND AD_MENU.AD_Module_ID = M.AD_MODULE_ID - AND M.AD_MODULE_ID = W.AD_MODULE_ID AND w.AD_Form_ID = T.AD_Form_ID AND M.AD_LANGUAGE = T.AD_LANGUAGE UNION @@ -1448,7 +1437,6 @@ WHERE AD_MENU.AD_Form_ID=w.AD_Form_ID AND AD_MENU.AD_Module_ID = M.AD_MODULE_ID AND W.AD_MODULE_ID = M2.AD_MODULE_ID - AND M.AD_MODULE_ID = W.AD_MODULE_ID AND M.AD_LANGUAGE = M2.AD_LANGUAGE ) WHERE AD_Form_ID IS NOT NULL AND Action='X' diff -r ab553f6100c1 -r 092838f3e887 src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Shipment.html --- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Shipment.html Thu Jun 11 15:31:42 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFromMultiple_Shipment.html Fri Jun 12 12:57:37 2009 +0200 @@ -560,7 +560,7 @@ <button type="button" id="buttonSearch" class="ButtonLink" - onclick="submitCommandForm('FIND', true);return false;" + onclick="removeOnUnload();submitCommandForm('FIND', true);return false;" onfocus="buttonEvent('onfocus', this); window.status='Search'; return true;" onblur="buttonEvent('onblur', this);" onkeyup="buttonEvent('onkeyup', this);" diff -r ab553f6100c1 -r 092838f3e887 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Bank.html --- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Bank.html Thu Jun 11 15:31:42 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Bank.html Fri Jun 12 12:57:37 2009 +0200 @@ -523,7 +523,7 @@ <button type="button" id="buttonSearch" class="ButtonLink" - onclick="submitCommandForm('FIND_BANK', false, null, null, '_self');return false;" + onclick="removeOnUnload();submitCommandForm('FIND_BANK', false, null, null, '_self');return false;" onfocus="buttonEvent('onfocus', this); window.status='Search'; return true;" onblur="buttonEvent('onblur', this);" onkeyup="buttonEvent('onkeyup', this);" diff -r ab553f6100c1 -r 092838f3e887 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_CRemittance.html --- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_CRemittance.html Thu Jun 11 15:31:42 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_CRemittance.html Fri Jun 12 12:57:37 2009 +0200 @@ -493,7 +493,7 @@ <button type="button" id="buttonSearch" class="ButtonLink" - onclick="submitCommandForm('FIND_SETTLEMENT', true);return false;" + onclick="removeOnUnload();submitCommandForm('FIND_SETTLEMENT', true);return false;" onfocus="buttonEvent('onfocus', this); window.status='Search'; return true;" onblur="buttonEvent('onblur', this);" onkeyup="buttonEvent('onkeyup', this);" diff -r ab553f6100c1 -r 092838f3e887 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_DPManagement.html --- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_DPManagement.html Thu Jun 11 15:31:42 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_DPManagement.html Fri Jun 12 12:57:37 2009 +0200 @@ -523,7 +523,7 @@ <button type="button" id="buttonSearch" class="ButtonLink" - onclick="submitCommandForm('FIND_SETTLEMENT', true);return false;" + onclick="removeOnUnload();submitCommandForm('FIND_SETTLEMENT', true);return false;" onfocus="buttonEvent('onfocus', this); window.status='Search'; return true;" onblur="buttonEvent('onblur', this);" onkeyup="buttonEvent('onkeyup', this);" diff -r ab553f6100c1 -r 092838f3e887 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice.html --- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice.html Thu Jun 11 15:31:42 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice.html Fri Jun 12 12:57:37 2009 +0200 @@ -361,13 +361,13 @@ <tr> <td class="TitleCell"><span class="LabelText">Order</span></td> <td class="Combo_ContentCell" colspan="2"> - <select class="Combo Combo_TwoCells_width" name="inpPurchaseOrder" onchange="submitCommandForm('FIND_PO', false, null, null, '_self');return true;" id="inpPurchaseOrder"> + <select class="Combo Combo_TwoCells_width" name="inpPurchaseOrder" onchange="removeOnUnload();submitCommandForm('FIND_PO', false, null, null, '_self');return true;" id="inpPurchaseOrder"> <option value=""></option><div id="reportPurchaseOrder"></div> </select> </td> <td class="TitleCell"><span class="LabelText">Shipment/Receipt</span></td> <td class="Combo_ContentCell" colspan="2"> - <select class="Combo Combo_OneCell_width" name="inpShipmentReciept" onchange="submitCommandForm('FIND_SHIPMENT', false, null, null, '_self');return true;" id="inpShipmentReciept"> + <select class="Combo Combo_OneCell_width" name="inpShipmentReciept" onchange="removeOnUnload();submitCommandForm('FIND_SHIPMENT', false, null, null, '_self');return true;" id="inpShipmentReciept"> <option value=""></option><div id="reportShipmentReciept"></div> </select> </td> diff -r ab553f6100c1 -r 092838f3e887 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Settlement.html --- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Settlement.html Thu Jun 11 15:31:42 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Settlement.html Fri Jun 12 12:57:37 2009 +0200 @@ -496,7 +496,7 @@ <button type="button" id="buttonSearch" class="ButtonLink" - onclick="submitCommandForm('FIND_SETTLEMENT', true);return false;" + onclick="removeOnUnload();submitCommandForm('FIND_SETTLEMENT', true);return false;" onfocus="buttonEvent('onfocus', this); window.status='Search'; return true;" onblur="buttonEvent('onblur', this);" onkeyup="buttonEvent('onkeyup', this);" diff -r ab553f6100c1 -r 092838f3e887 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment.html --- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment.html Thu Jun 11 15:31:42 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment.html Fri Jun 12 12:57:37 2009 +0200 @@ -347,7 +347,7 @@ </td> <td class="TitleCell"><span class="LabelText">Order</span></td> <td class="Combo_ContentCell" colspan="2"> - <select name="inpPurchaseOrder" class="Combo Combo_TwoCells_width" onchange="submitCommandForm('FIND_PO', false, null, null, '_self');return true;" id="inpPurchaseOrder"> + <select name="inpPurchaseOrder" class="Combo Combo_TwoCells_width" onchange="removeOnUnload();submitCommandForm('FIND_PO', false, null, null, '_self');return true;" id="inpPurchaseOrder"> <option value=""></option><div id="reportPurchaseOrder"></div> </select> </td> @@ -384,7 +384,7 @@ </td> <td class="TitleCell"><span class="LabelText">Invoice</span></td> <td class="Combo_ContentCell" colspan="2"> - <select name="inpInvoice" class="Combo Combo_TwoCells_width" onchange="submitCommandForm('FIND_INVOICE', false, null, null, '_self');return true;" id="inpInvoice"> + <select name="inpInvoice" class="Combo Combo_TwoCells_width" onchange="removeOnUnload();submitCommandForm('FIND_INVOICE', false, null, null, '_self');return true;" id="inpInvoice"> <option value=""></option><div id="reportInvoice"></div> </select> </td> diff -r ab553f6100c1 -r 092838f3e887 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.html --- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.html Thu Jun 11 15:31:42 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.html Fri Jun 12 12:57:37 2009 +0200 @@ -377,7 +377,7 @@ </td> <td class="TitleCell"><span class="LabelText">Order</span></td> <td class="Combo_ContentCell" colspan="2"> - <select name="inpPurchaseOrder" class="Combo Combo_TwoCells_width" onchange="submitCommandForm('FIND_PO', false, null, null, '_self');return true;" id="inpPurchaseOrder"> + <select name="inpPurchaseOrder" class="Combo Combo_TwoCells_width" onchange="removeOnUnload();submitCommandForm('FIND_PO', false, null, null, '_self');return true;" id="inpPurchaseOrder"> <option value=""></option><div id="reportPurchaseOrder"></div> </select> </td> @@ -414,7 +414,7 @@ </td> <td class="TitleCell"><span class="LabelText">Invoice</span></td> <td class="Combo_ContentCell" colspan="2"> - <select name="inpInvoice" class="Combo Combo_TwoCells_width" onchange="submitCommandForm('FIND_INVOICE', false, null, null, '_self');return true;" id="inpInvoice"> + <select name="inpInvoice" class="Combo Combo_TwoCells_width" onchange="removeOnUnload();submitCommandForm('FIND_INVOICE', false, null, null, '_self');return true;" id="inpInvoice"> <option value=""></option><div id="reportInvoice"></div> </select> </td> diff -r ab553f6100c1 -r 092838f3e887 src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Locator.java --- a/src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Locator.java Thu Jun 11 15:31:42 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Locator.java Fri Jun 12 12:57:37 2009 +0200 @@ -91,13 +91,13 @@ + ((data[0].qty == null || data[0].qty.equals("")) ? "\"\"" : data[0].qty) + "), \n"); resultado.append("new Array(\"EXECUTE\", \"displayLogic();\")\n"); - resultado.append(");"); - xmlDocument.setParameter("array", resultado.toString()); - xmlDocument.setParameter("frameName", "appFrame"); - response.setContentType("text/html; charset=UTF-8"); - final PrintWriter out = response.getWriter(); - out.println(xmlDocument.print()); - out.close(); } + resultado.append(");"); + xmlDocument.setParameter("array", resultado.toString()); + xmlDocument.setParameter("frameName", "appFrame"); + response.setContentType("text/html; charset=UTF-8"); + final PrintWriter out = response.getWriter(); + out.println(xmlDocument.print()); + out.close(); } } diff -r ab553f6100c1 -r 092838f3e887 src/org/openbravo/erpCommon/ad_reports/ReportBankJR.jrxml --- a/src/org/openbravo/erpCommon/ad_reports/ReportBankJR.jrxml Thu Jun 11 15:31:42 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportBankJR.jrxml Fri Jun 12 12:57:37 2009 +0200 @@ -1,221 +1,197 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!-- Created with iReport - A designer for JasperReports --> -<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd";> -<jasperReport - name="ReportBankJR" - columnCount="1" - printOrder="Vertical" - orientation="Portrait" - pageWidth="595" - pageHeight="842" - columnWidth="535" - columnSpacing="0" - leftMargin="30" - rightMargin="30" - topMargin="20" - bottomMargin="20" - whenNoDataType="NoPages" - isTitleNewPage="false" - isSummaryNewPage="false"> - <property name="ireport.scriptlethandling" value="0" /> - <property name="ireport.encoding" value="UTF-8" /> - <import value="java.util.*" /> - <import value="net.sf.jasperreports.engine.*" /> - <import value="net.sf.jasperreports.engine.data.*" /> - - <style - name="default" - isDefault="false" - vAlign="Middle" - fontName="Bitstream Vera Sans" - fontSize="11" - > - </style> - <style - name="Report_Title" - isDefault="false" - fontName="Bitstream Vera Sans" - fontSize="18" - > - <box leftPadding="5"></box> - </style> - <style - name="Report_Subtitle" - isDefault="false" - forecolor="#555555" - fontName="Bitstream Vera Sans" - fontSize="14" - > - <box leftPadding="5"></box> - </style> ------------------------------------------------------------------------------ Crystal Reports - New Free Runtime and 30 Day Trial Check out the new simplified licensing option that enables unlimited royalty-free distribution of the report engine for externally facing server and web deployment. http://p.sf.net/sfu/businessobjects _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
