diff --git a/src-db/database/model/tables/GL_JOURNAL.xml b/src-db/database/model/tables/GL_JOURNAL.xml --- a/src-db/database/model/tables/GL_JOURNAL.xml +++ b/src-db/database/model/tables/GL_JOURNAL.xml @@ -161,6 +161,10 @@ + + + + @@ -220,6 +224,7 @@ + diff --git a/src-db/database/model/tables/GL_JOURNALLINE.xml b/src-db/database/model/tables/GL_JOURNALLINE.xml --- a/src-db/database/model/tables/GL_JOURNALLINE.xml +++ b/src-db/database/model/tables/GL_JOURNALLINE.xml @@ -89,7 +89,7 @@ - + @@ -169,6 +169,13 @@ + + + + + + + @@ -244,6 +251,7 @@ + diff --git a/src-db/database/model/triggers/GL_JOURNALLINE2_TRG.xml b/src-db/database/model/triggers/GL_JOURNALLINE2_TRG.xml --- a/src-db/database/model/triggers/GL_JOURNALLINE2_TRG.xml +++ b/src-db/database/model/triggers/GL_JOURNALLINE2_TRG.xml @@ -29,6 +29,7 @@ v_CurrencyRate NUMBER; v_CurrencyRateType VARCHAR(60) ; v_DateAcct DATE; + v_IsMultiGL CHAR(1); BEGIN @@ -43,11 +44,11 @@ SELECT C_AcctSchema_ID, CurrencyRate, COALESCE(CurrencyRateType, 'S'), - dateacct + dateacct, multi_gl INTO v_AcctSchema_ID, v_CurrencyRate, v_CurrencyRateType, - v_DateAcct + v_DateAcct, v_IsMultiGL FROM GL_Journal WHERE GL_Journal_ID=:NEW.GL_Journal_ID; SELECT COALESCE(MAX(c.C_Currency_ID), '0'), @@ -62,6 +63,9 @@ IF(v_rate IS NULL OR v_rate = 0) THEN v_rate:=C_CURRENCY_RATE(:NEW.C_Currency_ID, v_TargetCurrency_ID, v_DateAcct, v_CurrencyRateType, :NEW.AD_CLIENT_ID, :NEW.AD_ORG_ID) ; END IF; + IF(v_IsMultiGL = 'Y') THEN + v_rate:= 1; + END IF; :NEW.AMTACCTDR:=ROUND(COALESCE(:NEW.AMTSOURCEDR, 0) *v_rate, v_StdPrecision) ; :NEW.AMTACCTCR:=ROUND(COALESCE(:NEW.AMTSOURCECR, 0) *v_rate, v_StdPrecision) ; :NEW.CURRENCYRATE:=v_rate; diff --git a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml --- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml +++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml @@ -1931,6 +1931,17 @@ + + + + + + + + + + + @@ -2414,6 +2425,17 @@ + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -22737,7 +22737,7 @@ - + @@ -22775,7 +22775,7 @@ - + @@ -22814,7 +22814,7 @@ - '' AND @C_Period_ID@ IS NOT NULL) THEN @C_Period_ID@ ELSE C_Period_ID END FROM C_Period WHERE C_Year_ID IN (SELECT C_Year_ID FROM C_Year WHERE C_Calendar_ID =(SELECT C_Calendar_ID FROM AD_ORG WHERE AD_Client_ID= @AD_Client_ID@ AND AD_ORG_ID=(SELECT AD_ORG_GETCALENDAROWNER( @AD_Org_ID@ ) from dual))) AND to_date( @DateAcct@ ) BETWEEN StartDate AND EndDate AND PeriodType='S' AND exists (select 1 from c_periodcontrol where c_periodcontrol.c_period_id = c_period.c_period_id AND periodstatus = 'O')]]> + '' AND @C_Period_ID@ IS NOT NULL) THEN @C_Period_ID@ ELSE C_Period_ID END FROM C_Period WHERE C_Year_ID IN (SELECT C_Year_ID FROM C_Year WHERE C_Calendar_ID =(SELECT C_Calendar_ID FROM AD_ORG WHERE AD_Client_ID= @AD_Client_ID@ AND AD_ORG_ID=(SELECT AD_ORG_GETCALENDAROWNER( @AD_Org_ID@ ) from dual))) AND to_date( COALESCE(@DateAcct@,@#Date@) ) BETWEEN StartDate AND EndDate AND PeriodType='S' AND exists (select 1 from c_periodcontrol where c_periodcontrol.c_period_id = c_period.c_period_id AND periodstatus = 'O')]]> @@ -23657,7 +23657,7 @@ - + @@ -23939,7 +23939,6 @@ - @@ -88938,9 +88937,9 @@ - + - + @@ -315652,7 +315651,7 @@ - + @@ -325404,6 +325403,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -326755,6 +326790,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml +++ b/src-db/database/sourcedata/AD_ELEMENT.xml @@ -30763,6 +30763,18 @@ + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml +++ b/src-db/database/sourcedata/AD_FIELD.xml @@ -174835,6 +174835,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -175401,6 +175430,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -175656,6 +175713,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -175856,6 +175943,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -176048,6 +176166,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -177413,6 +177558,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -177580,6 +177755,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -180081,6 +180283,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -181343,6 +181574,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -183152,6 +183414,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -184164,6 +184457,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -185910,6 +186234,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -187549,6 +187902,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -188055,6 +188438,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -189024,6 +189436,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -189846,6 +190287,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -190893,6 +191363,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -191001,6 +191498,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -191371,6 +191899,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -192370,6 +192925,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -192428,6 +193011,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -192946,6 +193559,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -194146,6 +194819,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -194492,6 +195193,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -194606,6 +195335,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -195280,6 +196036,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -195877,6 +196659,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -197365,6 +198177,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -197509,6 +198348,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -197826,6 +198694,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -198282,6 +199177,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -198922,6 +199848,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -200924,6 +201878,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -200953,6 +201935,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -201382,6 +202393,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -201464,6 +202504,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -204453,6 +205519,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -212195,6 +213288,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -212306,6 +213427,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -212388,6 +213539,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -212588,6 +213769,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -213553,6 +214761,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -213837,6 +215073,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -214934,6 +216200,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -215108,6 +216405,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -217404,6 +218728,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -217432,6 +218783,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -218134,6 +219515,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -218722,6 +220130,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -220080,6 +221515,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -221290,6 +222753,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -221740,6 +223232,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -222056,6 +223578,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -222338,6 +223885,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -222538,6 +224112,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -224311,6 +225913,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -227026,6 +228657,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -228880,6 +230538,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -230790,6 +232476,36 @@ + + + + + + + + ". If the document type of your document has no automatic document sequence defined, the field will be empty when creating a new document. This is for documents which usually have an external number (like vendor invoice). If you leave the field empty, the system will generate a document number for you. The document sequence used for this fallback number is defined in the "Document Sequence" window with the name "DocumentNo_", where TableName is the actual name of the table inside the database (e.g. C_Order).]]> + + + + + + + + + + + + + + + + + + + + + + @@ -232531,6 +234247,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -233821,6 +235565,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -234156,6 +235929,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -235854,6 +237655,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -238284,6 +240112,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -239158,6 +241015,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -239212,6 +241099,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -240085,6 +242002,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -240251,6 +242195,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -241361,6 +243335,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -241814,6 +243815,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -242067,6 +244097,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -242431,6 +244490,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -242489,6 +244579,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -242797,6 +244917,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -243290,6 +245438,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -243962,6 +246137,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -245396,6 +247601,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -247116,6 +249351,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -253825,6 +256088,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -255452,6 +257743,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -255880,6 +258200,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -256352,6 +258702,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -257744,6 +260121,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -258435,6 +260842,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -258624,6 +261059,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -258713,6 +261178,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -260018,6 +262512,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -260466,6 +262989,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -260923,6 +263474,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -260951,6 +263531,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -261151,6 +263758,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -261830,6 +264464,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -263253,6 +265917,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -263676,6 +266368,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -264235,6 +266958,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -265040,6 +267790,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -268261,6 +271039,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -268742,6 +271549,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -268916,6 +271752,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -270050,6 +272917,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -270078,6 +272975,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -270530,6 +273456,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -272531,6 +275485,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -274203,6 +277185,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -274317,6 +277327,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -274455,6 +277494,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -275692,6 +278758,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -275938,6 +279031,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -277405,6 +280529,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -278003,6 +281154,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -278056,6 +281237,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -279497,6 +282707,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -279938,6 +283177,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -280137,6 +283404,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -280593,6 +283890,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -282467,6 +285791,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -282778,6 +286130,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -283439,6 +286818,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -284130,6 +287536,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -284157,6 +287591,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -284388,6 +287852,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -284418,6 +287909,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_MENU.xml b/src-db/database/sourcedata/AD_MENU.xml --- a/src-db/database/sourcedata/AD_MENU.xml +++ b/src-db/database/sourcedata/AD_MENU.xml @@ -5171,6 +5171,19 @@ + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml +++ b/src-db/database/sourcedata/AD_MESSAGE.xml @@ -22254,6 +22254,18 @@ + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_TAB.xml b/src-db/database/sourcedata/AD_TAB.xml --- a/src-db/database/sourcedata/AD_TAB.xml +++ b/src-db/database/sourcedata/AD_TAB.xml @@ -13561,6 +13561,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -14760,6 +14793,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15622,6 +15685,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_TREENODE.xml b/src-db/database/sourcedata/AD_TREENODE.xml --- a/src-db/database/sourcedata/AD_TREENODE.xml +++ b/src-db/database/sourcedata/AD_TREENODE.xml @@ -260,7 +260,7 @@ - + @@ -1239,7 +1239,7 @@ - + @@ -1965,7 +1965,7 @@ - + @@ -2768,7 +2768,7 @@ - + @@ -2779,7 +2779,7 @@ - + @@ -3054,7 +3054,7 @@ - + @@ -3980,6 +3980,17 @@ + + + + + + + + + + + @@ -4054,7 +4065,7 @@ - + @@ -4197,7 +4208,7 @@ - + diff --git a/src-db/database/sourcedata/AD_VAL_RULE.xml b/src-db/database/sourcedata/AD_VAL_RULE.xml --- a/src-db/database/sourcedata/AD_VAL_RULE.xml +++ b/src-db/database/sourcedata/AD_VAL_RULE.xml @@ -1245,6 +1245,17 @@ + + + + + + + + + + + @@ -1423,7 +1434,7 @@ - -1 AND IsReady='Y']]> + -1 AND IsReady='Y') or @Batch_Org@ is null]]> @@ -1886,6 +1897,18 @@ + + + + + + + + -1 AND IsReady='Y') or +AD_ISORGINCLUDED(ad_org.ad_org_id, @Journal_Org@, ad_org.ad_client_id)<>-1 AND IsReady='Y']]> + + + diff --git a/src-db/database/sourcedata/AD_WINDOW.xml b/src-db/database/sourcedata/AD_WINDOW.xml --- a/src-db/database/sourcedata/AD_WINDOW.xml +++ b/src-db/database/sourcedata/AD_WINDOW.xml @@ -3179,6 +3179,21 @@ + + + + + + + + + + + + + + + diff --git a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java --- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java +++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java @@ -735,9 +735,10 @@ // Create Fact per AcctSchema // if (log4j.isDebugEnabled()) log4j.debug("POSTLOADING ARRAY: " + // AD_Client_ID); - if (!DocumentType.equals(DOCTYPE_GLJournal)) + if (!String.valueOf(data[0].getField("multiGl")).equals("N")) { // m_as = AcctSchema.getAcctSchemaArray(conn, AD_Client_ID, AD_Org_ID); reloadAcctSchemaArray(AD_Org_ID); + } // if (log4j.isDebugEnabled()) // log4j.debug("AcctServer - Post - Antes de new Fact - C_CURRENCY_ID = " // + C_Currency_ID); @@ -1307,7 +1308,6 @@ log4j.debug("AcctServer - getConvertedAmount - starting method - Amt : " + Amt + " - CurFrom_ID : " + CurFrom_ID + " - CurTo_ID : " + CurTo_ID + "- ConvDate: " + ConvDate + " - RateType:" + RateType + " - client:" + client + "- org:" + org); - if (Amt.equals("")) throw new IllegalArgumentException( "AcctServer - getConvertedAmt - required parameter missing - Amt"); diff --git a/src/org/openbravo/erpCommon/ad_forms/DocGLJournal.java b/src/org/openbravo/erpCommon/ad_forms/DocGLJournal.java --- a/src/org/openbravo/erpCommon/ad_forms/DocGLJournal.java +++ b/src/org/openbravo/erpCommon/ad_forms/DocGLJournal.java @@ -70,11 +70,9 @@ */ public boolean loadDocumentDetails(FieldProvider[] data, ConnectionProvider conn) { loadDocumentType(); // lines require doc type - m_PostingType = data[0].getField("PostingType"); m_IsOpening = data[0].getField("isopening"); C_Period_ID = isperiodOpen(conn, data[0].getField("period")); - // Contained Objects p_lines = loadLines(conn); log4jDocGLJournal.debug("Lines=" + p_lines.length); @@ -88,24 +86,18 @@ */ private DocLine[] loadLines(ConnectionProvider conn) { ArrayList list = new ArrayList(); - DocLineGLJournalData[] data = null; try { data = DocLineGLJournalData.select(conn, Record_ID); for (int i = 0; i < data.length; i++) { String Line_ID = data[i].glJournallineId; - DocLine docLine = new DocLine(DocumentType, Record_ID, Line_ID); + DocLine_GLJournal docLine = new DocLine_GLJournal(DocumentType, Record_ID, Line_ID); docLine.loadAttributes(data[i], this); docLine.m_Record_Id2 = data[i].cDebtPaymentId; // -- Source Amounts - String AmtSourceDr = data[i].amtsourcedr; - String AmtSourceCr = data[i].amtsourcecr; - docLine.setAmount(AmtSourceDr, AmtSourceCr); + docLine.setAmount(data[i].amtsourcedr, data[i].amtsourcecr); // -- Converted Amounts - String C_AcctSchema_ID = data[i].cAcctschemaId; - String AmtAcctDr = data[i].amtacctdr; - String AmtAcctCr = data[i].amtacctcr; - docLine.setConvertedAmt(C_AcctSchema_ID, AmtAcctDr, AmtAcctCr); + docLine.setConvertedAmt(null, data[i].amtacctdr, data[i].amtacctcr); docLine.m_DateAcct = this.DateAcct; // -- Account String C_ValidCombination_ID = data[i].cValidcombinationId; @@ -118,7 +110,6 @@ docLine.setAccount(acct); // -- Set Org from account (x-org) docLine.setAD_Org_ID(data[i].adOrgId); - // list.add(docLine); } } catch (ServletException e) { @@ -144,7 +135,6 @@ sb.append("+").append(p_lines[i].getAmount()); } sb.append("]"); - // log4jDocGLJournal.debug(toString() + " Balance=" + retValue + sb.toString()); return retValue; } // getBalance @@ -184,13 +174,26 @@ // account DR CR OBContext.setAdminMode(true); try { + Account account; for (int i = 0; i < p_lines.length; i++) { - if (p_lines[i].getC_AcctSchema_ID().equals(as.getC_AcctSchema_ID())) { - fact.createLine(p_lines[i], p_lines[i].getAccount(), C_Currency_ID, - p_lines[i].getAmtSourceDr(), p_lines[i].getAmtSourceCr(), Fact_Acct_Group_ID, - nextSeqNo(SeqNo), DocumentType, conn); + if (Float.parseFloat(p_lines[i].getAmtSourceDr()) > Float.parseFloat(p_lines[i] + .getAmtSourceCr())) { + account = ((DocLine_GLJournal) p_lines[i]).getAccount("1", as, conn); + } else { + account = ((DocLine_GLJournal) p_lines[i]).getAccount("2", as, conn); } - } // for all lines + fact.createLine( + p_lines[i], + account, + as.getC_Currency_ID(), + getConvertedAmt(p_lines[i].getAmtSourceDr(), C_Currency_ID, as.getC_Currency_ID(), + DateAcct, "", AD_Client_ID, AD_Org_ID, conn), + getConvertedAmt(p_lines[i].getAmtSourceCr(), C_Currency_ID, as.getC_Currency_ID(), + DateAcct, "", AD_Client_ID, AD_Org_ID, conn), Fact_Acct_Group_ID, + nextSeqNo(SeqNo), DocumentType, conn); + fact.getLines()[i].setAmtAcct(fact.getLines()[i].getM_AmtSourceDr(), + fact.getLines()[i].getM_AmtSourceCr()); + } } finally { OBContext.restorePreviousMode(); } @@ -274,6 +277,31 @@ setStatus(STATUS_DocumentDisabled); return false; } + DocGLJournalData[] data = null; + try { + data = DocGLJournalData.select(conn, AD_Client_ID, strRecordId); + AcctSchema[] m_acctSchemas = reloadLocalAcctSchemaArray(data[0].adOrgId); + + AcctSchema acct = null; + + for (int i = 0; i < m_acctSchemas.length; i++) { + acct = m_acctSchemas[i]; + data = DocGLJournalData.selectFinInvCount(conn, strRecordId, acct.m_C_AcctSchema_ID); + int countFinInv = Integer.parseInt(data[0].fininvcount); + int countGLItemAcct = Integer.parseInt(data[0].finacctcount); + // For any GL Item used in financial invoice lines debit/credit accounts must be defined + if (countFinInv != 0 && (countFinInv != countGLItemAcct)) { + log4jDocGLJournal + .debug("DocGLJournal - getDocumentConfirmation - GL Item used in financial " + + "GLJournal lines debit/credit accounts must be defined."); + setStatus(STATUS_InvalidAccount); + return false; + } + } + + } catch (Exception e) { + log4jDocGLJournal.error("Exception in getDocumentConfirmation method.", e); + } return true; } @@ -297,4 +325,25 @@ public String getServletInfo() { return "Servlet for the accounting"; } // end of getServletInfo() method + + private AcctSchema[] reloadLocalAcctSchemaArray(String adOrgId) throws ServletException { + AcctSchema acct = null; + ArrayList new_as = new ArrayList(); + // We reload again all the acct schemas of the client + AcctSchema[] m_aslocal = AcctSchema.getAcctSchemaArray(connectionProvider, AD_Client_ID, + adOrgId); + // Filter the right acct schemas for the organization + for (int i = 0; i < m_aslocal.length; i++) { + acct = m_aslocal[i]; + if (AcctSchemaData.selectAcctSchemaTable(connectionProvider, acct.m_C_AcctSchema_ID, + AD_Table_ID)) { + new_as.add(new AcctSchema(connectionProvider, acct.m_C_AcctSchema_ID)); + } + } + AcctSchema[] retValue = new AcctSchema[new_as.size()]; + new_as.toArray(retValue); + m_aslocal = retValue; + return m_aslocal; + } + } diff --git a/src/org/openbravo/erpCommon/ad_forms/DocGLJournalTemplate.java b/src/org/openbravo/erpCommon/ad_forms/DocGLJournalTemplate.java --- a/src/org/openbravo/erpCommon/ad_forms/DocGLJournalTemplate.java +++ b/src/org/openbravo/erpCommon/ad_forms/DocGLJournalTemplate.java @@ -28,7 +28,7 @@ public abstract class DocGLJournalTemplate { private static final long serialVersionUID = 1L; - static Logger log4jDocGLJournal = Logger.getLogger(DocInvoice.class); + static Logger log4jDocGLJournal = Logger.getLogger(DocGLJournal.class); /** * Constructor diff --git a/src/org/openbravo/erpCommon/ad_forms/DocGLJournal_data.xsql b/src/org/openbravo/erpCommon/ad_forms/DocGLJournal_data.xsql --- a/src/org/openbravo/erpCommon/ad_forms/DocGLJournal_data.xsql +++ b/src/org/openbravo/erpCommon/ad_forms/DocGLJournal_data.xsql @@ -29,7 +29,8 @@ SELECT G.AD_CLIENT_ID, G.AD_ORG_ID, G.DOCUMENTNO, G.DATEACCT, G.DATEDOC, G.C_CURRENCY_ID, G.C_DOCTYPE_ID, G.POSTED, G.POSTINGTYPE, G.ISOPENING, G.C_CAMPAIGN_ID, G.C_PROJECT_ID, G.USER1_ID, G.USER2_ID, G.C_COSTCENTER_ID, - G.A_ASSET_ID, G.C_BPARTNER_ID, G.M_PRODUCT_ID, G.C_PERIOD_ID AS PERIOD + G.A_ASSET_ID, G.C_BPARTNER_ID, G.M_PRODUCT_ID, G.C_PERIOD_ID AS PERIOD, + '' AS FININVCOUNT,'' AS FINACCTCOUNT, G.MULTI_GL FROM GL_JOURNAL G WHERE AD_CLIENT_ID=? AND GL_JOURNAL_ID=? @@ -65,4 +66,24 @@ + + + + + + + + + + + + diff --git a/src/org/openbravo/erpCommon/ad_forms/DocLineGLJournal_data.xsql b/src/org/openbravo/erpCommon/ad_forms/DocLineGLJournal_data.xsql --- a/src/org/openbravo/erpCommon/ad_forms/DocLineGLJournal_data.xsql +++ b/src/org/openbravo/erpCommon/ad_forms/DocLineGLJournal_data.xsql @@ -26,29 +26,62 @@ + SELECT + JL.GL_JOURNALLINE_ID, + JL.AD_CLIENT_ID, + JL.AD_ORG_ID, + JL.LINE, + JL.DESCRIPTION, + JL.C_CURRENCY_ID, + JL.AMTSOURCEDR, + JL.AMTSOURCECR, + JL.CURRENCYRATETYPE, + JL.CURRENCYRATE, + J.DATEACCT,JL.AMTACCTDR, + JL.AMTACCTCR, + JL.C_UOM_ID, + JL.Qty, + VC.C_ACCTSCHEMA_ID, + VC.C_VALIDCOMBINATION_ID, + JL.ACCOUNT_ID AS M_C_GLITEM_ID, + VC.AD_ORGTRX_ID, + VC.C_LOCFROM_ID, + VC.C_LOCTO_ID, + COALESCE(JL.M_PRODUCT_ID, VC.M_PRODUCT_ID) AS M_PRODUCT_ID, + COALESCE(JL.C_BPARTNER_ID, VC.C_BPARTNER_ID) AS C_BPARTNERr_ID, + COALESCE(JL.C_SALESREGION_ID,VC.C_SALESREGION_ID) AS C_SALESREGION_ID, + COALESCE(JL.C_PROJECT_ID,VC.C_PROJECT_ID) AS C_PROJECT_ID, + COALESCE(JL.C_CAMPAIGN_ID,VC.C_CAMPAIGN_ID) AS C_CAMPAIGN_ID, + COALESCE(JL.C_ACTIVITY_ID,VC.C_ACTIVITY_ID) AS C_ACTIVITY_ID, + COALESCE(JL.USER1_ID,VC.USER1_ID) AS USER1_ID, + COALESCE(JL.USER2_ID,VC.USER2_ID) AS USER2_ID, + JL.C_COSTCENTER_ID,JL.A_ASSET_ID, + JL.C_DEBT_PAYMENT_ID,JL.C_WITHHOLDING_ID, + JL.C_TAX_ID, + '' AS GLITEM_DEBIT_ACCT, + '' as GLITEM_CREDIT_ACCT + FROM + GL_JOURNALLINE JL INNER JOIN GL_JOURNAL J ON J.GL_JOURNAL_ID = JL.GL_JOURNAL_ID + LEFT JOIN C_VALIDCOMBINATION VC ON VC.C_VALIDCOMBINATION_ID=JL.C_VALIDCOMBINATION_ID + LEFT JOIN C_GLITEM GLI ON JL.ACCOUNT_ID = GLI.C_GLITEM_ID + WHERE JL.GL_JOURNAL_ID = ? AND JL.ISACTIVE='Y' AND ((VC.ISFULLYQUALIFIED='Y' AND + JL.C_VALIDCOMBINATION_ID IS NOT NULL) OR (JL.C_VALIDCOMBINATION_ID IS NULL) ) ORDER BY JL.LINE]]> + + + + + + + + + + diff --git a/src/org/openbravo/erpCommon/ad_forms/DocLine_GLJournal.java b/src/org/openbravo/erpCommon/ad_forms/DocLine_GLJournal.java new file mode 100644 --- /dev/null +++ b/src/org/openbravo/erpCommon/ad_forms/DocLine_GLJournal.java @@ -0,0 +1,62 @@ +package org.openbravo.erpCommon.ad_forms; + +import javax.servlet.ServletException; + +import org.apache.log4j.Logger; +import org.openbravo.database.ConnectionProvider; + +public class DocLine_GLJournal extends DocLine { + static Logger log4jDocLine_GLJournal = Logger.getLogger(DocLine_GLJournal.class); + + public DocLine_GLJournal(String DocumentType, String TrxHeader_ID, String TrxLine_ID) { + super(DocumentType, TrxHeader_ID, TrxLine_ID); + } + + /** + * Line Account from Product (or Charge). + * + * @param AcctType + * see ProoductInfo.ACCTTYPE_* (0..3) + * @param as + * Accounting schema + * @return Requested Product Account + */ + public Account getAccount(String AcctType, AcctSchema as, ConnectionProvider conn) { + + // GL Item directly from GLJournal Line + if (m_C_Glitem_ID != null && !m_C_Glitem_ID.equals("")) { + try { + DocLineGLJournalData[] data = null; + data = DocLineGLJournalData.selectGlitem(conn, m_C_Glitem_ID, as.getC_AcctSchema_ID()); + String Account_ID = ""; + if (data == null || data.length == 0) + return null; + if (data.length > 0) { + switch (Integer.parseInt(AcctType)) { + case 1: + // It is similar to ProductInfo.ACCTTYPE_P_Revenue + Account_ID = data[0].glitemCreditAcct; + break; + case 2: + // It is similar to ProductInfo.ACCTTYPE_P_Expense + Account_ID = data[0].glitemDebitAcct; + break; + } + } + // No account + if (Account_ID.equals("")) { + log4jDocLine_GLJournal.warn("getAccount - NO account for m_C_Glitem_ID=" + m_C_Glitem_ID); + return null; + } + // Return Account + return Account.getAccount(conn, Account_ID); + + } catch (ServletException e) { + log4jDocLine_GLJournal.warn(e); + } + } else { + return this.m_account; + } + return null; + } // getAccount +} diff --git a/src/org/openbravo/erpCommon/ad_forms/FactLine.java b/src/org/openbravo/erpCommon/ad_forms/FactLine.java --- a/src/org/openbravo/erpCommon/ad_forms/FactLine.java +++ b/src/org/openbravo/erpCommon/ad_forms/FactLine.java @@ -458,6 +458,14 @@ m_AmtAcctDr = amtAcctDr; } + public String getM_AmtSourceDr() { + return m_AmtSourceDr; + } + + public String getM_AmtSourceCr() { + return m_AmtSourceCr; + } + /** * Returns Source Balance of line * diff --git a/src/org/openbravo/event/SimpleGLJournalEventHandler.java b/src/org/openbravo/event/SimpleGLJournalEventHandler.java new file mode 100644 --- /dev/null +++ b/src/org/openbravo/event/SimpleGLJournalEventHandler.java @@ -0,0 +1,63 @@ +/* + ************************************************************************* + * 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) 2014 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************ + */ +package org.openbravo.event; + +import javax.enterprise.event.Observes; + +import org.openbravo.base.exception.OBException; +import org.openbravo.base.model.Entity; +import org.openbravo.base.model.ModelProvider; +import org.openbravo.base.model.Property; +import org.openbravo.client.kernel.event.EntityPersistenceEventObserver; +import org.openbravo.client.kernel.event.EntityUpdateEvent; +import org.openbravo.erpCommon.utility.OBMessageUtils; +import org.openbravo.model.financialmgmt.gl.GLJournal; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class SimpleGLJournalEventHandler extends EntityPersistenceEventObserver { + private static Entity[] entities = { ModelProvider.getInstance().getEntity(GLJournal.ENTITY_NAME) }; + + protected Logger logger = LoggerFactory.getLogger(SimpleGLJournalEventHandler.class); + + @Override + protected Entity[] getObservedEntities() { + return entities; + } + + public void onUpdate(@Observes EntityUpdateEvent event) { + if (!isValidEvent(event)) { + return; + } + final Entity simpleGLJournalEntity = ModelProvider.getInstance().getEntity(GLJournal.class); + final Property isMulti = simpleGLJournalEntity + .getProperty(GLJournal.PROPERTY_MULTIGENERALLEDGER); + + // Multi-general Ledger Check changed + if (event.getCurrentState(isMulti) != event.getPreviousState(isMulti)) { + final GLJournal simpleGLJournal = (GLJournal) event.getTargetInstance(); + + if (simpleGLJournal.getFinancialMgmtGLJournalLineList().size() > 0) { + throw new OBException(OBMessageUtils.getI18NMessage("MultiGeneralLedgerCheckValidation", + null)); + } + } + + } +} \ No newline at end of file