details: https://code.openbravo.com/erp/devel/pi/rev/bb001f31f53a changeset: 18494:bb001f31f53a user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Mon Oct 29 15:34:43 2012 +0100 summary: Fixed bug 22181 Add document name when JER opens when post
details: https://code.openbravo.com/erp/devel/pi/rev/87312a271f13 changeset: 18495:87312a271f13 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue Nov 06 19:56:01 2012 +0100 summary: Fixed issue 22136 add description column in pdf JER details: https://code.openbravo.com/erp/devel/pi/rev/d47a1afe85fd changeset: 18496:d47a1afe85fd user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue Nov 06 19:58:39 2012 +0100 summary: Fixed bug 22182 after post show a tab for each general ledger details: https://code.openbravo.com/erp/devel/pi/rev/22b019b64170 changeset: 18497:22b019b64170 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue Nov 06 19:38:59 2012 +0100 summary: Related to issue 22182 Changes to run the automated test diffstat: modules/org.openbravo.client.application/src/org/openbravo/client/application/window/GetNameGeneralLedger.java | 58 + src/org/openbravo/erpCommon/ad_actionButton/Posted.java | 68 +- src/org/openbravo/erpCommon/ad_actionButton/Posted_data.xsql | 34 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html | 59 + src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 60 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml | 558 ++++++--- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml | 5 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql | 46 +- 8 files changed, 663 insertions(+), 225 deletions(-) diffs (truncated from 1211 to 300 lines): diff -r ee78cde70ebb -r 22b019b64170 modules/org.openbravo.client.application/src/org/openbravo/client/application/window/GetNameGeneralLedger.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/GetNameGeneralLedger.java Tue Nov 06 19:38:59 2012 +0100 @@ -0,0 +1,58 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.1 (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 SLU + * All portions are Copyright (C) 2011 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************ + */ +package org.openbravo.client.application.window; + +import java.util.Map; + +import org.apache.log4j.Logger; +import org.codehaus.jettison.json.JSONObject; +import org.openbravo.base.exception.OBException; +import org.openbravo.client.kernel.BaseActionHandler; +import org.openbravo.dal.core.OBContext; +import org.openbravo.dal.service.OBDal; +import org.openbravo.model.financialmgmt.accounting.coa.AcctSchema; + +public class GetNameGeneralLedger extends BaseActionHandler { + + private static final Logger log = Logger.getLogger(GetNameGeneralLedger.class); + + @Override + protected JSONObject execute(Map<String, Object> parameters, String content) { + OBContext.setAdminMode(); + try { + if (parameters.get("Command").equals("GETNAME")) { + String glId = parameters.get("glId").toString(); + AcctSchema acctSchema = OBDal.getInstance().get(AcctSchema.class, glId); + JSONObject obj = new JSONObject(); + try { + obj.put("id", acctSchema.getId()); + obj.put("name", acctSchema.getName()); + } catch (Exception e) { + throw new OBException("Error while reading attachments:", e); + } + return obj; + } else { + return new JSONObject(); + } + + } finally { + OBContext.restorePreviousMode(); + } + } +} diff -r ee78cde70ebb -r 22b019b64170 src/org/openbravo/erpCommon/ad_actionButton/Posted.java --- a/src/org/openbravo/erpCommon/ad_actionButton/Posted.java Tue Nov 06 19:32:59 2012 +0100 +++ b/src/org/openbravo/erpCommon/ad_actionButton/Posted.java Tue Nov 06 19:38:59 2012 +0100 @@ -111,9 +111,37 @@ } finally { OBContext.restorePreviousMode(); } - printPageClosePopUp(response, vars, strDireccion - + "/ad_reports/ReportGeneralLedgerJournal.html?Command=DIRECT&inpTable=" - + strTableId + "&inpRecord=" + strKey + "&inpOrg=" + data[0].org, title); + PostedData[] data2 = null; + data2 = PostedData.selectAccSchemas(this, "ACCTDESCRIPTION", + Utility.getContext(this, vars, "#User_Client", "ReportGeneralLedger"), + Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportGeneralLedger"), + strTableId, strKey, vars.getLanguage()); + + String accSchemas = ""; + String schemaNames = ""; + for (int i = 0; i < data2.length; i++) { + + if (i + 1 == data2.length) { + accSchemas = accSchemas + data2[i].schemaId; + schemaNames = schemaNames + data2[i].schemaName; + } else { + accSchemas = accSchemas + data2[i].schemaId + ","; + schemaNames = schemaNames + data2[i].schemaName; + } + } + + if (data2.length == 1) { + printPageClosePopUp(response, vars, strDireccion + + "/ad_reports/ReportGeneralLedgerJournal.html?Command=DIRECT&inpTable=" + + strTableId + "&inpRecord=" + strKey + "&inpOrg=" + data[0].org + + "&inpAccSchemas=" + accSchemas + "&posted=Y", title); + } else { + printPageClosePopUp(response, vars, strDireccion + + "/ad_reports/ReportGeneralLedgerJournal.html?Command=DIRECT&inpTable=" + + strTableId + "&inpRecord=" + strKey + "&inpOrg=" + data[0].org + + "&inpAccSchemas=" + accSchemas + "&posted=Y", title + " - " + + data2[0].schemaName); + } } } } else { @@ -143,9 +171,37 @@ } finally { OBContext.restorePreviousMode(); } - printPageClosePopUp(response, vars, strDireccion - + "/ad_reports/ReportGeneralLedgerJournal.html?Command=DIRECT&inpTable=" - + strTableId + "&inpRecord=" + strKey + "&inpOrg=" + data[0].org, title); + PostedData[] data2 = null; + data2 = PostedData.selectAccSchemas(this, "ACCTDESCRIPTION", + Utility.getContext(this, vars, "#User_Client", "ReportGeneralLedger"), + Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportGeneralLedger"), + strTableId, strKey, vars.getLanguage()); + + String accSchemas = ""; + String schemaNames = ""; + for (int i = 0; i < data2.length; i++) { + + if (i + 1 == data2.length) { + accSchemas = accSchemas + data2[i].schemaId; + schemaNames = schemaNames + data2[i].schemaName; + } else { + accSchemas = accSchemas + data2[i].schemaId + ","; + schemaNames = schemaNames + data2[i].schemaName; + } + } + + if (data2.length == 1) { + printPageClosePopUp(response, vars, strDireccion + + "/ad_reports/ReportGeneralLedgerJournal.html?Command=DIRECT&inpTable=" + + strTableId + "&inpRecord=" + strKey + "&inpOrg=" + data[0].org + + "&inpAccSchemas=" + accSchemas + "&posted=Y", title); + } else { + printPageClosePopUp(response, vars, strDireccion + + "/ad_reports/ReportGeneralLedgerJournal.html?Command=DIRECT&inpTable=" + + strTableId + "&inpRecord=" + strKey + "&inpOrg=" + data[0].org + + "&inpAccSchemas=" + accSchemas + "&posted=Y", title + " - " + + data2[0].schemaName); + } } } else { if (log4j.isDebugEnabled()) diff -r ee78cde70ebb -r 22b019b64170 src/org/openbravo/erpCommon/ad_actionButton/Posted_data.xsql --- a/src/org/openbravo/erpCommon/ad_actionButton/Posted_data.xsql Tue Nov 06 19:32:59 2012 +0100 +++ b/src/org/openbravo/erpCommon/ad_actionButton/Posted_data.xsql Tue Nov 06 19:38:59 2012 +0100 @@ -12,7 +12,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2001-2010 Openbravo SLU + * All portions are Copyright (C) 2001-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -27,7 +27,7 @@ <SqlMethodComment></SqlMethodComment> <Sql> <![CDATA[ - SELECT MAX(FACT_ACCT_GROUP_ID) AS ID, MAX(AD_ORG_ID) AS ORG, MAX(AD_CLIENT_ID) AS CLIENT FROM FACT_ACCT + SELECT MAX(FACT_ACCT_GROUP_ID) AS ID, MAX(AD_ORG_ID) AS ORG, MAX(AD_CLIENT_ID) AS CLIENT, '' AS SCHEMA_ID , '' AS SCHEMA_NAME FROM FACT_ACCT WHERE RECORD_ID = ? AND AD_TABLE_ID = ? ]]> @@ -69,4 +69,34 @@ <Parameter name="tablename" optional="false" type="replace" after="WHERE " text="FACT_ACCT"/> <Parameter name="keyId"/> </SqlMethod> + <SqlMethod name="selectAccSchemas" type="preparedStatement" return="multiple"> + <SqlMethodComment></SqlMethodComment> + <Sql> + <![CDATA[ + SELECT distinct (SCHEMA_ID) as SCHEMA_ID , SCHEMA_NAME + FROM + (SELECT F.C_ACCTSCHEMA_ID AS SCHEMA_ID, SC.NAME AS SCHEMA_NAME, F.FACT_ACCT_GROUP_ID AS IDENTIFIER, F.DATEACCT, + F.ACCTVALUE AS VALUE, F.ACCTDESCRIPTION AS NAME,F.RECORD_ID AS ID, F.AD_TABLE_ID, F.DOCBASETYPE, + sum(F.AMTACCTDR) AS AMTACCTDR, sum(F.AMTACCTCR) AS AMTACCTCR, MIN(SEQNO) AS SEQNO, F.FACTACCTTYPE AS FACTACCTTYPE, F.AD_CLIENT_ID + FROM FACT_ACCT F, C_ACCTSCHEMA SC + WHERE F.AD_CLIENT_ID IN ('1') + AND F.AD_ORG_ID IN('1') + AND 1=1 + AND f.C_ACCTSCHEMA_ID = SC.C_ACCTSCHEMA_ID + GROUP BY f.C_ACCTSCHEMA_ID, SC.NAME, F.AD_TABLE_ID, F.DATEACCT, F.ACCTDESCRIPTION, F.ACCTVALUE, F.DOCBASETYPE, F.RECORD_ID, + F.FACT_ACCT_GROUP_ID, F.ACCOUNT_ID,F.FACTACCTTYPE, + (CASE F.AMTACCTDR WHEN 0 THEN (CASE SIGN(F.AMTACCTCR) WHEN -1 THEN 1 ELSE 2 END) ELSE (CASE SIGN(F.AMTACCTDR) WHEN -1 THEN 3 ELSE 4 END) END), F.AD_CLIENT_ID + HAVING (sum(F.AMTACCTDR) <> 0 OR sum(F.AMTACCTCR) <> 0)) AA, + AD_REF_LIST_V AR + WHERE AR.VALUE=AA.DOCBASETYPE + AND AD_LANGUAGE=? + ]]></Sql> + <Parameter name="descriptionType" type="replace" optional="true" after="F.ACCTVALUE AS VALUE, F." text="ACCTDESCRIPTION"/> + <Parameter name="adUserClient" type="replace" optional="true" after="WHERE F.AD_CLIENT_ID IN (" text="'1'"/> + <Parameter name="adUserOrg" type="replace" optional="true" after="AND F.AD_ORG_ID IN(" text="'1'"/> + <Parameter name="table" optional="true" after="AND 1=1"><![CDATA[ AND f.ad_table_ID = ?]]></Parameter> + <Parameter name="record" optional="true" after="AND 1=1"><![CDATA[ AND f.record_ID = ?]]></Parameter> + <Parameter name="descriptionType" type="replace" optional="true" after="GROUP BY f.C_ACCTSCHEMA_ID, SC.NAME, F.AD_TABLE_ID, F.DATEACCT, F." text="ACCTDESCRIPTION"/> + <Parameter name="paramLanguage"></Parameter> + </SqlMethod> </SqlClass> diff -r ee78cde70ebb -r 22b019b64170 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html --- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html Tue Nov 06 19:32:59 2012 +0100 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html Tue Nov 06 19:38:59 2012 +0100 @@ -152,6 +152,59 @@ alert(e); } } + + function openTabJournalEntriesReport(rid,name) { + var myframe = getFrame('LayoutMDI') || top.opener; + if (myframe) { + myframe.OB.RemoteCallManager.call('org.openbravo.client.application.ComputeTranslatedNameActionHandler', {}, {'processId': '800000'}, + function(response, data, request){ + myframe.OB.Layout.ViewManager.openView('OBClassicWindow', { + command: 'DIRECT', + icon: '[SKINIMG]../../org.openbravo.client.application/images/application-menu/iconReport.png', + id: '800000', + obManualURL: '/ad_reports/ReportGeneralLedgerJournal.html?inpParamschemas=' + rid, + processId: '800000', + addToRecents:'no', + tabTitle: data.processTitle + " - " + name, + type: 'report', + viewId: 'OBClassicWindow' + }); + }); + + } + } + + function openTabWhenPost() { + var frm = document.frmMain; + var aux=frm.inpParamschemas.value; + var rid=aux.split(','); + if(rid){ + var myframe = getFrame('LayoutMDI') || top.opener; + var tabSet = myframe.OB.MainView.TabSet; + var tabref = tabSet.tabs[tabSet.selectedTab]; + var tab = tabSet.getTab(tabref.ID); + var title = tab.title; + tab.prompt = title; + tab.showPrompt = true; + tab.hoverWidth = 150; + title = myframe.OB.Utilities.truncTitle(title); + tabSet.setTabTitle(tab, title); + } + if (frm.posted.value==='Y'){ + for (i=0;i<rid.length;i++){ + if (rid[i]!==""){ + var d = { + Command: 'GETNAME', + glId: rid[i] + }; + myframe.OB.RemoteCallManager.call('org.openbravo.client.application.window.GetNameGeneralLedger', {}, d, function (response, data, request) { + openTabJournalEntriesReport(data.id,data.name) ; + + }); + } + } + } + } </script> @@ -177,6 +230,8 @@ setWindowElementFocus('firstElement'); displayAdvancedFilters(); selectDocument(); + openTabWhenPost(); + if (checkPreviousNextButtons) { checkPreviousNextButtons(); } @@ -196,6 +251,8 @@ <input type="hidden" name="inpFactAcctGroupId"></input> <input type="hidden" name="inpRecord" id="inpRecord" value=""/> <input type="hidden" name="inpTable" id="inpTable" value=""/> + <input type="hidden" name="inpParamschemas" id="inpParamschemas" value=""></input> + <input type="hidden" name="posted" id="posted" value=""></input> <table height="100%" border="0" cellpadding="0" cellspacing="0" id="main"> <tr> <td valign="top" id="tdleftTabs"></td> @@ -582,6 +639,8 @@ <input type="hidden" name="Command"></input> <input type="hidden" name="inprecordId"></input> <input type="hidden" name="inpadTableId"></input> + <input type="hidden" name="inpAccSchemas"></input> + <input type="hidden" name="inpSchemaNames"></input> <input type="hidden" name="inpdocbasetype"></input> </form> </body> diff -r ee78cde70ebb -r 22b019b64170 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java Tue Nov 06 19:32:59 2012 +0100 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java Tue Nov 06 19:38:59 2012 +0100 @@ -127,21 +127,41 @@ "ReportGeneralLedgerJournal|ShowDescription", ""); printPageDataSheet(response, vars, strDateFrom, strDateTo, strDocument, strOrg, strTable, strRecord, "", strcAcctSchemaId, strShowClosing, strShowReg, strShowOpening, strPageNo, ------------------------------------------------------------------------------ LogMeIn Central: Instant, anywhere, Remote PC access and management. Stay in control, update software, and manage PCs from one command center Diagnose problems and improve visibility into emerging IT issues Automate, monitor and manage. Do more in less time with Central http://p.sf.net/sfu/logmein12331_d2d _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
