details: https://code.openbravo.com/erp/devel/pi/rev/4940706a662a changeset: 24354:4940706a662a user: Rafa Roda Palacios <rafa.roda <at> ubiquads.com> date: Fri Aug 29 11:56:20 2014 +0200 summary: Related to issue 27033 Added ISACTIVE where close to query
details: https://code.openbravo.com/erp/devel/pi/rev/89d7c698e42e changeset: 24355:89d7c698e42e user: Rafa Roda Palacios <rafa.roda <at> ubiquads.com> date: Fri Aug 29 13:26:15 2014 +0200 summary: Fixes issue 27033 Corrected Javascript condition not to display error diffstat: src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance_data.xsql | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diffs (24 lines): diff -r 057434bc0a7e -r 89d7c698e42e src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html --- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html Fri Aug 29 12:20:42 2014 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.html Fri Aug 29 13:26:15 2014 +0200 @@ -166,7 +166,7 @@ function addRows(htmlText, id) { var jsonTable = eval(htmlText); - if (typeof jsonTable != undefined) { + if (typeof jsonTable != undefined && jsonTable.hasOwnProperty("rows")) { for (i=0; i<jsonTable.rows.length; i++) { var node=document.getElementById('funcEvenOddRow1'+id); var elem=document.createElement('TR'); diff -r 057434bc0a7e -r 89d7c698e42e src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance_data.xsql --- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance_data.xsql Fri Aug 29 12:20:42 2014 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance_data.xsql Fri Aug 29 13:26:15 2014 +0200 @@ -514,6 +514,8 @@ SELECT EV.C_ELEMENTVALUE_ID AS ID, EV.VALUE AS ACCOUNT_ID, EV.NAME AS NAME FROM C_VALIDCOMBINATION VC, C_ELEMENTVALUE EV WHERE VC.ACCOUNT_ID = EV.C_ELEMENTVALUE_ID + AND VC.ISACTIVE = 'Y' + AND EV.ISACTIVE = 'Y' AND VC.C_ACCTSCHEMA_ID = ? ORDER BY EV.VALUE ]]></Sql> ------------------------------------------------------------------------------ Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
