details: /erp/devel/pi/rev/0724fdf131dc
changeset: 10418:0724fdf131dc
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Tue Feb 08 08:37:13 2011 +0100
summary: Fixes Issues 15867. Now combo filters already regularized years
diffstat:
src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct.java | 2 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct_data.xsql | 4
++++
2 files changed, 5 insertions(+), 1 deletions(-)
diffs (30 lines):
diff -r 0c1dcc495e00 -r 0724fdf131dc
src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct.java
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct.java
Tue Feb 08 08:37:15 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct.java
Tue Feb 08 08:37:13 2011 +0100
@@ -405,7 +405,7 @@
xmlDocument.setParameter("help", strHelp);
xmlDocument.setData("reportadOrgId", "liststructure",
CreateRegFactAcctData.select(this, vars
- .getClient(), Utility.getContext(this, vars, "#User_Org",
"CreateRegFactAcct")));
+ .getClient(), Utility.getContext(this, vars, "#User_Org",
"CreateRegFactAcct"), strKey));
xmlDocument.setParameter("adOrgId", strOrgId);
diff -r 0c1dcc495e00 -r 0724fdf131dc
src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct_data.xsql
Tue Feb 08 08:37:15 2011 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct_data.xsql
Tue Feb 08 08:37:13 2011 +0100
@@ -34,10 +34,14 @@
where ad_org.isperiodcontrolallowed = 'Y'
and ad_client_id = ?
and ad_org_id in ('1')
+ and not exists (SELECT AD_ORG_CLOSING.AD_ORG_ID
+ FROM AD_ORG_CLOSING
+ WHERE C_YEAR_ID = ?)
]]>
</Sql>
<Parameter name="ad_client_id"/>
<Parameter name="adOrgClient" type="replace" optional="true" after="and
ad_org_id in (" text="'1'"/>
+ <Parameter name="c_year_id"/>
</SqlMethod>
<SqlMethod name="getAmounts" type="preparedStatement" return="multiple">
<SqlMethodComment></SqlMethodComment>
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
