details: http://code.openbravo.com/erp/devel/pi/rev/686fcc745dde changeset: 4379:686fcc745dde user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Mon Jul 20 14:44:56 2009 +0200 summary: Fixed 9964: Remove more cross dependencies between reports
details: http://code.openbravo.com/erp/devel/pi/rev/9453062fdcbb changeset: 4380:9453062fdcbb user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Mon Jul 20 14:45:56 2009 +0200 summary: Merge diffstat: src-db/database/sourcedata/AD_FIELD.xml | 8 ++-- src-db/database/sourcedata/AD_MENU.xml | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalPDF.java | 12 ++---- src/org/openbravo/erpCommon/ad_reports/ReportRefundInvoiceCustomerDimensionalAnalyses.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoicedJasper.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvidedJR.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java | 5 +- 7 files changed, 15 insertions(+), 20 deletions(-) diffs (130 lines): diff -r e82f8f4f93e5 -r 9453062fdcbb src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Mon Jul 20 13:51:34 2009 +0200 +++ b/src-db/database/sourcedata/AD_FIELD.xml Mon Jul 20 14:45:56 2009 +0200 @@ -181653,7 +181653,7 @@ <!--00A85624B62A4151B3B1F5087CD5DE8B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--00A85624B62A4151B3B1F5087CD5DE8B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--00A85624B62A4151B3B1F5087CD5DE8B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--00A85624B62A4151B3B1F5087CD5DE8B--> <NAME><![CDATA[Create New Account for Business Partner]]></NAME> +<!--00A85624B62A4151B3B1F5087CD5DE8B--> <NAME><![CDATA[Create New Account for Business Parnter]]></NAME> <!--00A85624B62A4151B3B1F5087CD5DE8B--> <DESCRIPTION><![CDATA[Create the new account for Business Partner]]></DESCRIPTION> <!--00A85624B62A4151B3B1F5087CD5DE8B--> <HELP><![CDATA[This flag is used to intimating the system for create the new sub-account for Business Partner.]]></HELP> <!--00A85624B62A4151B3B1F5087CD5DE8B--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> @@ -181909,8 +181909,8 @@ <!--3B2FB0D60D9E415882891E141C94A101--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--3B2FB0D60D9E415882891E141C94A101--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--3B2FB0D60D9E415882891E141C94A101--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--3B2FB0D60D9E415882891E141C94A101--> <NAME><![CDATA[Create New Account for Product]]></NAME> -<!--3B2FB0D60D9E415882891E141C94A101--> <DESCRIPTION><![CDATA[Create New Account for Product]]></DESCRIPTION> +<!--3B2FB0D60D9E415882891E141C94A101--> <NAME><![CDATA[Create New Acount for Product]]></NAME> +<!--3B2FB0D60D9E415882891E141C94A101--> <DESCRIPTION><![CDATA[Create New Acount for Product]]></DESCRIPTION> <!--3B2FB0D60D9E415882891E141C94A101--> <HELP><![CDATA[This flag is used to intimating the system for create the new sub-account for Product.]]></HELP> <!--3B2FB0D60D9E415882891E141C94A101--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--3B2FB0D60D9E415882891E141C94A101--> <AD_TAB_ID><![CDATA[7580F9AE37704571BB0D3935252CAC5A]]></AD_TAB_ID> @@ -191636,7 +191636,7 @@ <!--F9EFB543E0244AB090036F2EA6959122--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--F9EFB543E0244AB090036F2EA6959122--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--F9EFB543E0244AB090036F2EA6959122--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--F9EFB543E0244AB090036F2EA6959122--> <NAME><![CDATA[Sequence for Business Partner]]></NAME> +<!--F9EFB543E0244AB090036F2EA6959122--> <NAME><![CDATA[Sequance for Business Partner]]></NAME> <!--F9EFB543E0244AB090036F2EA6959122--> <DESCRIPTION><![CDATA[The sequence will be used to generate number for creating the sub-account for Business Partner.]]></DESCRIPTION> <!--F9EFB543E0244AB090036F2EA6959122--> <HELP><![CDATA[The sequence will be used to generate number for creating the sub-account for Business Partner.]]></HELP> <!--F9EFB543E0244AB090036F2EA6959122--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> diff -r e82f8f4f93e5 -r 9453062fdcbb src-db/database/sourcedata/AD_MENU.xml --- a/src-db/database/sourcedata/AD_MENU.xml Mon Jul 20 13:51:34 2009 +0200 +++ b/src-db/database/sourcedata/AD_MENU.xml Mon Jul 20 14:45:56 2009 +0200 @@ -5400,8 +5400,8 @@ <!--392A7B0601FA42F9AFC41FD8E576610D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--392A7B0601FA42F9AFC41FD8E576610D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--392A7B0601FA42F9AFC41FD8E576610D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--392A7B0601FA42F9AFC41FD8E576610D--> <NAME><![CDATA[Depreciation Schedule]]></NAME> -<!--392A7B0601FA42F9AFC41FD8E576610D--> <DESCRIPTION><![CDATA[Menu for Depreciation schedule report of Asset]]></DESCRIPTION> +<!--392A7B0601FA42F9AFC41FD8E576610D--> <NAME><![CDATA[Asset report for depreciation schedule]]></NAME> +<!--392A7B0601FA42F9AFC41FD8E576610D--> <DESCRIPTION><![CDATA[Asset report for depreciation schedule]]></DESCRIPTION> <!--392A7B0601FA42F9AFC41FD8E576610D--> <ISSUMMARY><![CDATA[N]]></ISSUMMARY> <!--392A7B0601FA42F9AFC41FD8E576610D--> <ACTION><![CDATA[R]]></ACTION> <!--392A7B0601FA42F9AFC41FD8E576610D--> <AD_PROCESS_ID><![CDATA[462033447A1548F09BBFB0683FA976CC]]></AD_PROCESS_ID> diff -r e82f8f4f93e5 -r 9453062fdcbb src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalPDF.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalPDF.java Mon Jul 20 13:51:34 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalPDF.java Mon Jul 20 14:45:56 2009 +0200 @@ -129,8 +129,7 @@ + Utility.messageBD(this, "To", vars.getLanguage()) + " " + strDateTo; if (!strPartnerGroup.equals("")) strTitle = strTitle + ", " + Utility.messageBD(this, "ForBPartnerGroup", vars.getLanguage()) - + " " - + ReportRefundInvoiceCustomerDimensionalAnalysesData.selectBpgroup(this, strPartnerGroup); + + " " + ReportInvoiceCustomerDimensionalAnalysesData.selectBpgroup(this, strPartnerGroup); // if (!strcBpartnerId.equals("")) strTitle = //strTitle+", para el tercero "+ReportRefundInvoiceCustomerDimensionalAnalysesData.selectBpartner // (this, @@ -154,14 +153,11 @@ .getLanguage(), strProducttype); if (!strsalesrepId.equals("")) strTitle = strTitle + ", " + Utility.messageBD(this, "TheSalesRep", vars.getLanguage()) + " " - + ReportRefundInvoiceCustomerDimensionalAnalysesData.selectSalesrep(this, strsalesrepId); + + ReportInvoiceCustomerDimensionalAnalysesData.selectSalesrep(this, strsalesrepId); if (!strPartnerSalesrepId.equals("")) - strTitle = strTitle - + ", " - + Utility.messageBD(this, "TheClientSalesRep", vars.getLanguage()) + strTitle = strTitle + ", " + Utility.messageBD(this, "TheClientSalesRep", vars.getLanguage()) + " " - + ReportRefundInvoiceCustomerDimensionalAnalysesData.selectSalesrep(this, - strPartnerSalesrepId); + + ReportInvoiceCustomerDimensionalAnalysesData.selectSalesrep(this, strPartnerSalesrepId); ReportInvoiceCustomerDimensionalAnalysesData[] data = null; String[] strShownArray = { "", "", "", "", "", "", "", "", "", "" }; if (strShown.startsWith("(")) diff -r e82f8f4f93e5 -r 9453062fdcbb src/org/openbravo/erpCommon/ad_reports/ReportRefundInvoiceCustomerDimensionalAnalyses.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportRefundInvoiceCustomerDimensionalAnalyses.java Mon Jul 20 13:51:34 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportRefundInvoiceCustomerDimensionalAnalyses.java Mon Jul 20 14:45:56 2009 +0200 @@ -281,7 +281,7 @@ + ", " + Utility.messageBD(this, "ProductCategory", vars.getLanguage()) + " " - + ReportInvoiceCustomerDimensionalAnalysesData.selectProductCategory(this, + + ReportRefundInvoiceCustomerDimensionalAnalysesData.selectProductCategory(this, strProductCategory); if (!strsalesrepId.equals("")) strTitle = strTitle + " " + Utility.messageBD(this, "And", vars.getLanguage()) + " " diff -r e82f8f4f93e5 -r 9453062fdcbb src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoicedJasper.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoicedJasper.java Mon Jul 20 13:51:34 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoicedJasper.java Mon Jul 20 14:45:56 2009 +0200 @@ -143,7 +143,7 @@ xmlDocument.setParameter("cProjectKind", strProjectkind); xmlDocument.setParameter("cRegionId", strcRegionId); xmlDocument.setParameter("cProjectPublic", strProjectpublic); - xmlDocument.setParameter("projectName", ReportProjectBuildingSiteData.selectProject(this, + xmlDocument.setParameter("projectName", ReportSalesOrderInvoicedData.selectProject(this, strcProjectId)); xmlDocument.setParameter("paramBPartnerDescription", ReportSalesOrderInvoicedData .bPartnerDescription(this, strcBpartnerId)); diff -r e82f8f4f93e5 -r 9453062fdcbb src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvidedJR.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvidedJR.java Mon Jul 20 13:51:34 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderProvidedJR.java Mon Jul 20 14:45:56 2009 +0200 @@ -143,7 +143,7 @@ xmlDocument.setParameter("cProjectKind", strProjectkind); xmlDocument.setParameter("cRegionId", strcRegionId); xmlDocument.setParameter("cProjectPublic", strProjectpublic); - xmlDocument.setParameter("projectName", ReportProjectBuildingSiteData.selectProject(this, + xmlDocument.setParameter("projectName", ReportSalesOrderProvidedData.selectProject(this, strcProjectId)); xmlDocument.setParameter("paramBPartnerDescription", ReportSalesOrderProvidedData .bPartnerDescription(this, strcBpartnerId)); diff -r e82f8f4f93e5 -r 9453062fdcbb src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java Mon Jul 20 13:51:34 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java Mon Jul 20 14:45:56 2009 +0200 @@ -421,11 +421,10 @@ + ReportShipmentDimensionalAnalyzeJRData.selectProductCategory(this, strProductCategory); if (!strsalesrepId.equals("")) strTitle = strTitle + ", " + Utility.messageBD(this, "TheSalesRep", vars.getLanguage()) + " " - + ReportInvoiceCustomerDimensionalAnalysesData.selectSalesrep(this, strsalesrepId); + + ReportShipmentDimensionalAnalyzeJRData.selectSalesrep(this, strsalesrepId); if (!strPartnerSalesrepId.equals("")) strTitle = strTitle + ", " + Utility.messageBD(this, "TheClientSalesRep", vars.getLanguage()) - + " " - + ReportInvoiceCustomerDimensionalAnalysesData.selectSalesrep(this, strPartnerSalesrepId); + + " " + ReportShipmentDimensionalAnalyzeJRData.selectSalesrep(this, strPartnerSalesrepId); if (!strmWarehouseId.equals("")) strTitle = strTitle + " " + Utility.messageBD(this, "And", vars.getLanguage()) + " " + Utility.messageBD(this, "TheWarehouse", vars.getLanguage()) + " " ------------------------------------------------------------------------------ Enter the BlackBerry Developer Challenge This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
