details: https://code.openbravo.com/erp/devel/pi/rev/9acda851780a
changeset: 14030:9acda851780a
user: Ioritz Cia <ioritz.cia <at> openbravo.com>
date: Wed Oct 19 09:56:13 2011 +0200
summary: Fixes issue 18412: When you click on a 'Journal Entry' you navigate
to a window with 2.50 screen.
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html |
8 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml |
1 +
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql |
61 +++++++--
3 files changed, 52 insertions(+), 18 deletions(-)
diffs (151 lines):
diff -r c65d16d31cfd -r 9acda851780a
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html
Wed Oct 19 18:11:00 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html
Wed Oct 19 09:56:13 2011 +0200
@@ -56,6 +56,12 @@
frm.inpdocbasetype.value = docbasetype;
return submitCommandForm(Command, false, frm, null, null, false, true);
}
+function openJournalEntry(tabId, recordId){
+ var myframe = getFrame('LayoutMDI') || top.opener;
+ if (myframe) {
+ myframe.OB.Utilities.openDirectTab(tabId, recordId);
+ }
+}
function imprimir()
{
openPDFFiltered("ReportGeneralLedgerJournalPDF.pdf?Command=PDF","PDF");
@@ -436,7 +442,7 @@
<div id="sectionJournal">
<table cellspacing="0" cellpadding="0" width="100%"
class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;">
<tr class="DataGrid_Body_Row">
- <th class="DataGrid_Header_Cell"> <a href="#"
onclick="submitPage('DEFAULT', document.frmSecondary, 'xx', 'yy', 'zz');return
false;" onmouseover="window.status='General Ledger Journal';return true;"
onmouseout="window.status='';return true;" class="LabelLink" id="fieldId">
+ <th class="DataGrid_Header_Cell"> <a href="#"
onclick="openJournalEntry('ww', 'xx');return false;"
onmouseover="window.status='General Ledger Journal';return true;"
onmouseout="window.status='';return true;" class="LabelLink" id="fieldId">
Journal Entry <span
id="functionCalculateOrderJournal">xx123</span><!--span
id="functionCalculateOrderJournalWithInitial">xx123</span--></a>
<input type="hidden" name="inpordenJournal"
id="functionOrderJournal" value=""></input>
</th>
diff -r c65d16d31cfd -r 9acda851780a
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml
Wed Oct 19 18:11:00 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml
Wed Oct 19 09:56:13 2011 +0200
@@ -85,6 +85,7 @@
<FIELD id="fieldId" attribute="onclick" replace="xx">id</FIELD>
<FIELD id="fieldId" attribute="onclick" replace="yy">adTableId</FIELD>
<FIELD id="fieldId" attribute="onclick" replace="zz">docbasetype</FIELD>
+ <FIELD id="fieldId" attribute="onclick" replace="ww">tabId</FIELD>
<FUNCTION id="functionOrderJournal" name="ORDER"
attribute="value">identifier</FUNCTION>
<FUNCTION id="functionCalculateOrderJournal" name="ADD"
arg1="functionOrderJournal" arg2="paramGroupId" format="integerInform"/>
<FUNCTION id="functionCalculateOrderJournalWithInitial" name="ADD"
arg1="functionCalculateOrderJournal" arg2="paramEntryNo"
format="integerInform"/>
diff -r c65d16d31cfd -r 9acda851780a
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql
---
a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql
Wed Oct 19 18:11:00 2011 +0200
+++
b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql
Wed Oct 19 09:56:13 2011 +0200
@@ -28,15 +28,15 @@
<SqlMethodComment></SqlMethodComment>
<Sql>
<![CDATA[
- SELECT SCHEMA_ID, SCHEMA_NAME, IDENTIFIER, DATEACCT, VALUE, NAME, ID,
AD_TABLE_ID, DOCBASETYPE, SEQNO, '' AS TOTAL, '' AS DESCRIPTION,
- (CASE FACTACCTTYPE WHEN 'O' THEN 1 WHEN 'N' THEN 2 WHEN 'R' THEN 3 ELSE
4 END) AS FACTACCTTYPE2,
- (CASE AMTACCTDR WHEN 0 THEN NULL ELSE AMTACCTDR END) AS AMTACCTDR, (CASE
AMTACCTCR WHEN 0 THEN NULL ELSE AMTACCTCR END) AS AMTACCTCR,
- '' AS GROUPEDLINES, '' AS TAXID
+ SELECT AA.SCHEMA_ID, AA.SCHEMA_NAME, AA.IDENTIFIER, AA.DATEACCT,
AA.VALUE, AA.NAME, AA.ID, AA.AD_TABLE_ID, AA.DOCBASETYPE, AA.SEQNO, '' AS
TOTAL, '' AS DESCRIPTION,
+ (CASE AA.FACTACCTTYPE WHEN 'O' THEN 1 WHEN 'N' THEN 2 WHEN 'R' THEN 3
ELSE 4 END) AS FACTACCTTYPE2,
+ (CASE AA.AMTACCTDR WHEN 0 THEN NULL ELSE AA.AMTACCTDR END) AS AMTACCTDR,
(CASE AA.AMTACCTCR WHEN 0 THEN NULL ELSE AA.AMTACCTCR END) AS AMTACCTCR,
+ '' AS GROUPEDLINES, '' AS TAXID, TB.AD_TAB_ID TAB_ID
FROM
(SELECT F.C_ACCTSCHEMA_ID AS SCHEMA_ID, SC.NAME AS SCHEMA_NAME,
F.FACT_ACCT_GROUP_ID AS IDENTIFIER, F.DATEACCT,
F.ACCTVALUE AS VALUE, F.ACCTDESCRIPTION AS NAME,F.RECORD_ID AS ID,
F.AD_TABLE_ID, F.DOCBASETYPE,
- sum(F.AMTACCTDR) AS AMTACCTDR, sum(F.AMTACCTCR) AS AMTACCTCR, MIN(SEQNO)
AS SEQNO, F.FACTACCTTYPE AS FACTACCTTYPE
- FROM FACT_ACCT F, C_ACCTSCHEMA SC
+ sum(F.AMTACCTDR) AS AMTACCTDR, sum(F.AMTACCTCR) AS AMTACCTCR, MIN(SEQNO)
AS SEQNO, F.FACTACCTTYPE AS FACTACCTTYPE, F.AD_CLIENT_ID
+ FROM FACT_ACCT F, C_ACCTSCHEMA SC
WHERE F.AD_CLIENT_ID IN ('1')
AND F.AD_ORG_ID IN('1')
AND 1=1
@@ -45,7 +45,16 @@
AND f.C_ACCTSCHEMA_ID = SC.C_ACCTSCHEMA_ID
GROUP BY f.C_ACCTSCHEMA_ID, SC.NAME, F.AD_TABLE_ID, F.DATEACCT,
F.ACCTDESCRIPTION, F.ACCTVALUE, F.DOCBASETYPE, F.RECORD_ID,
F.FACT_ACCT_GROUP_ID, F.ACCOUNT_ID,F.FACTACCTTYPE,
- (CASE F.AMTACCTDR WHEN 0 THEN (CASE SIGN(F.AMTACCTCR) WHEN -1 THEN 1
ELSE 2 END) ELSE (CASE SIGN(F.AMTACCTDR) WHEN -1 THEN 3 ELSE 4 END) END)) AA
+ (CASE F.AMTACCTDR WHEN 0 THEN (CASE SIGN(F.AMTACCTCR) WHEN -1 THEN 1
ELSE 2 END) ELSE (CASE SIGN(F.AMTACCTDR) WHEN -1 THEN 3 ELSE 4 END) END),
F.AD_CLIENT_ID) AA,
+ AD_TABLE T, AD_TAB TB, AD_WINDOW W, AD_COLUMN C
+ WHERE T.AD_TABLE_ID = AA.AD_TABLE_ID
+ AND AA.AD_TABLE_ID = TB.AD_TABLE_ID
+ AND TB.AD_WINDOW_ID = W.AD_WINDOW_ID
+ AND C.AD_TABLE_ID = AA.AD_TABLE_ID
+ AND (CASE (SELECT MAX(ISSOTRX) FROM C_DOCTYPE D
+ WHERE D.DOCBASETYPE = AA.DOCBASETYPE
+ AND D.AD_CLIENT_ID = AA.AD_CLIENT_ID) WHEN 'N' THEN
COALESCE(T.PO_WINDOW_ID, T.AD_WINDOW_ID) ELSE T.AD_WINDOW_ID END) =
W.AD_WINDOW_ID
+ AND C.ISKEY = 'Y'
ORDER BY SCHEMA_NAME, DATEACCT, FACTACCTTYPE2, IDENTIFIER, SEQNO
]]></Sql>
<Field name="rownum" value="count"/>
@@ -150,13 +159,13 @@
<SqlMethodComment></SqlMethodComment>
<Sql>
<![CDATA[
- SELECT SCHEMA_ID, SCHEMA_NAME, IDENTIFIER, DATEACCT, VALUE, NAME, ID,
AD_TABLE_ID, DOCBASETYPE, SEQNO, '' AS TOTAL, '' AS DESCRIPTION,
- (CASE FACTACCTTYPE WHEN 'O' THEN 1 WHEN 'N' THEN 2 WHEN 'R' THEN 3 ELSE
4 END) AS FACTACCTTYPE2,
- (CASE AMTACCTDR WHEN 0 THEN NULL ELSE AMTACCTDR END) AS AMTACCTDR, (CASE
AMTACCTCR WHEN 0 THEN NULL ELSE AMTACCTCR END) AS AMTACCTCR
+ SELECT AA.SCHEMA_ID, AA.SCHEMA_NAME, AA.IDENTIFIER, AA.DATEACCT,
AA.VALUE, AA.NAME, AA.ID, AA.AD_TABLE_ID, AA.DOCBASETYPE, AA.SEQNO, '' AS
TOTAL, '' AS DESCRIPTION,
+ (CASE AA.FACTACCTTYPE WHEN 'O' THEN 1 WHEN 'N' THEN 2 WHEN 'R' THEN 3
ELSE 4 END) AS FACTACCTTYPE2,
+ (CASE AA.AMTACCTDR WHEN 0 THEN NULL ELSE AA.AMTACCTDR END) AS AMTACCTDR,
(CASE AA.AMTACCTCR WHEN 0 THEN NULL ELSE AA.AMTACCTCR END) AS AMTACCTCR,
TB.AD_TAB_ID AS TAB_ID
FROM
(SELECT F.C_ACCTSCHEMA_ID AS SCHEMA_ID, SC.NAME AS SCHEMA_NAME,
F.FACT_ACCT_GROUP_ID AS IDENTIFIER, F.DATEACCT,
F.ACCTVALUE AS VALUE, F.ACCTDESCRIPTION AS NAME,F.RECORD_ID AS ID,
F.AD_TABLE_ID, F.DOCBASETYPE,
- sum(F.AMTACCTDR) AS AMTACCTDR, sum(F.AMTACCTCR) AS AMTACCTCR, MIN(SEQNO)
AS SEQNO, F.FACTACCTTYPE AS FACTACCTTYPE
+ sum(F.AMTACCTDR) AS AMTACCTDR, sum(F.AMTACCTCR) AS AMTACCTCR, MIN(SEQNO)
AS SEQNO, F.FACTACCTTYPE AS FACTACCTTYPE, F.AD_CLIENT_ID
FROM FACT_ACCT F, C_ACCTSCHEMA SC
WHERE F.AD_CLIENT_ID IN ('1')
AND F.AD_ORG_ID IN('1')
@@ -164,7 +173,16 @@
AND f.C_ACCTSCHEMA_ID = SC.C_ACCTSCHEMA_ID
GROUP BY f.C_ACCTSCHEMA_ID, SC.NAME, F.AD_TABLE_ID, F.DATEACCT,
F.ACCTDESCRIPTION, F.ACCTVALUE, F.DOCBASETYPE, F.RECORD_ID,
F.FACT_ACCT_GROUP_ID, F.ACCOUNT_ID,F.FACTACCTTYPE,
- (CASE F.AMTACCTDR WHEN 0 THEN (CASE SIGN(F.AMTACCTCR) WHEN -1 THEN 1
ELSE 2 END) ELSE (CASE SIGN(F.AMTACCTDR) WHEN -1 THEN 3 ELSE 4 END) END)) AA
+ (CASE F.AMTACCTDR WHEN 0 THEN (CASE SIGN(F.AMTACCTCR) WHEN -1 THEN 1
ELSE 2 END) ELSE (CASE SIGN(F.AMTACCTDR) WHEN -1 THEN 3 ELSE 4 END) END),
F.AD_CLIENT_ID) AA,
+ AD_TABLE T, AD_TAB TB, AD_WINDOW W, AD_COLUMN C
+ WHERE T.AD_TABLE_ID = AA.AD_TABLE_ID
+ AND AA.AD_TABLE_ID = TB.AD_TABLE_ID
+ AND TB.AD_WINDOW_ID = W.AD_WINDOW_ID
+ AND C.AD_TABLE_ID = AA.AD_TABLE_ID
+ AND (CASE (SELECT MAX(ISSOTRX) FROM C_DOCTYPE D
+ WHERE D.DOCBASETYPE = AA.DOCBASETYPE
+ AND D.AD_CLIENT_ID = AA.AD_CLIENT_ID) WHEN 'N' THEN
COALESCE(T.PO_WINDOW_ID, T.AD_WINDOW_ID) ELSE T.AD_WINDOW_ID END) =
W.AD_WINDOW_ID
+ AND C.ISKEY = 'Y'
ORDER BY SCHEMA_NAME, DATEACCT, FACTACCTTYPE2, IDENTIFIER, SEQNO
]]></Sql>
<Field name="rownum" value="count"/>
@@ -209,13 +227,13 @@
<SqlMethodComment></SqlMethodComment>
<Sql>
<![CDATA[
- SELECT SCHEMA_ID, SCHEMA_NAME, IDENTIFIER, DATEACCT, VALUE, NAME, ID,
AD_TABLE_ID, DOCBASETYPE, SEQNO, '' AS TOTAL, '' AS DESCRIPTION,
- (CASE FACTACCTTYPE WHEN 'O' THEN 1 WHEN 'N' THEN 2 WHEN 'R' THEN 3 ELSE
4 END) AS FACTACCTTYPE2,
- (CASE AMTACCTDR WHEN 0 THEN NULL ELSE AMTACCTDR END) AS AMTACCTDR, (CASE
AMTACCTCR WHEN 0 THEN NULL ELSE AMTACCTCR END) AS AMTACCTCR
+ SELECT AA.SCHEMA_ID, AA.SCHEMA_NAME, AA.IDENTIFIER, AA.DATEACCT,
AA.VALUE, AA.NAME, AA.ID, AA.AD_TABLE_ID, AA.DOCBASETYPE, AA.SEQNO, '' AS
TOTAL, '' AS DESCRIPTION,
+ (CASE AA.FACTACCTTYPE WHEN 'O' THEN 1 WHEN 'N' THEN 2 WHEN 'R' THEN 3
ELSE 4 END) AS FACTACCTTYPE2,
+ (CASE AA.AMTACCTDR WHEN 0 THEN NULL ELSE AA.AMTACCTDR END) AS AMTACCTDR,
(CASE AA.AMTACCTCR WHEN 0 THEN NULL ELSE AA.AMTACCTCR END) AS AMTACCTCR,
TB.AD_TAB_ID TAB_ID
FROM
(SELECT F.C_ACCTSCHEMA_ID AS SCHEMA_ID, SC.NAME AS SCHEMA_NAME,
F.FACT_ACCT_GROUP_ID AS IDENTIFIER, F.DATEACCT,
F.ACCTVALUE AS VALUE, F.ACCTDESCRIPTION AS NAME,F.RECORD_ID AS ID,
F.AD_TABLE_ID, F.DOCBASETYPE,
- sum(F.AMTACCTDR) AS AMTACCTDR, sum(F.AMTACCTCR) AS AMTACCTCR, MIN(SEQNO)
AS SEQNO, F.FACTACCTTYPE AS FACTACCTTYPE
+ sum(F.AMTACCTDR) AS AMTACCTDR, sum(F.AMTACCTCR) AS AMTACCTCR, MIN(SEQNO)
AS SEQNO, F.FACTACCTTYPE AS FACTACCTTYPE, F.AD_CLIENT_ID
FROM FACT_ACCT F, C_ACCTSCHEMA SC
WHERE F.AD_CLIENT_ID IN ('1')
AND F.AD_ORG_ID IN('1')
@@ -223,7 +241,16 @@
AND F.Fact_Acct_Group_ID = ?
GROUP BY f.C_ACCTSCHEMA_ID, SC.NAME, F.AD_TABLE_ID, F.DATEACCT,
F.ACCTDESCRIPTION, F.ACCTVALUE, F.DOCBASETYPE, F.RECORD_ID,
F.FACT_ACCT_GROUP_ID, F.ACCOUNT_ID,F.FACTACCTTYPE,
- (CASE F.AMTACCTDR WHEN 0 THEN (CASE SIGN(F.AMTACCTCR) WHEN -1 THEN 1
ELSE 2 END) ELSE (CASE SIGN(F.AMTACCTDR) WHEN -1 THEN 3 ELSE 4 END) END)) AA
+ (CASE F.AMTACCTDR WHEN 0 THEN (CASE SIGN(F.AMTACCTCR) WHEN -1 THEN 1
ELSE 2 END) ELSE (CASE SIGN(F.AMTACCTDR) WHEN -1 THEN 3 ELSE 4 END) END),
F.AD_CLIENT_ID) AA,
+ AD_TABLE T, AD_TAB TB, AD_WINDOW W, AD_COLUMN C
+ WHERE T.AD_TABLE_ID = AA.AD_TABLE_ID
+ AND AA.AD_TABLE_ID = TB.AD_TABLE_ID
+ AND TB.AD_WINDOW_ID = W.AD_WINDOW_ID
+ AND C.AD_TABLE_ID = AA.AD_TABLE_ID
+ AND (CASE (SELECT MAX(ISSOTRX) FROM C_DOCTYPE D
+ WHERE D.DOCBASETYPE = AA.DOCBASETYPE
+ AND D.AD_CLIENT_ID = AA.AD_CLIENT_ID) WHEN 'N' THEN
COALESCE(T.PO_WINDOW_ID, T.AD_WINDOW_ID) ELSE T.AD_WINDOW_ID END) =
W.AD_WINDOW_ID
+ AND C.ISKEY = 'Y'
ORDER BY SCHEMA_NAME, DATEACCT, FACTACCTTYPE2, IDENTIFIER, SEQNO
]]></Sql>
<Field name="rownum" value="count"/>
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Ciosco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
