details: https://code.openbravo.com/erp/devel/pi/rev/ac04563218d6
changeset: 18979:ac04563218d6
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Wed Dec 05 18:15:54 2012 +0100
summary: Fixes bug 22466
diffstat:
.project
| 5 ++
src-util/modulescript/build/classes/org/openbravo/modulescript/UniqueValidCombination.class
| 0
src-util/modulescript/build/classes/org/openbravo/modulescript/UniqueValidCombinationData.class
| 0
src-util/modulescript/src/org/openbravo/modulescript/UniqueValidCombination.java
| 6 +-
src-util/modulescript/src/org/openbravo/modulescript/UniqueValidCombination_data.xsql
| 25 ++++++++++
5 files changed, 34 insertions(+), 2 deletions(-)
diffs (77 lines):
diff -r 931f2eb6df55 -r ac04563218d6 .project
--- a/.project Wed Dec 05 17:07:37 2012 +0100
+++ b/.project Wed Dec 05 18:15:54 2012 +0100
@@ -15,6 +15,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>com.eclipsesource.jshint.ui.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
diff -r 931f2eb6df55 -r ac04563218d6
src-util/modulescript/build/classes/org/openbravo/modulescript/UniqueValidCombination.class
Binary file
src-util/modulescript/build/classes/org/openbravo/modulescript/UniqueValidCombination.class
has changed
diff -r 931f2eb6df55 -r ac04563218d6
src-util/modulescript/build/classes/org/openbravo/modulescript/UniqueValidCombinationData.class
Binary file
src-util/modulescript/build/classes/org/openbravo/modulescript/UniqueValidCombinationData.class
has changed
diff -r 931f2eb6df55 -r ac04563218d6
src-util/modulescript/src/org/openbravo/modulescript/UniqueValidCombination.java
---
a/src-util/modulescript/src/org/openbravo/modulescript/UniqueValidCombination.java
Wed Dec 05 17:07:37 2012 +0100
+++
b/src-util/modulescript/src/org/openbravo/modulescript/UniqueValidCombination.java
Wed Dec 05 18:15:54 2012 +0100
@@ -29,10 +29,12 @@
public void execute() {
try {
ConnectionProvider cp = getConnectionProvider();
- if(UniqueValidCombinationData.selectDuplicates(cp)){
+ if(UniqueValidCombinationData.selectMissingValidCombination(cp)){
UniqueValidCombinationData.updateJournalLineDimensions(cp);
UniqueValidCombinationData.updateValidCombinationDeactivate(cp);
-
UniqueValidCombinationData.updateValidCombinationDeactivateDuplicated(cp);
+ if(UniqueValidCombinationData.selectDuplicates(cp)){
+
UniqueValidCombinationData.updateValidCombinationDeactivateDuplicated(cp);
+ }
UniqueValidCombinationData.insertValidCombinations(cp);
}
diff -r 931f2eb6df55 -r ac04563218d6
src-util/modulescript/src/org/openbravo/modulescript/UniqueValidCombination_data.xsql
---
a/src-util/modulescript/src/org/openbravo/modulescript/UniqueValidCombination_data.xsql
Wed Dec 05 17:07:37 2012 +0100
+++
b/src-util/modulescript/src/org/openbravo/modulescript/UniqueValidCombination_data.xsql
Wed Dec 05 18:15:54 2012 +0100
@@ -40,11 +40,36 @@
and C_ACTIVITY_ID is null
and USER1_ID is null
and USER2_ID is null
+ and isactive = 'Y'
group by account_id, ad_client_id
having count(account_id) > 1) a
]]>
</Sql>
</SqlMethod>
+ <SqlMethod name="selectMissingValidCombination" type="preparedStatement"
return="boolean">
+ <SqlMethodComment></SqlMethodComment>
+ <Sql><![CDATA[
+ select count(1) as count
+ from dual
+ where exists (select 1
+ from c_elementvalue
+ where not exists(select 1
+ from c_validcombination
+ where c_validcombination.account_id =
c_elementvalue_id
+ and isactive='Y'
+ and M_PRODUCT_ID is null
+ and C_BPARTNER_ID is null
+ and C_PROJECT_ID is null
+ and C_CAMPAIGN_ID is null
+ and C_SALESREGION_ID is null
+ and C_ACTIVITY_ID is null
+ and USER1_ID is null
+ and USER2_ID is null)
+ and elementlevel = 'S'
+ and isactive = 'Y')
+ ]]>
+ </Sql>
+ </SqlMethod>
<SqlMethod name="updateJournalLineDimensions" type="preparedStatement"
return="rowcount">
<SqlMethodComment></SqlMethodComment>
<Sql><![CDATA[
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
