details: https://code.openbravo.com/erp/devel/pi/rev/e32651a677d6 changeset: 15835:e32651a677d6 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Mar 14 13:58:36 2012 +0100 summary: Fixes issue 19924: diferents organizations in gl journal - gl journal line.
details: https://code.openbravo.com/erp/devel/pi/rev/6d69db5ecb03 changeset: 15836:6d69db5ecb03 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Fri Mar 16 09:54:32 2012 +0100 summary: Related to issue 19924: diferents organizations in gl journal - gl journal line. diffstat: src-db/database/model/functions/GL_JOURNAL_POST.xml | 29 +++++++++++++++++++++ src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 +++++++ src-db/database/sourcedata/AD_COLUMN.xml | 4 +- src-db/database/sourcedata/AD_FIELD.xml | 6 ++- src-db/database/sourcedata/AD_MESSAGE.xml | 11 +++++++ src-db/database/sourcedata/AD_VAL_RULE.xml | 12 ++++++++ 6 files changed, 69 insertions(+), 4 deletions(-) diffs (161 lines): diff -r 85a9b7d0fc10 -r 6d69db5ecb03 src-db/database/model/functions/GL_JOURNAL_POST.xml --- a/src-db/database/model/functions/GL_JOURNAL_POST.xml Fri Mar 16 15:13:57 2012 +0100 +++ b/src-db/database/model/functions/GL_JOURNAL_POST.xml Fri Mar 16 09:54:32 2012 +0100 @@ -42,9 +42,11 @@ v_AD_Org_ID VARCHAR2(32); v_DateAcct DATE; v_DocType_ID VARCHAR2(32); + v_BatchOrg_ID VARCHAR2(32); -- Parameter TYPE RECORD IS REF CURSOR; Cur_Parameter RECORD; + Cur_Org_Lines RECORD; -- Parameter Variables -- Other Variables v_DocStatus GL_Journal.DocStatus%TYPE; @@ -206,6 +208,33 @@ IF (v_is_included=-1) THEN RAISE_APPLICATION_ERROR(-20000, '@LinesAndHeaderDifferentLEorBU@'); END IF; + + FOR Cur_Org_Lines IN + (SELECT gll.ad_org_id, + gll.ad_client_id + FROM gl_journalline gll + WHERE gll.gl_journal_id = v_Record_id + ) + LOOP + SELECT AD_ISORGINCLUDED(Cur_Org_Lines.ad_org_id, v_AD_Org_ID, Cur_Org_Lines.ad_client_id) + INTO v_is_included + FROM DUAL; + + IF (v_is_included=-1) THEN + RAISE_APPLICATION_ERROR(-20000, '@ForcedOrgNotMatchDocument@'); + END IF; + END LOOP; + + SELECT ad_org_id + INTO v_BatchOrg_ID + FROM gl_journalbatch + WHERE gl_journalbatch_id = (select gl_journalbatch_id + from gl_journal + where gl_journal_id = v_Record_id); + + IF (v_BatchOrg_ID <> v_AD_Org_ID) THEN + RAISE_APPLICATION_ERROR(-20000, '@BatchAndHeaderDifferentOrg@'); + END IF; -- Check the period control is opened (only if it is legal entity with accounting) -- Gets the BU or LE of the document diff -r 85a9b7d0fc10 -r 6d69db5ecb03 src-db/database/sourcedata/AD_AUXILIARINPUT.xml --- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Fri Mar 16 15:13:57 2012 +0100 +++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml Fri Mar 16 09:54:32 2012 +0100 @@ -863,6 +863,17 @@ <!--1FEA6AF375714E1A962C67E094001342--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--1FEA6AF375714E1A962C67E094001342--></AD_AUXILIARINPUT> +<!--2280D23A4CDB4F2AB21EBD991F2A1886--><AD_AUXILIARINPUT> +<!--2280D23A4CDB4F2AB21EBD991F2A1886--> <AD_AUXILIARINPUT_ID><![CDATA[2280D23A4CDB4F2AB21EBD991F2A1886]]></AD_AUXILIARINPUT_ID> +<!--2280D23A4CDB4F2AB21EBD991F2A1886--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--2280D23A4CDB4F2AB21EBD991F2A1886--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--2280D23A4CDB4F2AB21EBD991F2A1886--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--2280D23A4CDB4F2AB21EBD991F2A1886--> <AD_TAB_ID><![CDATA[159]]></AD_TAB_ID> +<!--2280D23A4CDB4F2AB21EBD991F2A1886--> <NAME><![CDATA[Batch_Org]]></NAME> +<!--2280D23A4CDB4F2AB21EBD991F2A1886--> <CODE><![CDATA[@AD_Org_ID@]]></CODE> +<!--2280D23A4CDB4F2AB21EBD991F2A1886--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--2280D23A4CDB4F2AB21EBD991F2A1886--></AD_AUXILIARINPUT> + <!--22AB3CC7FC16488795A2B228ED39EAC9--><AD_AUXILIARINPUT> <!--22AB3CC7FC16488795A2B228ED39EAC9--> <AD_AUXILIARINPUT_ID><![CDATA[22AB3CC7FC16488795A2B228ED39EAC9]]></AD_AUXILIARINPUT_ID> <!--22AB3CC7FC16488795A2B228ED39EAC9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 85a9b7d0fc10 -r 6d69db5ecb03 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Fri Mar 16 15:13:57 2012 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Mar 16 09:54:32 2012 +0100 @@ -22188,7 +22188,7 @@ <!--1619--> <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME> <!--1619--> <AD_TABLE_ID><![CDATA[224]]></AD_TABLE_ID> <!--1619--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> -<!--1619--> <AD_VAL_RULE_ID><![CDATA[53AE60A473D2460D8663D7A1BC5BA732]]></AD_VAL_RULE_ID> +<!--1619--> <AD_VAL_RULE_ID><![CDATA[425D5A5259F64FDABC82896596D23A25]]></AD_VAL_RULE_ID> <!--1619--> <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH> <!--1619--> <DEFAULTVALUE><![CDATA[@AD_Org_ID@]]></DEFAULTVALUE> <!--1619--> <ISKEY><![CDATA[N]]></ISKEY> @@ -23642,7 +23642,7 @@ <!--1661--> <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME> <!--1661--> <AD_TABLE_ID><![CDATA[226]]></AD_TABLE_ID> <!--1661--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> -<!--1661--> <AD_VAL_RULE_ID><![CDATA[53AE60A473D2460D8663D7A1BC5BA732]]></AD_VAL_RULE_ID> +<!--1661--> <AD_VAL_RULE_ID><![CDATA[425D5A5259F64FDABC82896596D23A25]]></AD_VAL_RULE_ID> <!--1661--> <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH> <!--1661--> <DEFAULTVALUE><![CDATA[@AD_Org_ID@]]></DEFAULTVALUE> <!--1661--> <ISKEY><![CDATA[N]]></ISKEY> diff -r 85a9b7d0fc10 -r 6d69db5ecb03 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Fri Mar 16 15:13:57 2012 +0100 +++ b/src-db/database/sourcedata/AD_FIELD.xml Fri Mar 16 09:54:32 2012 +0100 @@ -10402,9 +10402,10 @@ <!--824--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--824--> <AD_TAB_ID><![CDATA[160]]></AD_TAB_ID> <!--824--> <AD_COLUMN_ID><![CDATA[1619]]></AD_COLUMN_ID> -<!--824--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED> +<!--824--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> <!--824--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH> <!--824--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--824--> <SEQNO><![CDATA[5]]></SEQNO> <!--824--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE> <!--824--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--824--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> @@ -10766,9 +10767,10 @@ <!--903--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--903--> <AD_TAB_ID><![CDATA[161]]></AD_TAB_ID> <!--903--> <AD_COLUMN_ID><![CDATA[1661]]></AD_COLUMN_ID> -<!--903--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED> +<!--903--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> <!--903--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH> <!--903--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--903--> <SEQNO><![CDATA[5]]></SEQNO> <!--903--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE> <!--903--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--903--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> diff -r 85a9b7d0fc10 -r 6d69db5ecb03 src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml Fri Mar 16 15:13:57 2012 +0100 +++ b/src-db/database/sourcedata/AD_MESSAGE.xml Fri Mar 16 09:54:32 2012 +0100 @@ -18751,6 +18751,17 @@ <!--BAD33CDEBE2547A9A2FF7E87DA0B4C38--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--BAD33CDEBE2547A9A2FF7E87DA0B4C38--></AD_MESSAGE> +<!--BB7BE31A47834B5EAA165B9D05367895--><AD_MESSAGE> +<!--BB7BE31A47834B5EAA165B9D05367895--> <AD_MESSAGE_ID><![CDATA[BB7BE31A47834B5EAA165B9D05367895]]></AD_MESSAGE_ID> +<!--BB7BE31A47834B5EAA165B9D05367895--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--BB7BE31A47834B5EAA165B9D05367895--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--BB7BE31A47834B5EAA165B9D05367895--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--BB7BE31A47834B5EAA165B9D05367895--> <VALUE><![CDATA[BatchAndHeaderDifferentOrg]]></VALUE> +<!--BB7BE31A47834B5EAA165B9D05367895--> <MSGTEXT><![CDATA[Batch and Header must have the same Organization and must be parents to the lines' organizations.]]></MSGTEXT> +<!--BB7BE31A47834B5EAA165B9D05367895--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--BB7BE31A47834B5EAA165B9D05367895--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--BB7BE31A47834B5EAA165B9D05367895--></AD_MESSAGE> + <!--BB8D6006485A4EE6BA186F10B22F4579--><AD_MESSAGE> <!--BB8D6006485A4EE6BA186F10B22F4579--> <AD_MESSAGE_ID><![CDATA[BB8D6006485A4EE6BA186F10B22F4579]]></AD_MESSAGE_ID> <!--BB8D6006485A4EE6BA186F10B22F4579--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 85a9b7d0fc10 -r 6d69db5ecb03 src-db/database/sourcedata/AD_VAL_RULE.xml --- a/src-db/database/sourcedata/AD_VAL_RULE.xml Fri Mar 16 15:13:57 2012 +0100 +++ b/src-db/database/sourcedata/AD_VAL_RULE.xml Fri Mar 16 09:54:32 2012 +0100 @@ -1295,6 +1295,18 @@ <!--412A6B4D1F2E4A6B930262AE30F07775--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--412A6B4D1F2E4A6B930262AE30F07775--></AD_VAL_RULE> +<!--425D5A5259F64FDABC82896596D23A25--><AD_VAL_RULE> +<!--425D5A5259F64FDABC82896596D23A25--> <AD_VAL_RULE_ID><![CDATA[425D5A5259F64FDABC82896596D23A25]]></AD_VAL_RULE_ID> +<!--425D5A5259F64FDABC82896596D23A25--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--425D5A5259F64FDABC82896596D23A25--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--425D5A5259F64FDABC82896596D23A25--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--425D5A5259F64FDABC82896596D23A25--> <NAME><![CDATA[AD_Org show batch's child organizations]]></NAME> +<!--425D5A5259F64FDABC82896596D23A25--> <DESCRIPTION><![CDATA[It only shows the child organizations of the organization of the batch.]]></DESCRIPTION> +<!--425D5A5259F64FDABC82896596D23A25--> <TYPE><![CDATA[S]]></TYPE> +<!--425D5A5259F64FDABC82896596D23A25--> <CODE><![CDATA[AD_ISORGINCLUDED(ad_org.ad_org_id, @Batch_Org@, ad_org.ad_client_id)<>-1 AND IsReady='Y']]></CODE> +<!--425D5A5259F64FDABC82896596D23A25--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--425D5A5259F64FDABC82896596D23A25--></AD_VAL_RULE> + <!--49A6E01F27DB4D83939B1C34180837CC--><AD_VAL_RULE> <!--49A6E01F27DB4D83939B1C34180837CC--> <AD_VAL_RULE_ID><![CDATA[49A6E01F27DB4D83939B1C34180837CC]]></AD_VAL_RULE_ID> <!--49A6E01F27DB4D83939B1C34180837CC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> ------------------------------------------------------------------------------ This SF email is sponsosred by: Try Windows Azure free for 90 days Click Here http://p.sf.net/sfu/sfd2d-msazure _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
