details: https://code.openbravo.com/erp/devel/pi/rev/94e3b048685e
changeset: 22344:94e3b048685e
user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at>
openbravo.com>
date: Tue Mar 04 20:54:42 2014 +0530
summary: Fixes Issue 25590: Region filter in Sales order report is showing US
regions
diffstat:
src-db/database/sourcedata/AD_REFERENCE.xml | 12 +
src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 16 ++
src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 66
++++++++++
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderFilterJR.html | 16 +-
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderFilterJR.xml | 6 +-
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.java | 15 +--
6 files changed, 109 insertions(+), 22 deletions(-)
diffs (247 lines):
diff -r ba0d445a51cf -r 94e3b048685e src-db/database/sourcedata/AD_REFERENCE.xml
--- a/src-db/database/sourcedata/AD_REFERENCE.xml Tue Mar 04 13:42:29
2014 +0100
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml Tue Mar 04 20:54:42
2014 +0530
@@ -5983,6 +5983,18 @@
<!--CE467008C64E436C979B3CAB4EFF2BC2-->
<ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
<!--CE467008C64E436C979B3CAB4EFF2BC2--></AD_REFERENCE>
+<!--D107D85667864E6E9F8B9D54E6F1EDE5--><AD_REFERENCE>
+<!--D107D85667864E6E9F8B9D54E6F1EDE5-->
<AD_REFERENCE_ID><![CDATA[D107D85667864E6E9F8B9D54E6F1EDE5]]></AD_REFERENCE_ID>
+<!--D107D85667864E6E9F8B9D54E6F1EDE5-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D107D85667864E6E9F8B9D54E6F1EDE5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D107D85667864E6E9F8B9D54E6F1EDE5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D107D85667864E6E9F8B9D54E6F1EDE5--> <NAME><![CDATA[Region
Selector]]></NAME>
+<!--D107D85667864E6E9F8B9D54E6F1EDE5-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D107D85667864E6E9F8B9D54E6F1EDE5-->
<ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--D107D85667864E6E9F8B9D54E6F1EDE5-->
<PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID>
+<!--D107D85667864E6E9F8B9D54E6F1EDE5-->
<ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--D107D85667864E6E9F8B9D54E6F1EDE5--></AD_REFERENCE>
+
<!--D15C950D445D408E8CC8135E530C246B--><AD_REFERENCE>
<!--D15C950D445D408E8CC8135E530C246B-->
<AD_REFERENCE_ID><![CDATA[D15C950D445D408E8CC8135E530C246B]]></AD_REFERENCE_ID>
<!--D15C950D445D408E8CC8135E530C246B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r ba0d445a51cf -r 94e3b048685e
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Tue Mar 04 13:42:29
2014 +0100
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Tue Mar 04 20:54:42
2014 +0530
@@ -507,6 +507,22 @@
<!--B8321631F57E463EB617289E936BAF3A-->
<CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
<!--B8321631F57E463EB617289E936BAF3A--></OBUISEL_SELECTOR>
+<!--B9E2C11BDA924BF8ADF019BA15A11153--><OBUISEL_SELECTOR>
+<!--B9E2C11BDA924BF8ADF019BA15A11153-->
<OBUISEL_SELECTOR_ID><![CDATA[B9E2C11BDA924BF8ADF019BA15A11153]]></OBUISEL_SELECTOR_ID>
+<!--B9E2C11BDA924BF8ADF019BA15A11153-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B9E2C11BDA924BF8ADF019BA15A11153--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B9E2C11BDA924BF8ADF019BA15A11153-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B9E2C11BDA924BF8ADF019BA15A11153--> <NAME><![CDATA[Region
Selector]]></NAME>
+<!--B9E2C11BDA924BF8ADF019BA15A11153-->
<AD_REFERENCE_ID><![CDATA[D107D85667864E6E9F8B9D54E6F1EDE5]]></AD_REFERENCE_ID>
+<!--B9E2C11BDA924BF8ADF019BA15A11153-->
<AD_TABLE_ID><![CDATA[164]]></AD_TABLE_ID>
+<!--B9E2C11BDA924BF8ADF019BA15A11153-->
<AD_COLUMN_ID><![CDATA[856]]></AD_COLUMN_ID>
+<!--B9E2C11BDA924BF8ADF019BA15A11153-->
<OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
+<!--B9E2C11BDA924BF8ADF019BA15A11153--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B9E2C11BDA924BF8ADF019BA15A11153-->
<SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
+<!--B9E2C11BDA924BF8ADF019BA15A11153-->
<POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE>
+<!--B9E2C11BDA924BF8ADF019BA15A11153-->
<CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
+<!--B9E2C11BDA924BF8ADF019BA15A11153--></OBUISEL_SELECTOR>
+
<!--BD1DA40E134A42B9889B529302A96871--><OBUISEL_SELECTOR>
<!--BD1DA40E134A42B9889B529302A96871-->
<OBUISEL_SELECTOR_ID><![CDATA[BD1DA40E134A42B9889B529302A96871]]></OBUISEL_SELECTOR_ID>
<!--BD1DA40E134A42B9889B529302A96871-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r ba0d445a51cf -r 94e3b048685e
src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml Tue Mar 04
13:42:29 2014 +0100
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml Tue Mar 04
20:54:42 2014 +0530
@@ -993,6 +993,28 @@
<!--541F7FD2135848ED854ED1327A06A679-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--541F7FD2135848ED854ED1327A06A679--></OBUISEL_SELECTOR_FIELD>
+<!--55239E9BE9584D69A35D609143DEB47D--><OBUISEL_SELECTOR_FIELD>
+<!--55239E9BE9584D69A35D609143DEB47D-->
<OBUISEL_SELECTOR_FIELD_ID><![CDATA[55239E9BE9584D69A35D609143DEB47D]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--55239E9BE9584D69A35D609143DEB47D-->
<OBUISEL_SELECTOR_ID><![CDATA[B9E2C11BDA924BF8ADF019BA15A11153]]></OBUISEL_SELECTOR_ID>
+<!--55239E9BE9584D69A35D609143DEB47D-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--55239E9BE9584D69A35D609143DEB47D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--55239E9BE9584D69A35D609143DEB47D-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--55239E9BE9584D69A35D609143DEB47D-->
<AD_COLUMN_ID><![CDATA[864]]></AD_COLUMN_ID>
+<!--55239E9BE9584D69A35D609143DEB47D--> <NAME><![CDATA[Name]]></NAME>
+<!--55239E9BE9584D69A35D609143DEB47D--> <DESCRIPTION><![CDATA[A non-unique
identifier for a record/document often used as a search tool.]]></DESCRIPTION>
+<!--55239E9BE9584D69A35D609143DEB47D--> <HELP><![CDATA[A more descriptive
identifier (that does need to be unique) of a record/document that is used as a
default search option along with the search key (that is unique and mostly
shorter). It is up to 60 characters in length.]]></HELP>
+<!--55239E9BE9584D69A35D609143DEB47D--> <PROPERTY><![CDATA[name]]></PROPERTY>
+<!--55239E9BE9584D69A35D609143DEB47D-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--55239E9BE9584D69A35D609143DEB47D--> <SORT><![CDATA[Y]]></SORT>
+<!--55239E9BE9584D69A35D609143DEB47D--> <FILTER><![CDATA[Y]]></FILTER>
+<!--55239E9BE9584D69A35D609143DEB47D-->
<SEARCHINSUGGESTIONBOX><![CDATA[Y]]></SEARCHINSUGGESTIONBOX>
+<!--55239E9BE9584D69A35D609143DEB47D--> <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--55239E9BE9584D69A35D609143DEB47D--> <SORTNO><![CDATA[10]]></SORTNO>
+<!--55239E9BE9584D69A35D609143DEB47D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--55239E9BE9584D69A35D609143DEB47D--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--55239E9BE9584D69A35D609143DEB47D-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--55239E9BE9584D69A35D609143DEB47D--></OBUISEL_SELECTOR_FIELD>
+
<!--5545248A63EC4FB1833AB17C07C5542C--><OBUISEL_SELECTOR_FIELD>
<!--5545248A63EC4FB1833AB17C07C5542C-->
<OBUISEL_SELECTOR_FIELD_ID><![CDATA[5545248A63EC4FB1833AB17C07C5542C]]></OBUISEL_SELECTOR_FIELD_ID>
<!--5545248A63EC4FB1833AB17C07C5542C-->
<OBUISEL_SELECTOR_ID><![CDATA[862F54CB1B074513BD791C6789F4AA42]]></OBUISEL_SELECTOR_ID>
@@ -1384,6 +1406,28 @@
<!--797E2E6C7A6D4A349491B85A1C1ACB7D-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--797E2E6C7A6D4A349491B85A1C1ACB7D--></OBUISEL_SELECTOR_FIELD>
+<!--79F3384609CC4228B019DC9135286EA0--><OBUISEL_SELECTOR_FIELD>
+<!--79F3384609CC4228B019DC9135286EA0-->
<OBUISEL_SELECTOR_FIELD_ID><![CDATA[79F3384609CC4228B019DC9135286EA0]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--79F3384609CC4228B019DC9135286EA0-->
<OBUISEL_SELECTOR_ID><![CDATA[B9E2C11BDA924BF8ADF019BA15A11153]]></OBUISEL_SELECTOR_ID>
+<!--79F3384609CC4228B019DC9135286EA0-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--79F3384609CC4228B019DC9135286EA0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--79F3384609CC4228B019DC9135286EA0-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--79F3384609CC4228B019DC9135286EA0-->
<AD_COLUMN_ID><![CDATA[865]]></AD_COLUMN_ID>
+<!--79F3384609CC4228B019DC9135286EA0--> <NAME><![CDATA[Description]]></NAME>
+<!--79F3384609CC4228B019DC9135286EA0--> <DESCRIPTION><![CDATA[A space to
write additional related information.]]></DESCRIPTION>
+<!--79F3384609CC4228B019DC9135286EA0--> <HELP><![CDATA[A description is
limited to 255 characters.]]></HELP>
+<!--79F3384609CC4228B019DC9135286EA0-->
<PROPERTY><![CDATA[description]]></PROPERTY>
+<!--79F3384609CC4228B019DC9135286EA0-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--79F3384609CC4228B019DC9135286EA0--> <SORT><![CDATA[Y]]></SORT>
+<!--79F3384609CC4228B019DC9135286EA0--> <FILTER><![CDATA[Y]]></FILTER>
+<!--79F3384609CC4228B019DC9135286EA0-->
<SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--79F3384609CC4228B019DC9135286EA0--> <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--79F3384609CC4228B019DC9135286EA0--> <SORTNO><![CDATA[20]]></SORTNO>
+<!--79F3384609CC4228B019DC9135286EA0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--79F3384609CC4228B019DC9135286EA0--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--79F3384609CC4228B019DC9135286EA0-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--79F3384609CC4228B019DC9135286EA0--></OBUISEL_SELECTOR_FIELD>
+
<!--7A814E72DF9240E280BA6B2AEFF9405A--><OBUISEL_SELECTOR_FIELD>
<!--7A814E72DF9240E280BA6B2AEFF9405A-->
<OBUISEL_SELECTOR_FIELD_ID><![CDATA[7A814E72DF9240E280BA6B2AEFF9405A]]></OBUISEL_SELECTOR_FIELD_ID>
<!--7A814E72DF9240E280BA6B2AEFF9405A-->
<OBUISEL_SELECTOR_ID><![CDATA[2E64F551C7C4470C80C29DBA24B34A5F]]></OBUISEL_SELECTOR_ID>
@@ -2666,6 +2710,28 @@
<!--EB0A95320BF845DD8146274BE02DABBC-->
<SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
<!--EB0A95320BF845DD8146274BE02DABBC--></OBUISEL_SELECTOR_FIELD>
+<!--EC506629A62741D0B4BECED153FD8526--><OBUISEL_SELECTOR_FIELD>
+<!--EC506629A62741D0B4BECED153FD8526-->
<OBUISEL_SELECTOR_FIELD_ID><![CDATA[EC506629A62741D0B4BECED153FD8526]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--EC506629A62741D0B4BECED153FD8526-->
<OBUISEL_SELECTOR_ID><![CDATA[B9E2C11BDA924BF8ADF019BA15A11153]]></OBUISEL_SELECTOR_ID>
+<!--EC506629A62741D0B4BECED153FD8526-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EC506629A62741D0B4BECED153FD8526--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EC506629A62741D0B4BECED153FD8526-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EC506629A62741D0B4BECED153FD8526-->
<AD_COLUMN_ID><![CDATA[866]]></AD_COLUMN_ID>
+<!--EC506629A62741D0B4BECED153FD8526--> <NAME><![CDATA[Country]]></NAME>
+<!--EC506629A62741D0B4BECED153FD8526--> <DESCRIPTION><![CDATA[A state or a
nation.]]></DESCRIPTION>
+<!--EC506629A62741D0B4BECED153FD8526--> <HELP><![CDATA[The Country defines a
Country. Each Country must be defined before it can be used in any
document.]]></HELP>
+<!--EC506629A62741D0B4BECED153FD8526-->
<PROPERTY><![CDATA[country._identifier]]></PROPERTY>
+<!--EC506629A62741D0B4BECED153FD8526-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--EC506629A62741D0B4BECED153FD8526--> <SORT><![CDATA[Y]]></SORT>
+<!--EC506629A62741D0B4BECED153FD8526--> <FILTER><![CDATA[Y]]></FILTER>
+<!--EC506629A62741D0B4BECED153FD8526-->
<SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--EC506629A62741D0B4BECED153FD8526--> <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--EC506629A62741D0B4BECED153FD8526--> <SORTNO><![CDATA[40]]></SORTNO>
+<!--EC506629A62741D0B4BECED153FD8526--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EC506629A62741D0B4BECED153FD8526--> <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--EC506629A62741D0B4BECED153FD8526-->
<SHOWINPICKLIST><![CDATA[Y]]></SHOWINPICKLIST>
+<!--EC506629A62741D0B4BECED153FD8526--></OBUISEL_SELECTOR_FIELD>
+
<!--EDADAD64A1634FDEA50343CE1AAAF1FB--><OBUISEL_SELECTOR_FIELD>
<!--EDADAD64A1634FDEA50343CE1AAAF1FB-->
<OBUISEL_SELECTOR_FIELD_ID><![CDATA[EDADAD64A1634FDEA50343CE1AAAF1FB]]></OBUISEL_SELECTOR_FIELD_ID>
<!--EDADAD64A1634FDEA50343CE1AAAF1FB-->
<OBUISEL_SELECTOR_ID><![CDATA[EB3C41F0973A4EDA91E475833792A6D4]]></OBUISEL_SELECTOR_ID>
diff -r ba0d445a51cf -r 94e3b048685e
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderFilterJR.html
--- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderFilterJR.html
Tue Mar 04 13:42:29 2014 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderFilterJR.html
Tue Mar 04 20:54:42 2014 +0530
@@ -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) 2007-2012 Openbravo SLU
+ * All portions are Copyright (C) 2007-2014 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -40,6 +40,9 @@
<script language="JavaScript"
src="../../../../../web/js/default/MessageBox.js"
type="text/javascript"></script>
<script language="JavaScript" src="../../../../../web/js/messages.js"
type="text/javascript"></script>
<script language="JavaScript" src="../utility/DynamicJS.js"
type="text/javascript"></script>
+ <script language="JavaScript"
src="../../../../../web/org.openbravo.userinterface.selector/js/classic-skin-variable.js"
type="text/javascript"></script>
+ <script language="JavaScript"
src="../../../../../web/../org.openbravo.client.kernel/OBCLKER_Kernel/StaticResources"
type="text/javascript"></script>
+ <script language="JavaScript" src="../../../../../web/js/calculator.js"
type="text/javascript"></script>
<script language="JavaScript"
src="../../../../../web/js/jscalendar/calendar.js"
type="text/javascript"></script>
<script language="JavaScript"
src="../../../../../web/js/jscalendar/lang/calendar-es.js"
type="text/javascript" id="fieldCalendar"></script>
<script language="JavaScript"
src="../../../../../web/js/default/DateTextBox.js"
type="text/javascript"></script>
@@ -544,8 +547,15 @@
<td class="TitleCell"><span
class="LabelText">Region</span></td>
<td class="Dimension_ContentCell" colspan="2">
- <select name="inpcRegionId" multiple=""
id="reportC_REGIONID" class="Dimension_LeftSelect_width
Dimension_LeftSelect_height">
- </select>
+ <table style="border:0px;border-collapse:collapse;">
+ <tr>
+ <td style="padding-top: 0px;">
+ <script>var sc_C_Region_ID = null;</script>
+ <input type="hidden" name="inpcRegionId"
identifier="" id="C_Region_ID" value=""
onreset="sc_C_Region_ID.resetSelector();"
onchange="openbravo.Utilities.updateSmartClientComponentValue(this,
sc_C_Region_ID.selectorField);"></input>
+ <script id="selectorLink"
src="../org.openbravo.client.kernel/OBUISEL_Selector/B9E2C11BDA924BF8ADF019BA15A11153?columnName=C_Region_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&required=false"></script>
+ </td>
+ </tr>
+ </table>
</td>
</tr>
diff -r ba0d445a51cf -r 94e3b048685e
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderFilterJR.xml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderFilterJR.xml
Tue Mar 04 13:42:29 2014 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderFilterJR.xml
Tue Mar 04 20:54:42 2014 +0530
@@ -12,7 +12,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) 2007-2012 Openbravo SLU
+* All portions are Copyright (C) 2007-2014 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -34,7 +34,6 @@
<PARAMETER id="C_Project_ID_D" name="projectName" attribute="value"/>
<PARAMETER id="paramBPartnerId" name="paramBPartnerId" attribute="value"/>
<PARAMETER id="paramM_PRODUCTCATEGORY_ID" name="mProductCatId" attribute=""/>
- <PARAMETER id="paramC_REGION_ID" name="cRegionId" attribute=""/>
<PARAMETER id="paramBPartnerDescription" name="paramBPartnerDescription"
attribute="value"/>
<PARAMETER id="paramCSS" name="theme" attribute="href" replace="Default"/>
<PARAMETER id="tdleftTabs" name="leftTabs" default=""/>
@@ -53,9 +52,6 @@
<SUBREPORT id="reportC_PRODUCTCATREGORY" name="reportC_PRODUCTCATREGORY"
report="org/openbravo/erpCommon/reference/List">
<ARGUMENT name="parameterListSelected" withId="paramM_PRODUCTCATEGORY_ID"/>
</SUBREPORT>
-<SUBREPORT id="reportC_REGIONID" name="reportC_REGIONID"
report="org/openbravo/erpCommon/reference/List">
- <ARGUMENT name="parameterListSelected" withId="paramC_REGION_ID"/>
-</SUBREPORT>
<SUBREPORT id="reportMProductId_IN" name="reportMProductId_IN"
report="org/openbravo/erpCommon/reference/List">
<ARGUMENT name="parameterListSelected" withId="paramVacio"/>
</SUBREPORT>
diff -r ba0d445a51cf -r 94e3b048685e
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.java Tue Mar
04 13:42:29 2014 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.java Tue Mar
04 20:54:42 2014 +0530
@@ -11,7 +11,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) 2007-2012 Openbravo SLU
+ * All portions are Copyright (C) 2007-2014 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -142,7 +142,6 @@
xmlDocument.setParameter("mWarehouseId", strmWarehouseId);
xmlDocument.setParameter("cProjectId", strcProjectId);
xmlDocument.setParameter("projectName",
OrderEditionData.selectProject(this, strcProjectId));
- xmlDocument.setParameter("cRegionId", "");
xmlDocument.setParameter("mProductCatId", "");
try {
ComboTableData comboTableData = new ComboTableData(vars, this,
"TABLEDIR", "M_Warehouse_ID",
@@ -155,18 +154,6 @@
throw new ServletException(ex);
}
- try {
- ComboTableData comboTableData = new ComboTableData(vars, this,
"TABLEDIR", "C_Region_ID", "",
- "C_Region of Country", Utility.getContext(this, vars,
"#AccessibleOrgTree",
- "SalesOrderFilterJR"), Utility.getContext(this, vars,
"#User_Client",
- "SalesOrderFilterJR"), 0);
- Utility.fillSQLParameters(this, vars, null, comboTableData,
"SalesOrderFilterJR", "");
- xmlDocument.setData("reportC_REGIONID", "liststructure",
comboTableData.select(false));
- comboTableData = null;
- } catch (Exception ex) {
- throw new ServletException(ex);
- }
-
xmlDocument.setParameter("ccurrencyid", strCurrencyId);
try {
ComboTableData comboTableData = new ComboTableData(vars, this,
"TABLEDIR", "C_Currency_ID",
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
