details: https://code.openbravo.com/erp/devel/pi/rev/27354377babc changeset: 16738:27354377babc user: Naiara Garcia <naiara.garcia <at> openbravo.com> date: Fri Jun 01 13:04:12 2012 +0200 summary: Fixed Isue 20621: The application should warning about the consequence of closing a period permanently
details: https://code.openbravo.com/erp/devel/pi/rev/5644f97bda6e changeset: 16739:5644f97bda6e user: Naiara Garcia <naiara.garcia <at> openbravo.com> date: Fri Jun 01 14:18:28 2012 +0200 summary: Fixed issue 20631: Product name does not appear in Dimensional Reports diffstat: src-db/database/sourcedata/AD_FIELD.xml | 6 ++++-- src-db/database/sourcedata/AD_PROCESS.xml | 3 ++- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java | 4 ++-- src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesJR.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalyses.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java | 2 +- 9 files changed, 14 insertions(+), 11 deletions(-) diffs (127 lines): diff -r db05e34ca917 -r 5644f97bda6e src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Fri Jun 01 20:59:12 2012 +0200 +++ b/src-db/database/sourcedata/AD_FIELD.xml Fri Jun 01 14:18:28 2012 +0200 @@ -39133,7 +39133,8 @@ <!--3269--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--3269--> <NAME><![CDATA[Open/Close All]]></NAME> <!--3269--> <DESCRIPTION><![CDATA[Open/Close all Base Document Types]]></DESCRIPTION> -<!--3269--> <HELP><![CDATA[Open/Close all Base Document Types]]></HELP> +<!--3269--> <HELP><![CDATA[Open/Close all Base Document Types. +NOTE: You will not be able to close the fiscal year if you close all its periods permanently. Maybe you should close it before changing the last period from closed to permanently closed.]]></HELP> <!--3269--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--3269--> <AD_TAB_ID><![CDATA[130]]></AD_TAB_ID> <!--3269--> <AD_COLUMN_ID><![CDATA[5944]]></AD_COLUMN_ID> @@ -184283,7 +184284,8 @@ <!--58D503FCDDB0D53FE040007F01016BBB--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--58D503FCDDB0D53FE040007F01016BBB--> <NAME><![CDATA[Open/Close All]]></NAME> <!--58D503FCDDB0D53FE040007F01016BBB--> <DESCRIPTION><![CDATA[Open/Close all Base Document Types]]></DESCRIPTION> -<!--58D503FCDDB0D53FE040007F01016BBB--> <HELP><![CDATA[Open/Close all Base Document Types]]></HELP> +<!--58D503FCDDB0D53FE040007F01016BBB--> <HELP><![CDATA[Open/Close all Base Document Types. +NOTE: You will not be able to close the fiscal year if you close all its periods permanently. Maybe you should close it before changing the last period from closed to permanently closed.]]></HELP> <!--58D503FCDDB0D53FE040007F01016BBB--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--58D503FCDDB0D53FE040007F01016BBB--> <AD_TAB_ID><![CDATA[4DE17FC05C3843C4959166BB67967486]]></AD_TAB_ID> <!--58D503FCDDB0D53FE040007F01016BBB--> <AD_COLUMN_ID><![CDATA[58D503FCDD9ED53FE040007F01016BBB]]></AD_COLUMN_ID> diff -r db05e34ca917 -r 5644f97bda6e src-db/database/sourcedata/AD_PROCESS.xml --- a/src-db/database/sourcedata/AD_PROCESS.xml Fri Jun 01 20:59:12 2012 +0200 +++ b/src-db/database/sourcedata/AD_PROCESS.xml Fri Jun 01 14:18:28 2012 +0200 @@ -1040,7 +1040,8 @@ <!--167--> <VALUE><![CDATA[C_Period_Process]]></VALUE> <!--167--> <NAME><![CDATA[Open/Close All]]></NAME> <!--167--> <DESCRIPTION><![CDATA[Open/Close all Base Document Types]]></DESCRIPTION> -<!--167--> <HELP><![CDATA[Open/Close all Base Document Types]]></HELP> +<!--167--> <HELP><![CDATA[Open/Close all Base Document Types. +NOTE: You will not be able to close the fiscal year if you close all its periods permanently. Maybe you should close it before changing the last period from closed to permanently closed.]]></HELP> <!--167--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL> <!--167--> <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE> <!--167--> <PROCEDURENAME><![CDATA[C_Period_Process]]></PROCEDURENAME> diff -r db05e34ca917 -r 5644f97bda6e src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java Fri Jun 01 20:59:12 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java Fri Jun 01 14:18:28 2012 +0200 @@ -529,7 +529,7 @@ levelsconcat.append("M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID"); } else if (strShownArray[i].equals("4")) { strTextShow[i] = "AD_COLUMN_IDENTIFIER(to_char('M_Product'), to_char( M_PRODUCT.M_PRODUCT_ID), to_char( '" - + vars.getLanguage() + "'))||' ('||UOMSYMBOL||')'"; + + vars.getLanguage() + "'))|| CASE WHEN uomsymbol IS NULL THEN '' ELSE to_char(' ('||uomsymbol||')') END"; intAuxDiscard = i; intOrder++; intProductLevel = i + 1; diff -r db05e34ca917 -r 5644f97bda6e src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java Fri Jun 01 20:59:12 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java Fri Jun 01 14:18:28 2012 +0200 @@ -420,7 +420,7 @@ strLevelLabel[i] = dimensionLabel[2].name; } else if (strShownArray[i].equals("4")) { strTextShow[i] = "AD_COLUMN_IDENTIFIER(to_char('M_Product'), to_char( M_PRODUCT.M_PRODUCT_ID), to_char('" - + vars.getLanguage() + "'))||' ('||UOMSYMBOL||')'"; + + vars.getLanguage() + "'))|| CASE WHEN uomsymbol IS NULL THEN '' ELSE to_char(' ('||uomsymbol||')') END"; intAuxDiscard = i; intDiscard++; intProductLevel = i + 1; @@ -549,4 +549,4 @@ public String getServletInfo() { return "Servlet ReportInvoiceVendorDimensionalAnalysesJR. This Servlet was made by Jon AlegrÃa"; } // end of getServletInfo() method -} \ No newline at end of file +} diff -r db05e34ca917 -r 5644f97bda6e src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR.java Fri Jun 01 20:59:12 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesJR.java Fri Jun 01 14:18:28 2012 +0200 @@ -401,7 +401,7 @@ strLevelLabel[i] = dimensionLabel[2].name; } else if (strShownArray[i].equals("4")) { strTextShow[i] = "AD_COLUMN_IDENTIFIER(to_char('M_Product'), to_char( M_PRODUCT.M_PRODUCT_ID), to_char('" - + vars.getLanguage() + "'))||' ('||UOMSYMBOL||')'"; + + vars.getLanguage() + "'))|| CASE WHEN uomsymbol IS NULL THEN '' ELSE to_char(' ('||uomsymbol||')') END"; intAuxDiscard = i; intDiscard++; intProductLevel = i + 1; diff -r db05e34ca917 -r 5644f97bda6e src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesJR.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesJR.java Fri Jun 01 20:59:12 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesJR.java Fri Jun 01 14:18:28 2012 +0200 @@ -405,7 +405,7 @@ strLevelLabel[i] = dimensionLabel[2].name; } else if (strShownArray[i].equals("4")) { strTextShow[i] = "AD_COLUMN_IDENTIFIER(to_char('M_Product'), to_char( M_PRODUCT.M_PRODUCT_ID), to_char('" - + vars.getLanguage() + "'))||' ('||UOMSYMBOL||')'"; + + vars.getLanguage() + "'))|| CASE WHEN uomsymbol IS NULL THEN '' ELSE to_char(' ('||uomsymbol||')') END"; intProductLevel = i + 1; intDiscard++; intAuxDiscard = i; diff -r db05e34ca917 -r 5644f97bda6e src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalyses.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalyses.java Fri Jun 01 20:59:12 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalyses.java Fri Jun 01 14:18:28 2012 +0200 @@ -424,7 +424,7 @@ intDiscard++; } else if (strShownArray[i].equals("4")) { strTextShow[i] = "AD_COLUMN_IDENTIFIER(to_char('M_Product'), to_char( M_PRODUCT.M_PRODUCT_ID), to_char('" - + vars.getLanguage() + "'))||' ('||UOMSYMBOL||')'"; + + vars.getLanguage() + "'))|| CASE WHEN uomsymbol IS NULL THEN '' ELSE to_char(' ('||uomsymbol||')') END"; intAuxDiscard = i; intDiscard++; } else if (strShownArray[i].equals("5")) { diff -r db05e34ca917 -r 5644f97bda6e src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java Fri Jun 01 20:59:12 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java Fri Jun 01 14:18:28 2012 +0200 @@ -490,7 +490,7 @@ levelsconcat.append("M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID"); } else if (strShownArray[i].equals("4")) { strTextShow[i] = "AD_COLUMN_IDENTIFIER(to_char('M_Product'), to_char( M_PRODUCT.M_PRODUCT_ID), to_char('" - + vars.getLanguage() + "'))||' ('||UOMSYMBOL||')'"; + + vars.getLanguage() + "'))|| CASE WHEN uomsymbol IS NULL THEN '' ELSE to_char(' ('||uomsymbol||')') END"; intAuxDiscard = i; intDiscard++; intProductLevel = i + 1; diff -r db05e34ca917 -r 5644f97bda6e src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java Fri Jun 01 20:59:12 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java Fri Jun 01 14:18:28 2012 +0200 @@ -499,7 +499,7 @@ levelsconcat.append("M_PRODUCT_CATEGORY.M_PRODUCT_CATEGORY_ID"); } else if (strShownArray[i].equals("4")) { strTextShow[i] = "AD_COLUMN_IDENTIFIER(to_char('M_Product'), to_char( M_PRODUCT.M_PRODUCT_ID), to_char('" - + vars.getLanguage() + "'))||' ('||UOMSYMBOL||')'"; + + vars.getLanguage() + "'))|| CASE WHEN uomsymbol IS NULL THEN '' ELSE to_char(' ('||uomsymbol||')') END"; intAuxDiscard = i; intDiscard++; intProductLevel = i + 1; ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
