Bug fix [1822932]. Removed link on account level. All movements are made a subaccount level.
authorIván Perdomo <ivan.perdomo@openbravo.com>
Wed, 21 May 2008 08:40:18 +0000
changeset 964 4a92ccd2edf3
parent 963 16ed5a87aedf
child 965 696ca921ec15
Bug fix [1822932]. Removed link on account level. All movements are made a subaccount level.
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.xml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html	Wed May 21 08:24:11 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html	Wed May 21 08:40:18 2008 +0000
@@ -557,7 +557,7 @@
                         <TR class="DataGrid_Body_Row DataGrid_Body_Row_yy" id="funcEvenOddRow1xx"> 
                           <TD width="9%" class="DataGrid_Body_Cell"> 
                             <A href="#" onclick="submitCommandFormParameter('DEFAULT', document.frmMain.inpcElementValueIdFrom, 'xx', false, document.frmMain, 'ReportGeneralLedger.html', '_self', false, true);return false;" onmouseover="window.status='General Ledger';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="fieldId"> 
-                            <SPAN id="fieldAccount">xx600</SPAN></A>
+                            <SPAN id="fieldAccount">xx600</SPAN></A><SPAN id="fieldSpanAccount">xx600</SPAN>
                           </TD>
                           <TD width="33%" id="fieldDescription" class="DataGrid_Body_Cell">xxPĂ©rdidas y ganacias</TD>
                           <TD width="12%" id="fieldSaldoInicial" class="DataGrid_Body_Cell">xx14500.34</TD>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java	Wed May 21 08:24:11 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java	Wed May 21 08:40:18 2008 +0000
@@ -94,8 +94,19 @@
     if (log4j.isDebugEnabled()) log4j.debug("Output: dataSheet");
     if (log4j.isDebugEnabled()) log4j.debug("strAll:"+strAll+" - strLevel:"+strLevel+" - strOnly:"+strOnly);
     response.setContentType("text/html; charset=UTF-8");
-    PrintWriter out = response.getWriter();
-    String discard[]={"sectionDiscard","sectionBP"};
+    PrintWriter out = response.getWriter();    
+    String discard[] = new String[3];
+    if(strLevel.equalsIgnoreCase("C")) {
+      discard[0] = "sectionDiscard";
+      discard[1] = "sectionBP";
+      discard[2] = "fieldId";
+    }
+    else {
+      discard[0] = "sectionDiscard";
+      discard[1] = "sectionBP";
+      discard[2] = "fieldSpanAccount";
+    }
+      
     XmlDocument xmlDocument=null;
     String strTreeOrg = ReportTrialBalanceData.treeOrg(this, vars.getClient());
     String strOrgFamily = getFamily(strTreeOrg, strOrg);
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.xml	Wed May 21 08:24:11 2008 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.xml	Wed May 21 08:40:18 2008 +0000
@@ -83,6 +83,7 @@
     <FIELD id="fieldRownum1">rownum</FIELD>
     <FUNCTION id="funcEvenOddRow1xx" name="MODULE" arg1="fieldRownum1" arg2="param2" format="integerEdition" attribute="class" replace="yy"/>
     <FIELD id="fieldAccount">accountId</FIELD>
+    <FIELD id="fieldSpanAccount">accountId</FIELD>
     <FIELD id="fieldDescription">name</FIELD>
     <FIELD id="fieldAmtacctdr" format="euroInform">amtacctdr</FIELD>
     <FIELD id="fieldAmtacctcr" format="euroInform">amtacctcr</FIELD>