details: https://code.openbravo.com/erp/devel/pi/rev/066657f221ab
changeset: 19086:066657f221ab
user: Sandra Huguet <sandra.huguet <at> openbravo.com>
date: Thu Dec 20 14:07:58 2012 +0100
summary: Fixed bug 22646 show accounting dimensions when no grouping criteria
is selected
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java | 12 +++++-----
1 files changed, 6 insertions(+), 6 deletions(-)
diffs (38 lines):
diff -r a6b455bb80fc -r 066657f221ab
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java Thu Dec
20 13:27:34 2012 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java Thu Dec
20 14:07:58 2012 +0100
@@ -505,20 +505,18 @@
showbpartner = true;
showproduct = false;
showProject = false;
-
} else if (strGroupBy.equals("Product")) {
showbpartner = false;
showproduct = true;
showProject = false;
-
} else if (strGroupBy.equals("Project")) {
showbpartner = false;
showproduct = false;
showProject = true;
} else {
- showbpartner = false;
- showproduct = false;
- showProject = false;
+ showbpartner = true;
+ showproduct = true;
+ showProject = true;
}
} else {
data = getDataWhenNotSubAccount(vars, strDateFrom, strDateTo, strOrg,
strOrgFamily,
@@ -540,7 +538,9 @@
StringBuilder strSubTitle = new StringBuilder();
strSubTitle.append(Utility.messageBD(this, "LegalEntity",
vars.getLanguage()) + ": ");
- strSubTitle.append(ReportTrialBalanceData.selectCompany(this,
vars.getClient()) + "\n");
+ strSubTitle.append(ReportTrialBalanceData.selectCompany(this,
vars.getClient())+ " (");
+ strSubTitle.append(Utility.messageBD(this, "ACCS_AD_ORG_ID_D",
vars.getLanguage())+": " );
+ strSubTitle.append(ReportTrialBalanceData.selectOrgName(this, strOrg)+
") \n");
strSubTitle.append("As of: " + strDateTo);
parameters.put("REPORT_SUBTITLE", strSubTitle.toString());
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits