details: /erp/devel/pi/rev/8dc35f2ddcca
changeset: 7135:8dc35f2ddcca
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Fri Apr 23 17:46:46 2010 +0530
summary: Fixes Issue 12743: bracket and format issue has been fixed
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.html | 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.java | 57
+++++----
2 files changed, 30 insertions(+), 29 deletions(-)
diffs (81 lines):
diff -r 174274efc18c -r 8dc35f2ddcca
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.html
--- a/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.html
Fri Apr 23 13:51:11 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.html
Fri Apr 23 17:46:46 2010 +0530
@@ -260,7 +260,7 @@
<tr>
<td class="TitleCell"><span
class="LabelText">Organization</span></td>
<td class="Combo_ContentCell">
- <select name="inpOrg" id="inpOrg" class="Combo
Combo_OneCell_width" required="false">
+ <select name="inpOrg" id="inpOrg" class="Combo
Combo_TwoCells_width" required="false">
<option value=""> <div id="reportAD_ORGID"></div></option>
</select></td>
<td class="ContentCell"></td>
diff -r 174274efc18c -r 8dc35f2ddcca
src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.java
Fri Apr 23 13:51:11 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.java
Fri Apr 23 17:46:46 2010 +0530
@@ -301,36 +301,37 @@
advisePopUp(request, response, "WARNING", Utility.messageBD(this,
"NoDataFound", vars
.getLanguage()));
}
-
- String sClientID = vars.getUserClient();
- String sOrganID = "";
- if (strOrg.equals("")) {
- for (int i = 0; i < data.length; i++) {
- sOrganID = sOrganID + "'" + data[i].orgid;
- if (!(i == data.length - 1)) {
- sOrganID = sOrganID + "',";
- } else {
- sOrganID = sOrganID + "'";
- }
- }
-
- } else {
- sOrganID = "'" + strOrg + "'";
- }
- OrganizationData[] dataOrganization = OrganizationData.select(this,
vars.getLanguage(),
- sClientID, sOrganID);
-
String strOutput = vars.commandIn("PDF") ? "pdf" : "xls";
String strReportName =
"@basedesign@/org/openbravo/erpCommon/ad_reports/ReportAnnualCertification.jrxml";
- // put address of organization and employer into same data
- for (int i = 0; i < data.length; i++) {
- if (dataOrganization != null && dataOrganization.length > 0) {
- for (int j = 0; j < dataOrganization.length; j++) {
- if (data[i].orgid.equals(dataOrganization[j].adOrgId)) {
- data[i].mittente = dataOrganization[j].adClientIdr;
- data[i].erogante = dataOrganization[j].adClientIdr;
- data[i].addressorganization = dataOrganization[j].cLocationIdr;
- break;
+ OrganizationData[] dataOrganization = null;
+ // populate organization data if report data is available.
+ if (data != null && data.length > 0) {
+ String sClientID = vars.getUserClient();
+ String sOrganID = "";
+ if (strOrg.equals("")) {
+ for (int i = 0; i < data.length; i++) {
+ sOrganID = sOrganID + "'" + data[i].orgid;
+ if (!(i == data.length - 1)) {
+ sOrganID = sOrganID + "',";
+ } else {
+ sOrganID = sOrganID + "'";
+ }
+ }
+
+ } else {
+ sOrganID = "'" + strOrg + "'";
+ }
+ dataOrganization = OrganizationData.select(this, vars.getLanguage(),
sClientID, sOrganID);
+ // put address of organization and employer into same data
+ for (int i = 0; i < data.length; i++) {
+ if (dataOrganization != null && dataOrganization.length > 0) {
+ for (int j = 0; j < dataOrganization.length; j++) {
+ if (data[i].orgid.equals(dataOrganization[j].adOrgId)) {
+ data[i].mittente = dataOrganization[j].adClientIdr;
+ data[i].erogante = dataOrganization[j].adClientIdr;
+ data[i].addressorganization = dataOrganization[j].cLocationIdr;
+ break;
+ }
}
}
}
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
