details: /erp/stable/2.50/rev/914fc4a8c9a5
changeset: 9550:914fc4a8c9a5
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Mon Jun 20 11:12:48 2011 +0200
summary: Fixes issue 17633: Sales Invoice Dimensional Report can't be
filtered by "*"
details: /erp/stable/2.50/rev/292886d4a156
changeset: 9551:292886d4a156
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Mon Jun 27 09:32:18 2011 +0200
summary: Fixes issue 17582: Mat.Rec.Dim. Report doesn't have organization
filter
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
| 16 +++++++-
src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html
| 10 +++++-
src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR.java
| 17 ++++++++-
3 files changed, 36 insertions(+), 7 deletions(-)
diffs (87 lines):
diff -r 2c134704328d -r 292886d4a156
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
---
a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
Thu Jun 30 09:19:01 2011 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java
Mon Jun 27 09:32:18 2011 +0200
@@ -31,7 +31,6 @@
import org.openbravo.base.filter.IsPositiveIntFilter;
import org.openbravo.base.secureApp.HttpSecureAppServlet;
import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
import org.openbravo.erpCommon.businessUtility.Tree;
import org.openbravo.erpCommon.businessUtility.TreeData;
import org.openbravo.erpCommon.businessUtility.WindowTabs;
@@ -307,8 +306,19 @@
throw new ServletException(ex);
}
- xmlDocument.setData("reportAD_ORGID", "liststructure",
OrganizationComboData.selectCombo(this,
- vars.getRole()));
+ try {
+ ComboTableData comboTableData = new ComboTableData(vars, this,
"TABLEDIR", "AD_Org_ID", "",
+ "", Utility.getContext(this, vars, "#AccessibleOrgTree",
+ "ReportInvoiceCustomerDimensionalAnalysesJR"),
Utility.getContext(this, vars,
+ "#User_Client", "ReportInvoiceCustomerDimensionalAnalysesJR"),
0);
+ Utility.fillSQLParameters(this, vars, null, comboTableData,
+ "ReportInvoiceCustomerDimensionalAnalysesJR", strOrg);
+ xmlDocument.setData("reportAD_ORGID", "liststructure",
comboTableData.select(false));
+ comboTableData = null;
+
+ } catch (Exception ex) {
+ throw new ServletException(ex);
+ }
xmlDocument.setData("reportCBPartnerId_IN", "liststructure",
SelectorUtilityData
.selectBpartner(this, Utility.getContext(this, vars,
"#AccessibleOrgTree", ""), Utility
.getContext(this, vars, "#User_Client", ""), strcBpartnerId));
diff -r 2c134704328d -r 292886d4a156
src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html
---
a/src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html
Thu Jun 30 09:19:01 2011 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html
Mon Jun 27 09:32:18 2011 +0200
@@ -386,7 +386,15 @@
</table>
</td>
</tr>
-
+ <tr>
+ <td class="TitleCell"><span
class="LabelText">Organization</span></td>
+ <td class="Combo_ContentCell" colspan="2"> <select
name="inpOrg" id="inpOrg" class="Combo Combo_TwoCells_width">
+ <option value=""> <div
id="reportAD_ORGID"></div></option>
+ </select></td>
+ <td class="ContentCell"></td>
+ <td class="TitleCell"></td>
+ <td class="ContentCell"></td>
+ </tr>
<tr>
<td class="TitleCell"><span class="LabelText">Business
Partner Group</span></td>
<td class="Combo_ContentCell" colspan="2"><select
name="inpPartnerGroup" id="inpPartnerGroup2" class="Combo Combo_TwoCells_width">
diff -r 2c134704328d -r 292886d4a156
src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR.java
---
a/src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR.java
Thu Jun 30 09:19:01 2011 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR.java
Mon Jun 27 09:32:18 2011 +0200
@@ -31,7 +31,6 @@
import org.openbravo.base.filter.IsPositiveIntFilter;
import org.openbravo.base.secureApp.HttpSecureAppServlet;
import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
import org.openbravo.erpCommon.businessUtility.Tree;
import org.openbravo.erpCommon.businessUtility.TreeData;
import org.openbravo.erpCommon.businessUtility.WindowTabs;
@@ -281,8 +280,20 @@
throw new ServletException(ex);
}
- xmlDocument.setData("reportAD_ORGID", "liststructure",
OrganizationComboData.selectCombo(this,
- vars.getRole()));
+ try {
+ ComboTableData comboTableData = new ComboTableData(vars, this,
"TABLEDIR", "AD_Org_ID", "",
+ "", Utility.getContext(this, vars, "#AccessibleOrgTree",
+ "ReportMaterialDimensionalAnalyzeJR"), Utility.getContext(this,
vars, "#User_Client",
+ "ReportMaterialDimensionalAnalyzeJR"), 0);
+ Utility.fillSQLParameters(this, vars, null, comboTableData,
+ "ReportMaterialDimensionalAnalyzeJR", strOrg);
+ xmlDocument.setData("reportAD_ORGID", "liststructure",
comboTableData.select(false));
+ comboTableData = null;
+
+ } catch (Exception ex) {
+ throw new ServletException(ex);
+ }
+
xmlDocument.setData("reportCBPartnerId_IN", "liststructure",
SelectorUtilityData
.selectBpartner(this, Utility.getContext(this, vars,
"#AccessibleOrgTree", ""), Utility
.getContext(this, vars, "#User_Client", ""), strcBpartnerId));
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
