CI: promote changesets from pi to main
authorRM packaging bot <staff.rm@openbravo.com>
Mon, 11 Oct 2010 13:18:07 +0000
changeset 8516 f03dfdd6ea87
parent 8512 d0357aced767 (current diff)
parent 8515 979c2d69343d (diff)
child 8520 0b4e4ae24456
CI: promote changesets from pi to main
src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/model/tables/AD_USER.xml	Sat Oct 09 12:43:47 2010 +0000
+++ b/src-db/database/model/tables/AD_USER.xml	Mon Oct 11 13:18:07 2010 +0000
@@ -152,7 +152,7 @@
       <foreign-key foreignTable="AD_ORG" name="AD_USER_AD_ORGTRX">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_BPARTNER" name="AD_USER_C_BPARTNER">
+      <foreign-key foreignTable="C_BPARTNER" name="AD_USER_C_BPARTNER" onDelete="cascade">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_BPARTNER_LOCATION" name="AD_USER_C_BPARTNER_LOCATION">
--- a/src-db/database/sourcedata/AD_MODULE.xml	Sat Oct 09 12:43:47 2010 +0000
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Mon Oct 11 13:18:07 2010 +0000
@@ -6,7 +6,7 @@
 <!--0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0-->  <NAME><![CDATA[Core]]></NAME>
-<!--0-->  <VERSION><![CDATA[2.50.18511]]></VERSION>
+<!--0-->  <VERSION><![CDATA[2.50.18515]]></VERSION>
 <!--0-->  <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
 <!--0-->  <HELP><![CDATA[Core module is the base one, all developments in core are included as part of the standard Openbravo ERP.]]></HELP>
 <!--0-->  <URL><![CDATA[www.openbravo.com]]></URL>
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Sat Oct 09 12:43:47 2010 +0000
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Mon Oct 11 13:18:07 2010 +0000
@@ -1988,17 +1988,6 @@
 <!--802541-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802541--></AD_TEXTINTERFACES>
 
-<!--802564--><AD_TEXTINTERFACES>
-<!--802564-->  <AD_TEXTINTERFACES_ID><![CDATA[802564]]></AD_TEXTINTERFACES_ID>
-<!--802564-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--802564-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--802564-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--802564-->  <TEXT><![CDATA[Organization1]]></TEXT>
-<!--802564-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.html]]></FILENAME>
-<!--802564-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--802564-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--802564--></AD_TEXTINTERFACES>
-
 <!--802571--><AD_TEXTINTERFACES>
 <!--802571-->  <AD_TEXTINTERFACES_ID><![CDATA[802571]]></AD_TEXTINTERFACES_ID>
 <!--802571-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.html	Sat Oct 09 12:43:47 2010 +0000
+++ b/src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.html	Mon Oct 11 13:18:07 2010 +0000
@@ -307,9 +307,9 @@
                     </table>
                   </td>
                   <td class="TitleCell"><span class="LabelText">Organization</span></td>
-                  <td class="Combo_ContentCell" colspan="2"> <select name="organization" id="organization" class="Combo Combo_TwoCells_width">
-                  <option value=""></option><div id="sectionOrganizacion">
-                  <option value="es" id="fieldClaveOrganizacion">Organization1</option></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>
                 </tr>
 
                 <tr>
--- a/src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.java	Sat Oct 09 12:43:47 2010 +0000
+++ b/src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.java	Mon Oct 11 13:18:07 2010 +0000
@@ -32,13 +32,13 @@
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.dal.core.OBContext;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
 import org.openbravo.erpCommon.businessUtility.BpartnerMiscData;
 import org.openbravo.erpCommon.businessUtility.Preferences;
 import org.openbravo.erpCommon.businessUtility.Tax;
 import org.openbravo.erpCommon.businessUtility.WindowTabs;
 import org.openbravo.erpCommon.reference.ActionButtonData;
 import org.openbravo.erpCommon.reference.PInstanceProcessData;
+import org.openbravo.erpCommon.utility.ComboTableData;
 import org.openbravo.erpCommon.utility.DateTimeData;
 import org.openbravo.erpCommon.utility.LeftTabsBar;
 import org.openbravo.erpCommon.utility.NavigationBar;
@@ -67,7 +67,8 @@
 
     if (vars.commandIn("DEFAULT")) {
       String strCompleteAuto = vars.getStringParameter("inpShowNullComplete", "Y");
-      printPage(response, vars, "", "", "", "", "", strCompleteAuto);
+      String strOrganization = vars.getGlobalVariable("inpadOrgId", "ExpenseSOrder.adOrgId", "");
+      printPage(response, vars, "", "", "", "", strOrganization, strCompleteAuto);
     } else if (vars.commandIn("SAVE")) {
       String strBPartner = vars.getStringParameter("inpcBpartnerId");
       String strDatefrom = vars.getStringParameter("inpDateFrom");
@@ -536,8 +537,17 @@
     xmlDocument.setParameter("dateOrddisplayFormat", vars.getSessionValue("#AD_SqlDateFormat"));
     xmlDocument.setParameter("dateOrdsaveFormat", vars.getSessionValue("#AD_SqlDateFormat"));
     xmlDocument.setParameter("paramShowNullComplete", strCompleteAuto);
-    xmlDocument
-        .setData("structureOrganizacion", OrganizationComboData.select(this, vars.getRole()));
+    try{
+   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ExpenseSOrder"), Utility
+   	              .getContext(this, vars, "#User_Client", "ExpenseSOrder"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ExpenseSOrder", strOrganization);
+   	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
+
+   }catch (Exception ex) {
+   	 throw new ServletException(ex);
+	}
 
     // New interface parameters
     try {
--- a/src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.xml	Sat Oct 09 12:43:47 2010 +0000
+++ b/src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.xml	Mon Oct 11 13:18:07 2010 +0000
@@ -49,9 +49,7 @@
 	<PARAMETER id="messageBoxIDTitle" name="messageTitle" default=""/>
 	<PARAMETER id="messageBoxIDMessage" name="messageMessage" default=""/>
 	<DISCARD id="discard"/>
-	<structure name="structureOrganizacion">
-		<FIELD id="fieldClaveOrganizacion" attribute="value" boolean="selected" withId="paramadOrgId">adOrgId</FIELD>
-		<FIELD id="fieldClaveOrganizacion">name</FIELD>
-		<SECTION id="sectionOrganizacion"/>
-	</structure>
+	<SUBREPORT id="reportAD_ORGID" name="reportAD_ORGID" report="org/openbravo/erpCommon/reference/List">
+      <ARGUMENT name="parameterListSelected" withId="paramAD_ORGID"/>
+    </SUBREPORT>
 </REPORT>
--- a/src/org/openbravo/erpCommon/ad_process/ChangeOrderOrg.java	Sat Oct 09 12:43:47 2010 +0000
+++ b/src/org/openbravo/erpCommon/ad_process/ChangeOrderOrg.java	Mon Oct 11 13:18:07 2010 +0000
@@ -31,7 +31,6 @@
 import org.openbravo.base.filter.IsIDFilter;
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
 import org.openbravo.erpCommon.businessUtility.WindowTabs;
 import org.openbravo.erpCommon.utility.ComboTableData;
 import org.openbravo.erpCommon.utility.LeftTabsBar;
@@ -261,11 +260,28 @@
     xmlDocument.setParameter("shipperpath", strShipperpath);
     xmlDocument.setParameter("tax", strTax);
     xmlDocument.setParameter("bpartnerDes", ChangeOrderOrgData.selectBPartner(this, strBPartner));
+    try{
+   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ChangeOrderOrg"), Utility
+   	              .getContext(this, vars, "#User_Client", "ChangeOrderOrg"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ChangeOrderOrg", strOrg);
+   	      xmlDocument.setData("reportAD_Org_ID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
 
-    xmlDocument.setData("reportAD_Org_ID", "liststructure", OrganizationComboData.selectCombo(this,
-        vars.getRole()));
-    xmlDocument.setData("reportAD_Org_IDNew", "liststructure", OrganizationComboData.selectCombo(
-        this, vars.getRole()));
+   }catch (Exception ex) {
+   	 throw new ServletException(ex);
+	}
+   try{
+	   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+	   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ChangeOrderOrg"), Utility
+	   	              .getContext(this, vars, "#User_Client", "ChangeOrderOrg"), 0);
+	   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ChangeOrderOrg", strOrg);
+	   	      xmlDocument.setData("reportAD_Org_IDNew", "liststructure", comboTableData.select(false));
+	   	      comboTableData = null;
+
+	   }catch (Exception ex) {
+	   	 throw new ServletException(ex);
+		}
 
     try {
       ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "C_Tax_ID", "",
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java	Sat Oct 09 12:43:47 2010 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java	Mon Oct 11 13:18:07 2010 +0000
@@ -28,7 +28,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;
@@ -271,9 +270,17 @@
     } catch (Exception ex) {
       throw new ServletException(ex);
     }
+    try{
+   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportInvoiceVendorDimensionalAnalysesJR"), Utility
+   	              .getContext(this, vars, "#User_Client", "ReportInvoiceVendorDimensionalAnalysesJR"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportInvoiceVendorDimensionalAnalysesJR", strOrg);
+   	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
 
-    xmlDocument.setData("reportAD_ORGID", "liststructure", OrganizationComboData.selectCombo(this,
-        vars.getRole()));
+   }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));
--- a/src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoiceJR.java	Sat Oct 09 12:43:47 2010 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoiceJR.java	Mon Oct 11 13:18:07 2010 +0000
@@ -28,7 +28,6 @@
 
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
 import org.openbravo.erpCommon.businessUtility.WindowTabs;
 import org.openbravo.erpCommon.utility.ComboTableData;
 import org.openbravo.erpCommon.utility.DateTimeData;
@@ -163,9 +162,17 @@
     } catch (Exception ex) {
       throw new ServletException(ex);
     }
+    try{
+   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportOrderNotInvoiceJR"), Utility
+   	              .getContext(this, vars, "#User_Client", "ReportOrderNotInvoiceJR"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportOrderNotInvoiceJR", strCOrgId);
+   	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
 
-    xmlDocument.setData("reportAD_ORGID", "liststructure", OrganizationComboData.selectCombo(this,
-        vars.getRole()));
+   }catch (Exception ex) {
+   	 throw new ServletException(ex);
+	}
     response.setContentType("text/html; charset=UTF-8");
     PrintWriter out = response.getWriter();
     out.println(xmlDocument.print());
--- a/src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesJR.java	Sat Oct 09 12:43:47 2010 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesJR.java	Mon Oct 11 13:18:07 2010 +0000
@@ -32,7 +32,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;
@@ -282,9 +281,17 @@
     } catch (Exception ex) {
       throw new ServletException(ex);
     }
+    try{
+    	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+    	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportPurchaseDimensionalAnalysesJR"), Utility
+    	              .getContext(this, vars, "#User_Client", "ReportPurchaseDimensionalAnalysesJR"), 0);
+    	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportPurchaseDimensionalAnalysesJR", strOrg);
+    	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+    	      comboTableData = null;
 
-    xmlDocument.setData("reportAD_ORGID", "liststructure", OrganizationComboData.selectCombo(this,
-        vars.getRole()));
+    }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));
--- a/src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalyses.java	Sat Oct 09 12:43:47 2010 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalyses.java	Mon Oct 11 13:18:07 2010 +0000
@@ -32,7 +32,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;
@@ -265,9 +264,17 @@
     } catch (Exception ex) {
       throw new ServletException(ex);
     }
+    try{
+   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportRefundSalesDimensionalAnalyses"), Utility
+   	              .getContext(this, vars, "#User_Client", "ReportRefundSalesDimensionalAnalyses"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportRefundSalesDimensionalAnalyses", strOrg);
+   	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
 
-    xmlDocument.setData("reportAD_ORGID", "liststructure", OrganizationComboData.selectCombo(this,
-        vars.getRole()));
+   }catch (Exception ex) {
+   	 throw new ServletException(ex);
+	}
     try {
       ComboTableData comboTableData = new ComboTableData(vars, this, "TABLE", "SalesRep_ID",
           "AD_User SalesRep", "", Utility.getContext(this, vars, "#AccessibleOrgTree",
--- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java	Sat Oct 09 12:43:47 2010 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java	Mon Oct 11 13:18:07 2010 +0000
@@ -32,7 +32,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;
@@ -316,9 +315,17 @@
     } catch (Exception ex) {
       throw new ServletException(ex);
     }
+    try{
+   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportSalesDimensionalAnalyzeJR"), Utility
+   	              .getContext(this, vars, "#User_Client", "ReportSalesDimensionalAnalyzeJR"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportSalesDimensionalAnalyzeJR", strOrg);
+   	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
 
-    xmlDocument.setData("reportAD_ORGID", "liststructure", OrganizationComboData.selectCombo(this,
-        vars.getRole()));
+   }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));
--- a/src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java	Sat Oct 09 12:43:47 2010 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java	Mon Oct 11 13:18:07 2010 +0000
@@ -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;
@@ -325,9 +324,17 @@
     } catch (Exception ex) {
       throw new ServletException(ex);
     }
+    try{
+   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportShipmentDimensionalAnalyzeJR"), Utility
+   	              .getContext(this, vars, "#User_Client", "ReportShipmentDimensionalAnalyzeJR"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportShipmentDimensionalAnalyzeJR", strOrg);
+   	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
 
-    xmlDocument.setData("reportAD_ORGID", "liststructure", OrganizationComboData.selectCombo(this,
-        vars.getRole()));
+   }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));
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoice.java	Sat Oct 09 12:43:47 2010 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoice.java	Mon Oct 11 13:18:07 2010 +0000
@@ -27,10 +27,10 @@
 
 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;
+import org.openbravo.erpCommon.utility.ComboTableData;
 import org.openbravo.erpCommon.utility.DateTimeData;
 import org.openbravo.erpCommon.utility.LeftTabsBar;
 import org.openbravo.erpCommon.utility.NavigationBar;
@@ -331,8 +331,17 @@
      * .setData("reportAD_ORGID","liststructure",AdOrgTreeComboData .select(this, strTreeNode,
      * vars.getOrg()));
      */
-    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", "ReportTaxInvoice"), Utility
+   	              .getContext(this, vars, "#User_Client", "ReportTaxInvoice"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportTaxInvoice", strOrg);
+   	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
+
+   }catch (Exception ex) {
+   	 throw new ServletException(ex);
+	}
 
     out.println(xmlDocument.print());
     out.close();
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceJR.java	Sat Oct 09 12:43:47 2010 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceJR.java	Mon Oct 11 13:18:07 2010 +0000
@@ -32,7 +32,6 @@
 
 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,17 @@
      * .setData("reportAD_ORGID","liststructure",AdOrgTreeComboData .select(this, strTreeNode,
      * vars.getOrg()));
      */
-    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", "ReportTaxInvoiceJR"), Utility
+   	              .getContext(this, vars, "#User_Client", "ReportTaxInvoiceJR"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportTaxInvoiceJR", strOrg);
+   	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
+
+   }catch (Exception ex) {
+   	 throw new ServletException(ex);
+	}
 
     out.println(xmlDocument.print());
     out.close();