details: https://code.openbravo.com/erp/devel/pi/rev/f79cef63a8db changeset: 14160:f79cef63a8db user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Fri Oct 21 13:37:51 2011 +0200 summary: Fixes issue 18460: If we change the name of an element value, the description and the Combination of the Account Combination are not saved properly.
details: https://code.openbravo.com/erp/devel/pi/rev/22daa81cf02c changeset: 14161:22daa81cf02c user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue Oct 25 13:32:44 2011 +0200 summary: Fixes issue 18659: Exchange rate tab has bad validation for Currency field in more tabs. details: https://code.openbravo.com/erp/devel/pi/rev/26cacd3c5774 changeset: 14162:26cacd3c5774 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Oct 26 19:12:02 2011 +0200 summary: Backout of the fix for the issue 18412. details: https://code.openbravo.com/erp/devel/pi/rev/f298bc6c2d27 changeset: 14163:f298bc6c2d27 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Thu Oct 27 13:15:24 2011 +0200 summary: Fixes issue 18861: General Ledger Journal report not showing Transction accounting entries. details: https://code.openbravo.com/erp/devel/pi/rev/87c5aab813f5 changeset: 14164:87c5aab813f5 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Thu Oct 27 13:46:07 2011 +0200 summary: Fixes issue 18602: In Balance sheet setup the user can select an accounting scheme that does not match the selected organization. diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml | 2 +- src-db/database/model/functions/AD_GETTAB_FROM_TABLE.xml | 89 ++++++++++ src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml | 8 +- src-db/database/sourcedata/AD_COLUMN.xml | 3 +- src-db/database/sourcedata/AD_EXTENSION_POINTS.xml | 10 + src-db/database/sourcedata/AD_VAL_RULE.xml | 16 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql | 57 +---- 7 files changed, 137 insertions(+), 48 deletions(-) diffs (297 lines): diff -r 73715ca10d19 -r 87c5aab813f5 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Fri Oct 28 09:58:35 2011 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Thu Oct 27 13:46:07 2011 +0200 @@ -4705,7 +4705,7 @@ <!--A37C6F84AA1E3F50E040007F01006E35--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--A37C6F84AA1E3F50E040007F01006E35--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> <!--A37C6F84AA1E3F50E040007F01006E35--> <AD_ELEMENT_ID><![CDATA[A37C6F84AA423F50E040007F01006E35]]></AD_ELEMENT_ID> -<!--A37C6F84AA1E3F50E040007F01006E35--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--A37C6F84AA1E3F50E040007F01006E35--> <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR> <!--A37C6F84AA1E3F50E040007F01006E35--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--A37C6F84AA1E3F50E040007F01006E35--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--A37C6F84AA1E3F50E040007F01006E35--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> diff -r 73715ca10d19 -r 87c5aab813f5 src-db/database/model/functions/AD_GETTAB_FROM_TABLE.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src-db/database/model/functions/AD_GETTAB_FROM_TABLE.xml Thu Oct 27 13:46:07 2011 +0200 @@ -0,0 +1,89 @@ +<?xml version="1.0"?> + <database name="FUNCTION AD_GETTAB_FROM_TABLE"> + <function name="AD_GETTAB_FROM_TABLE" type="VARCHAR"> + <parameter name="p_table_id" type="VARCHAR" mode="in"> + <default/> + </parameter> + <parameter name="p_docbasetype" type="VARCHAR" mode="in"> + <default/> + </parameter> + <parameter name="p_client_id" type="VARCHAR" mode="in"> + <default/> + </parameter> + <body><![CDATA[/************************************************************************* +* The contents of this file are subject to the Openbravo Public License +* Version 1.1 (the "License"), being the Mozilla Public License +* Version 1.1 with a permitted attribution clause; you may not use this +* file except in compliance with the License. You may obtain a copy of +* the License at http://www.openbravo.com/legal/license.html +* Software distributed under the License is distributed on an "AS IS" +* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +* License for the specific language governing rights and limitations +* under the License. +* The Original Code is Openbravo ERP. +* The Initial Developer of the Original Code is Openbravo SLU +* All portions are Copyright (C) 2001-2009 Openbravo SLU +* All Rights Reserved. +* Contributor(s): ______________________________________. +************************************************************************/ + -- Logistice + v_count NUMBER; + v_return VARCHAR2(32); + v_record_ID VARCHAR2(32); + +BEGIN + + IF (p_table_id = '4D8C3B3C31D1410DA046140C9F024D17') THEN --'APRM_Finacc_Transaction_v' + RETURN 'FF8080812F213146012F2135BC25000E'; --Transactions + ELSE + -- General Ledger Journal - Link to Tabs Extension Point + + SELECT count(*) INTO v_count FROM DUAL + WHERE EXISTS (SELECT 1 FROM ad_ep_procedures WHERE ad_extension_points_id = '830A9E22114C4322BBD2144C215C85E4'); + IF (v_count=1) THEN + DECLARE + v_ep_instance VARCHAR2(32); + v_extension_point_id VARCHAR2(32) := '830A9E22114C4322BBD2144C215C85E4'; + BEGIN + DBMS_OUTPUT.PUT_LINE( '***********' || v_extension_point_id || '***********'); + v_ep_instance := get_uuid(); + AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'Record_ID', p_table_id, NULL, NULL, NULL, NULL, NULL, NULL); + AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'Return', v_return, NULL, NULL, NULL, NULL, NULL, NULL); + AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'DocAction', p_docbasetype, NULL, NULL, NULL, NULL, NULL, NULL); + AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'User', p_client_id, NULL, NULL, NULL, NULL, NULL, NULL); + AD_EXTENSION_POINT_HANDLER(v_ep_instance, v_extension_point_id); + SELECT p_string INTO v_return + FROM ad_ep_instance_para + WHERE ad_ep_instance_id = v_ep_instance + AND parametername LIKE 'Return'; + + DBMS_OUTPUT.PUT_LINE( '***********' || v_return || '***********'); + + DELETE FROM ad_ep_instance_para + WHERE ad_ep_instance_id = v_ep_instance; + END; + END IF; + + IF ((v_return is null) or (v_return = '')) THEN + SELECT max(tb.ad_tab_id) + INTO v_return + FROM ad_table t left join ad_tab tb on t.ad_table_id = tb.ad_table_id + left join ad_window w on tb.ad_window_id = w.ad_window_id + left join ad_column c on t.ad_table_id = c.ad_table_id + WHERE t.ad_table_id = p_table_id + AND (CASE (SELECT max(issotrx) + FROM c_doctype d + WHERE d.docbasetype = p_docbasetype + AND d.ad_client_id = p_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'; + END IF; + END IF; + RETURN v_return; +END AD_GETTAB_FROM_TABLE +]]></body> + </function> + </database> diff -r 73715ca10d19 -r 87c5aab813f5 src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml --- a/src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml Fri Oct 28 09:58:35 2011 +0200 +++ b/src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml Thu Oct 27 13:46:07 2011 +0200 @@ -103,11 +103,11 @@ -- Update combination and description fields only if needed to not to trigger a cross tables update UPDATE C_ValidCombination SET Updated=now(), - combination= TO_CHAR((SELECT AD_ORG.NAME FROM AD_ORG WHERE AD_ORG.AD_ORG_ID = C_VALIDCOMBINATION.AD_ORG_ID)) || '-' || :new.VALUE || '-_-_-_', - description= TO_CHAR((SELECT AD_ORG.NAME FROM AD_ORG WHERE AD_ORG.AD_ORG_ID = C_VALIDCOMBINATION.AD_ORG_ID)) || '-' || :new.NAME || '-_-_-_' + combination= TO_CHAR(REPLACE(combination, :old.VALUE, :new.VALUE)), + description= TO_CHAR(REPLACE(description, :old.NAME, :new.NAME)) WHERE (Account_ID=:new.C_ElementValue_ID OR User1_ID=:new.C_ElementValue_ID OR User2_ID=:new.C_ElementValue_ID) - AND (combination <> (TO_CHAR((SELECT AD_ORG.NAME FROM AD_ORG WHERE AD_ORG.AD_ORG_ID = C_VALIDCOMBINATION.AD_ORG_ID)) || '-' || :new.VALUE || '-_-_-_') - OR description <> (TO_CHAR((SELECT AD_ORG.NAME FROM AD_ORG WHERE AD_ORG.AD_ORG_ID = C_VALIDCOMBINATION.AD_ORG_ID)) || '-' || :new.NAME || '-_-_-_')); + AND (combination <> (TO_CHAR(REPLACE(combination, :old.VALUE, :new.VALUE)))) + OR description <> (TO_CHAR(REPLACE(description, :old.NAME, :new.NAME))); UPDATE Fact_Acct SET AcctValue=:new.VALUE,AcctDescription=:new.DESCRIPTION WHERE Account_ID=:new.C_ElementValue_ID; END IF; diff -r 73715ca10d19 -r 87c5aab813f5 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Fri Oct 28 09:58:35 2011 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Oct 27 13:46:07 2011 +0200 @@ -203915,6 +203915,7 @@ <!--1000600025--> <COLUMNNAME><![CDATA[C_Acctschema_ID]]></COLUMNNAME> <!--1000600025--> <AD_TABLE_ID><![CDATA[800223]]></AD_TABLE_ID> <!--1000600025--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> +<!--1000600025--> <AD_VAL_RULE_ID><![CDATA[FF808181331826EF01331B7415480041]]></AD_VAL_RULE_ID> <!--1000600025--> <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH> <!--1000600025--> <ISKEY><![CDATA[N]]></ISKEY> <!--1000600025--> <ISPARENT><![CDATA[N]]></ISPARENT> @@ -241879,7 +241880,7 @@ <!--7891269C83D0655DE040007F010155CE--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--7891269C83D0655DE040007F010155CE--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> <!--7891269C83D0655DE040007F010155CE--> <AD_ELEMENT_ID><![CDATA[0D1F9C2D797C49A7AA476A3047DC075A]]></AD_ELEMENT_ID> -<!--7891269C83D0655DE040007F010155CE--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--7891269C83D0655DE040007F010155CE--> <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR> <!--7891269C83D0655DE040007F010155CE--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--7891269C83D0655DE040007F010155CE--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> <!--7891269C83D0655DE040007F010155CE--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> diff -r 73715ca10d19 -r 87c5aab813f5 src-db/database/sourcedata/AD_EXTENSION_POINTS.xml --- a/src-db/database/sourcedata/AD_EXTENSION_POINTS.xml Fri Oct 28 09:58:35 2011 +0200 +++ b/src-db/database/sourcedata/AD_EXTENSION_POINTS.xml Thu Oct 27 13:46:07 2011 +0200 @@ -60,6 +60,16 @@ <!--8261F79453B64AC7998873A9F81A1E5A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8261F79453B64AC7998873A9F81A1E5A--></AD_EXTENSION_POINTS> +<!--830A9E22114C4322BBD2144C215C85E4--><AD_EXTENSION_POINTS> +<!--830A9E22114C4322BBD2144C215C85E4--> <AD_EXTENSION_POINTS_ID><![CDATA[830A9E22114C4322BBD2144C215C85E4]]></AD_EXTENSION_POINTS_ID> +<!--830A9E22114C4322BBD2144C215C85E4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--830A9E22114C4322BBD2144C215C85E4--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--830A9E22114C4322BBD2144C215C85E4--> <NAME><![CDATA[General Ledger Journal - Link to Tabs]]></NAME> +<!--830A9E22114C4322BBD2144C215C85E4--> <DESCRIPTION><![CDATA[Extension point called at the printing of General Ledger Journal. It has 4 available parameters Record_ID, Return, DocAction and User.]]></DESCRIPTION> +<!--830A9E22114C4322BBD2144C215C85E4--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--830A9E22114C4322BBD2144C215C85E4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--830A9E22114C4322BBD2144C215C85E4--></AD_EXTENSION_POINTS> + <!--C485210A6F754FE0A6E32FA24B3B243C--><AD_EXTENSION_POINTS> <!--C485210A6F754FE0A6E32FA24B3B243C--> <AD_EXTENSION_POINTS_ID><![CDATA[C485210A6F754FE0A6E32FA24B3B243C]]></AD_EXTENSION_POINTS_ID> <!--C485210A6F754FE0A6E32FA24B3B243C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 73715ca10d19 -r 87c5aab813f5 src-db/database/sourcedata/AD_VAL_RULE.xml --- a/src-db/database/sourcedata/AD_VAL_RULE.xml Fri Oct 28 09:58:35 2011 +0200 +++ b/src-db/database/sourcedata/AD_VAL_RULE.xml Thu Oct 27 13:46:07 2011 +0200 @@ -1790,8 +1790,22 @@ <!--FF8081813092D5DC013092DD70AD000C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--FF8081813092D5DC013092DD70AD000C--> <NAME><![CDATA[Document currency]]></NAME> <!--FF8081813092D5DC013092DD70AD000C--> <TYPE><![CDATA[S]]></TYPE> -<!--FF8081813092D5DC013092DD70AD000C--> <CODE><![CDATA[C_Currency_id = (SELECT c_currency_id FROM aprm_finacc_transaction_v WHERE aprm_finacc_transaction_v_id=@aprm_finacc_transaction_v_id@)]]></CODE> +<!--FF8081813092D5DC013092DD70AD000C--> <CODE><![CDATA[C_Currency.C_Currency_id = +CASE WHEN @C_Invoice_ID@ is not null THEN (SELECT C_Currency_ID FROM C_Invoice WHERE C_Invoice_ID = COALESCE(@C_Invoice_ID@,'---')) +WHEN @APRM_Finacc_Transaction_V_ID@ is not null THEN (SELECT c_currency_id FROM aprm_finacc_transaction_v WHERE aprm_finacc_transaction_v_id = COALESCE(@APRM_Finacc_Transaction_V_ID@, '---')) +ELSE (SELECT C_Currency_ID FROM FIN_Payment WHERE FIN_Payment_ID = COALESCE(@FIN_Payment_ID@, '---')) END]]></CODE> <!--FF8081813092D5DC013092DD70AD000C--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--FF8081813092D5DC013092DD70AD000C--></AD_VAL_RULE> +<!--FF808181331826EF01331B7415480041--><AD_VAL_RULE> +<!--FF808181331826EF01331B7415480041--> <AD_VAL_RULE_ID><![CDATA[FF808181331826EF01331B7415480041]]></AD_VAL_RULE_ID> +<!--FF808181331826EF01331B7415480041--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--FF808181331826EF01331B7415480041--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--FF808181331826EF01331B7415480041--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--FF808181331826EF01331B7415480041--> <NAME><![CDATA[C_AcctSchema - Schemas matching selected Org.]]></NAME> +<!--FF808181331826EF01331B7415480041--> <TYPE><![CDATA[S]]></TYPE> +<!--FF808181331826EF01331B7415480041--> <CODE><![CDATA[AD_ISORGINCLUDED(@AD_Org_ID@, AD_Org_Id, @AD_Client_ID@) <> -1]]></CODE> +<!--FF808181331826EF01331B7415480041--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--FF808181331826EF01331B7415480041--></AD_VAL_RULE> + </data> diff -r 73715ca10d19 -r 87c5aab813f5 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql --- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql Fri Oct 28 09:58:35 2011 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql Thu Oct 27 13:46:07 2011 +0200 @@ -28,15 +28,15 @@ <SqlMethodComment></SqlMethodComment> <Sql> <![CDATA[ - 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 + 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, AD_GETTAB_FROM_TABLE(AA.AD_TABLE_ID, AA.DOCBASETYPE, AA.AD_CLIENT_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, F.AD_CLIENT_ID - FROM FACT_ACCT F, C_ACCTSCHEMA SC + 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,16 +45,7 @@ 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), 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' + (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 ORDER BY SCHEMA_NAME, DATEACCT, FACTACCTTYPE2, IDENTIFIER, SEQNO ]]></Sql> <Field name="rownum" value="count"/> @@ -159,9 +150,10 @@ <SqlMethodComment></SqlMethodComment> <Sql> <![CDATA[ - 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 + 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, + AD_GETTAB_FROM_TABLE(AA.AD_TABLE_ID, AA.DOCBASETYPE, AA.AD_CLIENT_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, @@ -173,16 +165,7 @@ 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), 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' + (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 ORDER BY SCHEMA_NAME, DATEACCT, FACTACCTTYPE2, IDENTIFIER, SEQNO ]]></Sql> <Field name="rownum" value="count"/> @@ -227,9 +210,10 @@ <SqlMethodComment></SqlMethodComment> <Sql> <![CDATA[ - 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 + 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, + AD_GETTAB_FROM_TABLE(AA.AD_TABLE_ID, AA.DOCBASETYPE, AA.AD_CLIENT_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, @@ -241,16 +225,7 @@ 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), 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' + (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 ORDER BY SCHEMA_NAME, DATEACCT, FACTACCTTYPE2, IDENTIFIER, SEQNO ]]></Sql> <Field name="rownum" value="count"/> ------------------------------------------------------------------------------ Get your Android app more play: Bring it to the BlackBerry PlayBook in minutes. BlackBerry App World™ now supports Android™ Apps for the BlackBerry® PlayBook™. Discover just how easy and simple it is! http://p.sf.net/sfu/android-dev2dev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
