details: /erp/devel/pi/rev/c5770165866b
changeset: 11397:c5770165866b
user: Ainhoa Pagola <ainhoa.pagola <at> openbravo.com>
date: Wed Mar 30 10:14:11 2011 +0200
summary: Fixes issue 16110. Documents not posted when the period is closed
for their organization
diffstat:
src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 4 ++--
src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql | 12 +++++-------
2 files changed, 7 insertions(+), 9 deletions(-)
diffs (52 lines):
diff -r 9bd236c9840a -r c5770165866b
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Tue Mar 29
17:28:01 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java Wed Mar 30
10:14:11 2011 +0200
@@ -11,7 +11,7 @@
* Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
* created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved.
* Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2001-2009 Openbravo S.L.U.
+ * Contributions are Copyright (C) 2001-2011 Openbravo S.L.U.
******************************************************************************
*/
package org.openbravo.erpCommon.ad_forms;
@@ -1753,7 +1753,7 @@
} else if (strStatus.equals(STATUS_InvalidAccount))
strMessage = "@InvalidAccount@";
else if (strStatus.equals(STATUS_PeriodClosed))
- strMessage = "@PeriodClosed@";
+ strMessage = "@PeriodNotAvailable@";
else if (strStatus.equals(STATUS_NotConvertible))
strMessage = "@NotConvertible@";
else if (strStatus.equals(STATUS_NotBalanced))
diff -r 9bd236c9840a -r c5770165866b
src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql Tue Mar 29
17:28:01 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql Wed Mar 30
10:14:11 2011 +0200
@@ -12,7 +12,7 @@
* Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
* created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved.
* Contributor(s): Openbravo SLU
- * Contributions are Copyright (C) 2001-2009 Openbravo S.L.U.
+ * Contributions are Copyright (C) 2001-2011 Openbravo S.L.U.
******************************************************************************
-->
@@ -149,14 +149,12 @@
<Sql>
<![CDATA[
select max(c_period.c_period_id) as period
- from c_year, c_period, c_periodcontrol, ad_org
- where c_year.c_year_id = c_period.c_year_id
- and c_period.c_period_id = c_periodcontrol.c_period_id
- and c_year.c_calendar_id = ad_org.c_calendar_id
- and ad_org.ad_client_id = ?
+ from c_period, c_periodcontrol
+ where c_period.c_period_id = c_periodcontrol.c_period_id
+ and c_period.ad_client_id = ?
and c_periodcontrol.docbasetype = ?
and c_periodcontrol.periodstatus = 'O'
- and ad_org.ad_org_id = ad_org_getcalendarowner(?)
+ and c_periodcontrol.ad_org_id = ad_org_getcalendarowner(?)
and to_date(?) >= c_period.StartDate
and to_date(?) < c_period.EndDate + 1
]]>
------------------------------------------------------------------------------
Enable your software for Intel(R) Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel(R) vPro (TM) technology - will your software
be a part of the solution? Download the Intel(R) Manageability Checker
today! http://p.sf.net/sfu/intel-dev2devmar
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
