details: https://code.openbravo.com/erp/devel/pi/rev/8d326d353610 changeset: 32589:8d326d353610 user: Mark <markmm82 <at> gmail.com> date: Wed Aug 23 12:17:49 2017 -0400 summary: Fixes issue 34915: Dimensional Reports does not show values if Org is empty
When Dimensional Reports were executed did not show any value if Organization field was empty. When no organization was selected the session's organization and it childs were taken by default to filter results. It implies that if you had selected a non legal organization in the session, then reports were ignoring records from it parent and brothers. To set homogeneous the behaviour in all these reports, the organization field has been set as required and different than blank. When any organization is selected then an error message is shown explaining it. details: https://code.openbravo.com/erp/devel/pi/rev/4cfe283d85a7 changeset: 32590:4cfe283d85a7 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Fri Aug 25 14:18:39 2017 +0200 summary: Related to issue 34915: Set Organization field mandatory in UI diffstat: src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html | 9 +++++++-- src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html | 9 +++++++-- src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesFilterJR.html | 9 +++++++-- src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html | 9 +++++++-- src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJRFilter.html | 9 +++++++-- 5 files changed, 35 insertions(+), 10 deletions(-) diffs (165 lines): diff -r d66d496bf117 -r 4cfe283d85a7 src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html --- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html Thu Aug 24 13:14:38 2017 -0400 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html Fri Aug 25 14:18:39 2017 +0200 @@ -13,7 +13,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2001-2014 Openbravo SLU + * All portions are Copyright (C) 2001-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -76,6 +76,11 @@ return false; } } + if (frm.inpOrg.value == null || frm.inpOrg.value == "") { + setWindowElementFocus(frm.inpOrg); + showJSMessage(7); + return false; + } if (frm.inpShown.length == 0) { setWindowElementFocus(frm.inpShown); showJSMessage(7); @@ -387,7 +392,7 @@ </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"> + <td class="Combo_ContentCell" colspan="2"> <select name="inpOrg" id="inpOrg" class="ComboKey Combo_TwoCells_width" required="true"> <option value=""> <div id="reportAD_ORGID"></div></option> </select></td> <td class="TitleCell"><span class="LabelText">Product Type</span></td> diff -r d66d496bf117 -r 4cfe283d85a7 src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html --- a/src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html Thu Aug 24 13:14:38 2017 -0400 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html Fri Aug 25 14:18:39 2017 +0200 @@ -13,7 +13,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2001-2015 Openbravo SLU + * All portions are Copyright (C) 2001-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -76,6 +76,11 @@ return false; } } + if (frm.inpOrg.value == null || frm.inpOrg.value == "") { + setWindowElementFocus(frm.inpOrg); + showJSMessage(7); + return false; + } if (frm.inpShown.length == 0) { setWindowElementFocus(frm.inpShown); showJSMessage(7); @@ -414,7 +419,7 @@ </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" onChange="setDefaultCurrency();"> + <td class="Combo_ContentCell" colspan="2"> <select name="inpOrg" id="inpOrg" class="ComboKey Combo_TwoCells_width" required="true" onChange="setDefaultCurrency();"> <option value=""> <div id="reportAD_ORGID"></div></option> </select></td> <td class="ContentCell"></td> diff -r d66d496bf117 -r 4cfe283d85a7 src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesFilterJR.html --- a/src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesFilterJR.html Thu Aug 24 13:14:38 2017 -0400 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesFilterJR.html Fri Aug 25 14:18:39 2017 +0200 @@ -13,7 +13,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2001-2011 Openbravo SLU + * All portions are Copyright (C) 2001-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -76,6 +76,11 @@ return false; } } + if (frm.inpOrg.value == null || frm.inpOrg.value == "") { + setWindowElementFocus(frm.inpOrg); + showJSMessage(7); + return false; + } if (frm.inpShown.length == 0) { setWindowElementFocus(frm.inpShown); showJSMessage(7); @@ -389,7 +394,7 @@ </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"> + <td class="Combo_ContentCell" colspan="2"> <select name="inpOrg" id="inpOrg" class="ComboKey Combo_TwoCells_width" required="true"> <option value=""> <div id="reportAD_ORGID"></div></option> </select></td> <td class="ContentCell"></td> diff -r d66d496bf117 -r 4cfe283d85a7 src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html --- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html Thu Aug 24 13:14:38 2017 -0400 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html Fri Aug 25 14:18:39 2017 +0200 @@ -13,7 +13,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2001-2015 Openbravo SLU + * All portions are Copyright (C) 2001-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -80,6 +80,11 @@ return false; } } + if (frm.inpOrg.value == null || frm.inpOrg.value == "") { + setWindowElementFocus(frm.inpOrg); + showJSMessage(7); + return false; + } if (frm.inpShown.length == 0) { setWindowElementFocus(frm.inpShown); showJSMessage(7); @@ -431,7 +436,7 @@ </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" onChange="setDefaultCurrency();"> + <td class="Combo_ContentCell" colspan="2"> <select name="inpOrg" id="inpOrg" class="ComboKey Combo_TwoCells_width" required="true" onChange="setDefaultCurrency();"> <option value=""> <div id="reportAD_ORGID"></div></option> </select></td> <td class="TitleCell"><span class="LabelText">Warehouse</span></td> diff -r d66d496bf117 -r 4cfe283d85a7 src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJRFilter.html --- a/src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJRFilter.html Thu Aug 24 13:14:38 2017 -0400 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJRFilter.html Fri Aug 25 14:18:39 2017 +0200 @@ -13,7 +13,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2001-2015 Openbravo SLU + * All portions are Copyright (C) 2001-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -87,6 +87,11 @@ return false; } } + if (frm.inpOrg.value == null || frm.inpOrg.value == "") { + setWindowElementFocus(frm.inpOrg); + showJSMessage(7); + return false; + } if (frm.inpShown.length == 0) { setWindowElementFocus(frm.inpShown); showJSMessage(7); @@ -438,7 +443,7 @@ </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" onChange="setDefaultCurrency();"> + <td class="Combo_ContentCell" colspan="2"> <select name="inpOrg" id="inpOrg" class="ComboKey Combo_TwoCells_width" required="true" onChange="setDefaultCurrency();"> <option value=""> <div id="reportAD_ORGID"></div></option> </select></td> <td class="ContentCell"></td> ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
