details:   https://code.openbravo.com/erp/devel/pi/rev/c57255020226
changeset: 16827:c57255020226
user:      Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date:      Wed Jun 13 12:24:01 2012 +0200
summary:   Fixes bug 20745: GL Journal Post process failing due to wrong change 
which causes a regression

details:   https://code.openbravo.com/erp/devel/pi/rev/4bd3811f32a2
changeset: 16828:4bd3811f32a2
user:      Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date:      Wed Jun 13 12:33:11 2012 +0200
summary:   Fixes bug 18998. [Related to commit 8f9fe48cbf5c] Missing change in 
previous commit

details:   https://code.openbravo.com/erp/devel/pi/rev/149c7a86161e
changeset: 16829:149c7a86161e
user:      Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date:      Wed Jun 13 12:47:51 2012 +0200
summary:   Fixes bug 18997: Improve initial configuration of G/L Journal window

diffstat:

 src-db/database/model/functions/GL_JOURNAL_POST.xml           |  8 +++++++-
 src-db/database/sourcedata/AD_FIELD.xml                       |  8 ++++----
 src/org/openbravo/erpCommon/ad_process/CopyFromGLJournal.java |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diffs (68 lines):

diff -r c3c5bb6a8f84 -r 149c7a86161e 
src-db/database/model/functions/GL_JOURNAL_POST.xml
--- a/src-db/database/model/functions/GL_JOURNAL_POST.xml       Wed Jun 13 
14:38:07 2012 +0545
+++ b/src-db/database/model/functions/GL_JOURNAL_POST.xml       Wed Jun 13 
12:47:51 2012 +0200
@@ -207,7 +207,13 @@
       END IF;
 
       -- Check if the gl journal has lines.
-      SELECT 1, documentNo INTO v_has_lines, v_documentNo FROM GL_Journal 
WHERE EXISTS (SELECT 1 FROM GL_JournalLine WHERE GL_JournalLine.GL_Journal_ID = 
v_Record_ID);
+     
+      SELECT 1, documentNo INTO v_has_lines, v_documentNo
+      FROM GL_Journal
+      WHERE EXISTS (SELECT 1
+                    FROM GL_JournalLine
+                    WHERE GL_JournalLine.GL_Journal_ID = 
GL_Journal.GL_Journal_ID
+                    AND GL_JournalLine.GL_Journal_ID = v_Record_ID);
       IF (v_has_lines=-1) THEN
         RAISE_APPLICATION_ERROR(-20000, '@GLJournalHasNoLines@' || ' ' || 
v_DocumentNo);
       END IF;
diff -r c3c5bb6a8f84 -r 149c7a86161e src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml   Wed Jun 13 14:38:07 2012 +0545
+++ b/src-db/database/sourcedata/AD_FIELD.xml   Wed Jun 13 12:47:51 2012 +0200
@@ -9001,7 +9001,7 @@
 <!--681-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--681-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--681-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--681-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--681-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--681-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--681-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--681-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
@@ -10690,7 +10690,7 @@
 <!--884-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--884-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--884-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--884-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--884-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--884-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--884-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--884-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -58292,14 +58292,14 @@
 <!--4721-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--4721-->  <AD_TAB_ID><![CDATA[160]]></AD_TAB_ID>
 <!--4721-->  <AD_COLUMN_ID><![CDATA[5952]]></AD_COLUMN_ID>
-<!--4721-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4721-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--4721-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--4721-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--4721-->  <SEQNO><![CDATA[120]]></SEQNO>
 <!--4721-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4721-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4721-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4721-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4721-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--4721-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4721-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4721-->  <GRID_SEQNO><![CDATA[120]]></GRID_SEQNO>
diff -r c3c5bb6a8f84 -r 149c7a86161e 
src/org/openbravo/erpCommon/ad_process/CopyFromGLJournal.java
--- a/src/org/openbravo/erpCommon/ad_process/CopyFromGLJournal.java     Wed Jun 
13 14:38:07 2012 +0545
+++ b/src/org/openbravo/erpCommon/ad_process/CopyFromGLJournal.java     Wed Jun 
13 12:47:51 2012 +0200
@@ -118,7 +118,7 @@
           String strLineSequence = SequenceIdData.getUUID();
           try {
             if (CopyFromGLJournalData.insertGLJournalLine(conn, this, 
strLineSequence,
-                vars.getClient(), dataLines[i].adOrgId, vars.getUser(), 
strSequence,
+                vars.getClient(), dataLines[j].adOrgId, vars.getUser(), 
strSequence,
                 dataLines[j].line, dataLines[j].isgenerated, 
dataLines[j].description,
                 dataLines[j].amtsourcedr, dataLines[j].amtsourcecr, 
dataLines[j].cCurrencyId,
                 dataLines[j].currencyratetype, dataLines[j].currencyrate, 
dataLines[j].amtacctdr,

------------------------------------------------------------------------------
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

Reply via email to