details: https://code.openbravo.com/erp/devel/pi/rev/ee752250a37d changeset: 20473:ee752250a37d user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Mon May 27 15:40:47 2013 +0200 summary: Fixed bug 23506 start date from and the end date from should be consider as equal
details: https://code.openbravo.com/erp/devel/pi/rev/bb419c9b4257 changeset: 20474:bb419c9b4257 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Thu May 23 17:50:17 2013 +0530 summary: Fixes issue 22265: First entry in "journal entries report" is number 2 diffstat: src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 6 +++--- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql | 4 +++- src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementJR_data.xsql | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diffs (82 lines): diff -r d8cc7de67a13 -r bb419c9b4257 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java Mon May 27 19:16:03 2013 +0530 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java Thu May 23 17:50:17 2013 +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) 2001-2012 Openbravo SLU + * All portions are Copyright (C) 2001-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -463,7 +463,7 @@ strPosition = ReportGeneralLedgerJournalData.selectCountDirect(this, Utility.getContext(this, vars, "#User_Client", "ReportGeneralLedger"), Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportGeneralLedger"), - strTable, strRecord, data[0].dateacct, data[0].identifier); + strTable, strRecord, strFactAcctGroupId, data[0].dateacct, data[0].identifier); } } else if (vars.commandIn("DIRECT")) { data = ReportGeneralLedgerJournalData.selectDirect(this, @@ -474,7 +474,7 @@ strPosition = ReportGeneralLedgerJournalData.selectCountDirect(this, Utility.getContext(this, vars, "#User_Client", "ReportGeneralLedger"), Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportGeneralLedger"), strTable, - strRecord, data[0].dateacct, data[0].identifier); + strRecord, strFactAcctGroupId, data[0].dateacct, data[0].identifier); } else if (vars.commandIn("DIRECT2")) { data = ReportGeneralLedgerJournalData.selectDirect2(this, Utility.getContext(this, vars, "#User_Client", "ReportGeneralLedger"), diff -r d8cc7de67a13 -r bb419c9b4257 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql --- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql Mon May 27 19:16:03 2013 +0530 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql Thu May 23 17:50:17 2013 +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) 2001-2012 Openbravo SLU + * All portions are Copyright (C) 2001-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -200,6 +200,7 @@ WHERE F.AD_CLIENT_ID IN ('1') AND F.AD_ORG_ID IN('1') AND 1=1 + AND F.fact_acct_group_id = ? AND (CASE (SELECT MAX(ISSOTRX) FROM C_DOCTYPE D WHERE D.DOCBASETYPE = F.DOCBASETYPE) WHEN 'N' THEN COALESCE(T.PO_WINDOW_ID, T.AD_WINDOW_ID) ELSE T.AD_WINDOW_ID END) = W.AD_WINDOW_ID GROUP BY F.DATEACCT, F.FACT_ACCT_GROUP_ID) AA @@ -209,6 +210,7 @@ <Parameter name="adUserOrg" type="replace" optional="true" after="AND F.AD_ORG_ID IN(" text="'1'"/> <Parameter name="table" optional="true" after="AND 1=1"><![CDATA[ AND f.ad_table_Id = ?]]></Parameter> <Parameter name="record" optional="true" after="AND 1=1"><![CDATA[ AND f.record_Id = ?]]></Parameter> + <Parameter name="factAcctGroup"/> <Parameter name="dateAcct"/> <Parameter name="dateAcct"/> <Parameter name="factAcctGroupId"/> diff -r d8cc7de67a13 -r bb419c9b4257 src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementJR_data.xsql --- a/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementJR_data.xsql Mon May 27 19:16:03 2013 +0530 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementJR_data.xsql Thu May 23 17:50:17 2013 +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) 2001-2010 Openbravo SLU + * All portions are Copyright (C) 2001-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -59,9 +59,9 @@ <Parameter name="language"/> <Parameter name="adUserClient" type="replace" optional="true" after="AND wr.AD_CLIENT_ID IN (" text="'1'"/> <Parameter name="adUserOrg" type="replace" optional="true" after="AND wr.AD_ORG_ID IN (" text="'1'"/> - <Parameter name="parStartDateFrom" optional="true" after="AND 1=1"><![CDATA[AND wr.STARTDATE > TO_DATE(?)]]></Parameter> + <Parameter name="parStartDateFrom" optional="true" after="AND 1=1"><![CDATA[AND wr.STARTDATE >= TO_DATE(?)]]></Parameter> <Parameter name="parStartDateTo" optional="true" after="AND 1=1"><![CDATA[AND wr.STARTDATE < TO_DATE(?)+1]]></Parameter> - <Parameter name="parEndDateFrom" optional="true" after="AND 1=1"><![CDATA[AND wr.ENDDATE > TO_DATE(?)]]></Parameter> + <Parameter name="parEndDateFrom" optional="true" after="AND 1=1"><![CDATA[AND wr.ENDDATE >= TO_DATE(?)]]></Parameter> <Parameter name="parEndDateTo" optional="true" after="AND 1=1"><![CDATA[AND wr.ENDDATE < TO_DATE(?)+1]]></Parameter> <Parameter name="parProcessPlan" optional="true" after="AND 1=1"><![CDATA[AND pp.MA_ProcessPlan_id =?]]></Parameter> </SqlMethod> ------------------------------------------------------------------------------ Try New Relic Now & We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, & servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
