details: /erp/devel/main/rev/9ae97cb0aa5b changeset: 7414:9ae97cb0aa5b user: Balamurugan Ramadoss <balamurugan.ramadoss <at> openbravo.com> date: Thu May 20 13:10:21 2010 +0530 summary: Fixes Issue 11730: On Cashflow Forecast amount appears with decimal comma.
details: /erp/devel/main/rev/eca1ef97ab25 changeset: 7415:eca1ef97ab25 user: Balamurugan Ramadoss <balamurugan.ramadoss <at> openbravo.com> date: Thu May 20 13:15:18 2010 +0530 summary: Fixes Issue 13272: Incorrect number format on Payment Tracker details: /erp/devel/main/rev/c4c2e83df2d3 changeset: 7416:c4c2e83df2d3 user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com> date: Thu May 20 17:58:34 2010 +0530 summary: Fixes Issue 13274 In the function c_validcombination_clone their is a logic for generating the new value for the element value.In this logic they are subtracting the Account Length from Sub account Length.Hence if both are equal this value will become zero.Hence a both the values are checked in the org schema trigger. details: /erp/devel/main/rev/e26acc124d93 changeset: 7417:e26acc124d93 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Thu May 20 15:47:57 2010 +0200 summary: Fixes in SimpleCallout: creating a combobox details: /erp/devel/main/rev/0106186e13ef changeset: 7418:0106186e13ef user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Thu May 20 17:23:02 2010 +0200 summary: Fixes issue 0013378: Not working button 'Reconcile Payment' in Make/Receive Payment window details: /erp/devel/main/rev/6acd1e0a7c95 changeset: 7419:6acd1e0a7c95 user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com> date: Fri May 21 11:00:28 2010 +0530 summary: Fixes issue 13274 changes done for trigger should not work while deleting the record. details: /erp/devel/main/rev/16ddc9180940 changeset: 7420:16ddc9180940 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri May 21 10:04:20 2010 +0200 summary: Fixes bug 0013108: Missing reference list for transaction status details: /erp/devel/main/rev/9c69b2d3bb13 changeset: 7421:9c69b2d3bb13 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Fri May 21 15:56:56 2010 +0200 summary: Payment Method -> Financial Account callout details: /erp/devel/main/rev/97f8ed0f00b5 changeset: 7422:97f8ed0f00b5 user: RM packaging bot <staff.rm <at> openbravo.com> date: Sat May 29 07:41:19 2010 +0000 summary: CI: promote changesets from pi to main details: /erp/devel/main/rev/3fe7f77af7c7 changeset: 7423:3fe7f77af7c7 user: RM packaging bot <staff.rm <at> openbravo.com> date: Sat May 29 07:41:20 2010 +0000 summary: CI: update AD_MODULE - Core version and label diffstat: .hgsigs | 1 + .hgtags | 1 + src-db/database/model/triggers/AD_ORG_ACCTSCHEMA_TRG2.xml | 33 ++++ src-db/database/model/triggers/C_BPARTNER_TRG.xml | 11 +- src-db/database/sourcedata/AD_CALLOUT.xml | 10 + src-db/database/sourcedata/AD_COLUMN.xml | 4 + src-db/database/sourcedata/AD_FIELD.xml | 4 +- src-db/database/sourcedata/AD_MESSAGE.xml | 11 + src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 + src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 + src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 2 +- src/org/openbravo/dal/core/OBContext.java | 16 +- src/org/openbravo/erpCommon/ad_callouts/SE_PaymentMethod_FinAccount.java | 77 ++++++++++ src/org/openbravo/erpCommon/ad_callouts/SimpleCallout.java | 6 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 12 +- src/org/openbravo/erpCommon/ad_reports/ReportCashflowForecast.xml | 14 +- src/org/openbravo/erpCommon/ad_reports/ReportDebtPaymentTrack.xml | 2 +- 18 files changed, 198 insertions(+), 32 deletions(-) diffs (truncated from 527 to 300 lines): diff -r 6a7a2295a014 -r 3fe7f77af7c7 .hgsigs --- a/.hgsigs Wed May 19 16:54:52 2010 +0200 +++ b/.hgsigs Sat May 29 07:41:20 2010 +0000 @@ -18,3 +18,4 @@ a56977f8bc9c70b88f49eccc4e05d4703926df8b 0 iEYEABECAAYFAkvpHhQACgkQCX/oGf+2qkNE2gCfRUvL9gvk0xEg6OjMlTbJbplKpNkAnAz8f8WZ4NY9NFmiefa6afLiiyIG 8594549ee5becd6e51d6a295a6b473c42bacbbb9 0 iEYEABECAAYFAkvq4o4ACgkQCX/oGf+2qkPvLACfdPEl+S1cRY59u90LiQRmROPIL8cAniZtSjiAg13GifqOFZCZZ+zilCep 9f343a616b2f998c3867661467de5dd9daeb7112 0 iEYEABECAAYFAkvq7PIACgkQCX/oGf+2qkMcHQCg3eHGql848ExhA5oOgtqfjIE3toUAn0GiWHkItn3YxPFitn8+e0IfOEaj +9b4bbe8362f54f7212653fddf5bd053183a7ffda 0 iEYEABECAAYFAkv8vDgACgkQCX/oGf+2qkPC3ACfURoh78/OY95XuFkAKNfaLQQzuCsAoNoNLdSqMVYuAJMAI2mimGZ5BXaw diff -r 6a7a2295a014 -r 3fe7f77af7c7 .hgtags --- a/.hgtags Wed May 19 16:54:52 2010 +0200 +++ b/.hgtags Sat May 29 07:41:20 2010 +0000 @@ -28,3 +28,4 @@ 30fd49cdc1b1a5d3ff7233f2569e8afb8d0523f3 2.50MP16 8a6462c8520ce811b77ee562c87387a7f0663d39 2.50MP16 41915c2f5ec639dadab8e797a1e5f1e0922fa029 2.50MP17 +f7b9678ebb10f1fb0963b7e3cc4724aa6aeca565 2.50MP18 diff -r 6a7a2295a014 -r 3fe7f77af7c7 src-db/database/model/triggers/AD_ORG_ACCTSCHEMA_TRG2.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src-db/database/model/triggers/AD_ORG_ACCTSCHEMA_TRG2.xml Sat May 29 07:41:20 2010 +0000 @@ -0,0 +1,33 @@ +<?xml version="1.0"?> + <database name="TRIGGER AD_ORG_ACCTSCHEMA_TRG2"> + <trigger name="AD_ORG_ACCTSCHEMA_TRG2" table="AD_ORG_ACCTSCHEMA" fires="after" insert="true" update="true" delete="false" foreach="row"> + <body><![CDATA[ +/************************************************************************* +* The contents of this file are subject to the Openbravo Public License +* Version 1.0 (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) 2010 Openbravo SLU +* All Rights Reserved. +* Contributor(s): ______________________________________. +************************************************************************/ + +BEGIN + + IF AD_isTriggerEnabled()='N' THEN RETURN; + END IF; + + IF((:NEW.ISBPNEWACCOUNT = 'Y' OR :NEW.ISPRNEWACCOUNT = 'Y') AND :NEW.ACCT_LENGTH >= :NEW.SUBACCT_LENGTH) THEN + RAISE_APPLICATION_ERROR(-20000, '@ACCOUNT_LENGTH_CHECK@'); + END IF; +END AD_ORG_ACCTSCHEMA_TRG2 +]]></body> + </trigger> + </database> diff -r 6a7a2295a014 -r 3fe7f77af7c7 src-db/database/model/triggers/C_BPARTNER_TRG.xml --- a/src-db/database/model/triggers/C_BPARTNER_TRG.xml Wed May 19 16:54:52 2010 +0200 +++ b/src-db/database/model/triggers/C_BPARTNER_TRG.xml Sat May 29 07:41:20 2010 +0000 @@ -97,7 +97,9 @@ /* Retrieving the prepayment account NUMBER */ - c_validcombination_clone(Cur_Defaults.C_Prepayment_Acct, v_Sequence_No, :new.Name, Cur_Defaults.acct_length, Cur_Defaults.subacct_length, v_C_Prepayment_Acct); + IF(Cur_Defaults.C_Prepayment_Acct IS NOT NULL) THEN + c_validcombination_clone(Cur_Defaults.C_Prepayment_Acct, v_Sequence_No, :new.Name, Cur_Defaults.acct_length, Cur_Defaults.subacct_length, v_C_Prepayment_Acct); + END IF; /* Inserting the new account NUMBER @@ -138,12 +140,15 @@ /* Retrieving the liability services account NUMBER */ - c_validcombination_clone(Cur_Defaults.V_Liability_Services_Acct, v_Sequence_No, :new.Name, Cur_Defaults.acct_length, Cur_Defaults.subacct_length, v_V_Liability_Services_Acct); + IF(Cur_Defaults.V_Liability_Services_Acct IS NOT NULL) THEN + c_validcombination_clone(Cur_Defaults.V_Liability_Services_Acct, v_Sequence_No, :new.Name, Cur_Defaults.acct_length, Cur_Defaults.subacct_length, v_V_Liability_Services_Acct); + END IF; /* Retrieving the prepayment account NUMBER */ + IF(Cur_Defaults.V_Prepayment_Acct IS NOT NULL) THEN c_validcombination_clone(Cur_Defaults.V_Prepayment_Acct, v_Sequence_No, :new.Name, Cur_Defaults.acct_length, Cur_Defaults.subacct_length, v_V_Prepayment_Acct); - + END IF; /* Inserting the new account NUMBER */ diff -r 6a7a2295a014 -r 3fe7f77af7c7 src-db/database/sourcedata/AD_CALLOUT.xml --- a/src-db/database/sourcedata/AD_CALLOUT.xml Wed May 19 16:54:52 2010 +0200 +++ b/src-db/database/sourcedata/AD_CALLOUT.xml Sat May 29 07:41:20 2010 +0000 @@ -776,6 +776,16 @@ <!--20FE1F365075451E95AE901650183CC7--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--20FE1F365075451E95AE901650183CC7--></AD_CALLOUT> +<!--3262C8E4D91F40339AD1EF086C00F1E3--><AD_CALLOUT> +<!--3262C8E4D91F40339AD1EF086C00F1E3--> <AD_CALLOUT_ID><![CDATA[3262C8E4D91F40339AD1EF086C00F1E3]]></AD_CALLOUT_ID> +<!--3262C8E4D91F40339AD1EF086C00F1E3--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--3262C8E4D91F40339AD1EF086C00F1E3--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--3262C8E4D91F40339AD1EF086C00F1E3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--3262C8E4D91F40339AD1EF086C00F1E3--> <NAME><![CDATA[SE_PaymentMethod_FinAccount]]></NAME> +<!--3262C8E4D91F40339AD1EF086C00F1E3--> <DESCRIPTION><![CDATA[This callout filters the Financial Accounts for selected Payment Method.]]></DESCRIPTION> +<!--3262C8E4D91F40339AD1EF086C00F1E3--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--3262C8E4D91F40339AD1EF086C00F1E3--></AD_CALLOUT> + <!--3585710F23F244D9B179A28D18242583--><AD_CALLOUT> <!--3585710F23F244D9B179A28D18242583--> <AD_CALLOUT_ID><![CDATA[3585710F23F244D9B179A28D18242583]]></AD_CALLOUT_ID> <!--3585710F23F244D9B179A28D18242583--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 6a7a2295a014 -r 3fe7f77af7c7 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Wed May 19 16:54:52 2010 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Sat May 29 07:41:20 2010 +0000 @@ -290825,6 +290825,7 @@ <!--7DC34559B3F1B45BE040007F0100784A--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> <!--7DC34559B3F1B45BE040007F0100784A--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--7DC34559B3F1B45BE040007F0100784A--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--7DC34559B3F1B45BE040007F0100784A--> <AD_CALLOUT_ID><![CDATA[3262C8E4D91F40339AD1EF086C00F1E3]]></AD_CALLOUT_ID> <!--7DC34559B3F1B45BE040007F0100784A--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--7DC34559B3F1B45BE040007F0100784A--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--7DC34559B3F1B45BE040007F0100784A--> <POSITION><![CDATA[15]]></POSITION> @@ -291020,6 +291021,7 @@ <!--7DC34559B410B45BE040007F0100784A--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> <!--7DC34559B410B45BE040007F0100784A--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--7DC34559B410B45BE040007F0100784A--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--7DC34559B410B45BE040007F0100784A--> <AD_CALLOUT_ID><![CDATA[3262C8E4D91F40339AD1EF086C00F1E3]]></AD_CALLOUT_ID> <!--7DC34559B410B45BE040007F0100784A--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--7DC34559B410B45BE040007F0100784A--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--7DC34559B410B45BE040007F0100784A--> <POSITION><![CDATA[17]]></POSITION> @@ -299760,6 +299762,7 @@ <!--828EE0AE802D5FA1E040007F010067C7--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> <!--828EE0AE802D5FA1E040007F010067C7--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--828EE0AE802D5FA1E040007F010067C7--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--828EE0AE802D5FA1E040007F010067C7--> <AD_CALLOUT_ID><![CDATA[3262C8E4D91F40339AD1EF086C00F1E3]]></AD_CALLOUT_ID> <!--828EE0AE802D5FA1E040007F010067C7--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--828EE0AE802D5FA1E040007F010067C7--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--828EE0AE802D5FA1E040007F010067C7--> <POSITION><![CDATA[78]]></POSITION> @@ -299792,6 +299795,7 @@ <!--828EE0AE802E5FA1E040007F010067C7--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> <!--828EE0AE802E5FA1E040007F010067C7--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--828EE0AE802E5FA1E040007F010067C7--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--828EE0AE802E5FA1E040007F010067C7--> <AD_CALLOUT_ID><![CDATA[3262C8E4D91F40339AD1EF086C00F1E3]]></AD_CALLOUT_ID> <!--828EE0AE802E5FA1E040007F010067C7--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--828EE0AE802E5FA1E040007F010067C7--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--828EE0AE802E5FA1E040007F010067C7--> <POSITION><![CDATA[79]]></POSITION> diff -r 6a7a2295a014 -r 3fe7f77af7c7 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Wed May 19 16:54:52 2010 +0200 +++ b/src-db/database/sourcedata/AD_FIELD.xml Sat May 29 07:41:20 2010 +0000 @@ -192713,7 +192713,7 @@ <!--68BFB03020DB4D599CD407BDB8B09AA1--> <DISPLAYLOGIC><![cda...@processed@='Y']]></DISPLAYLOGIC> <!--68BFB03020DB4D599CD407BDB8B09AA1--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> <!--68BFB03020DB4D599CD407BDB8B09AA1--> <ISREADONLY><![CDATA[N]]></ISREADONLY> -<!--68BFB03020DB4D599CD407BDB8B09AA1--> <SEQNO><![CDATA[230]]></SEQNO> +<!--68BFB03020DB4D599CD407BDB8B09AA1--> <SEQNO><![CDATA[220]]></SEQNO> <!--68BFB03020DB4D599CD407BDB8B09AA1--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--68BFB03020DB4D599CD407BDB8B09AA1--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--68BFB03020DB4D599CD407BDB8B09AA1--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> @@ -194270,7 +194270,7 @@ <!--7C541AC0C767FDD7E040007F01016B4D--> <DISPLAYLOGIC><![cda...@processed@='Y']]></DISPLAYLOGIC> <!--7C541AC0C767FDD7E040007F01016B4D--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> <!--7C541AC0C767FDD7E040007F01016B4D--> <ISREADONLY><![CDATA[N]]></ISREADONLY> -<!--7C541AC0C767FDD7E040007F01016B4D--> <SEQNO><![CDATA[230]]></SEQNO> +<!--7C541AC0C767FDD7E040007F01016B4D--> <SEQNO><![CDATA[220]]></SEQNO> <!--7C541AC0C767FDD7E040007F01016B4D--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--7C541AC0C767FDD7E040007F01016B4D--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--7C541AC0C767FDD7E040007F01016B4D--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> diff -r 6a7a2295a014 -r 3fe7f77af7c7 src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml Wed May 19 16:54:52 2010 +0200 +++ b/src-db/database/sourcedata/AD_MESSAGE.xml Sat May 29 07:41:20 2010 +0000 @@ -31949,6 +31949,17 @@ <!--A96A9CE562E94DBC8D59C2F0208028B0--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--A96A9CE562E94DBC8D59C2F0208028B0--></AD_MESSAGE> +<!--AA196DCD58DA494FA1ADCF695FFAA80C--><AD_MESSAGE> +<!--AA196DCD58DA494FA1ADCF695FFAA80C--> <AD_MESSAGE_ID><![CDATA[AA196DCD58DA494FA1ADCF695FFAA80C]]></AD_MESSAGE_ID> +<!--AA196DCD58DA494FA1ADCF695FFAA80C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--AA196DCD58DA494FA1ADCF695FFAA80C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--AA196DCD58DA494FA1ADCF695FFAA80C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--AA196DCD58DA494FA1ADCF695FFAA80C--> <VALUE><![CDATA[ACCOUNT_LENGTH_CHECK]]></VALUE> +<!--AA196DCD58DA494FA1ADCF695FFAA80C--> <MSGTEXT><![CDATA[Account Length can not be greater than the Sub Account Length.]]></MSGTEXT> +<!--AA196DCD58DA494FA1ADCF695FFAA80C--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--AA196DCD58DA494FA1ADCF695FFAA80C--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--AA196DCD58DA494FA1ADCF695FFAA80C--></AD_MESSAGE> + <!--AB8F1CCBF6254BB2862CE7FD75D2B6AE--><AD_MESSAGE> <!--AB8F1CCBF6254BB2862CE7FD75D2B6AE--> <AD_MESSAGE_ID><![CDATA[AB8F1CCBF6254BB2862CE7FD75D2B6AE]]></AD_MESSAGE_ID> <!--AB8F1CCBF6254BB2862CE7FD75D2B6AE--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 6a7a2295a014 -r 3fe7f77af7c7 src-db/database/sourcedata/AD_MODEL_OBJECT.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Wed May 19 16:54:52 2010 +0200 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Sat May 29 07:41:20 2010 +0000 @@ -15587,6 +15587,18 @@ <!--3F874173A01B43C0ACEA29111CE98ECE--> <SEQNO><![CDATA[40]]></SEQNO> <!--3F874173A01B43C0ACEA29111CE98ECE--></AD_MODEL_OBJECT> +<!--405CB5D0FE124E4BBB9A6DC13A9F28EA--><AD_MODEL_OBJECT> +<!--405CB5D0FE124E4BBB9A6DC13A9F28EA--> <AD_MODEL_OBJECT_ID><![CDATA[405CB5D0FE124E4BBB9A6DC13A9F28EA]]></AD_MODEL_OBJECT_ID> +<!--405CB5D0FE124E4BBB9A6DC13A9F28EA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--405CB5D0FE124E4BBB9A6DC13A9F28EA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--405CB5D0FE124E4BBB9A6DC13A9F28EA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--405CB5D0FE124E4BBB9A6DC13A9F28EA--> <ACTION><![CDATA[C]]></ACTION> +<!--405CB5D0FE124E4BBB9A6DC13A9F28EA--> <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_callouts.SE_PaymentMethod_FinAccount]]></CLASSNAME> +<!--405CB5D0FE124E4BBB9A6DC13A9F28EA--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> +<!--405CB5D0FE124E4BBB9A6DC13A9F28EA--> <AD_CALLOUT_ID><![CDATA[3262C8E4D91F40339AD1EF086C00F1E3]]></AD_CALLOUT_ID> +<!--405CB5D0FE124E4BBB9A6DC13A9F28EA--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--405CB5D0FE124E4BBB9A6DC13A9F28EA--></AD_MODEL_OBJECT> + <!--40C9C50E51CF446C83AF1F4562D93FD3--><AD_MODEL_OBJECT> <!--40C9C50E51CF446C83AF1F4562D93FD3--> <AD_MODEL_OBJECT_ID><![CDATA[40C9C50E51CF446C83AF1F4562D93FD3]]></AD_MODEL_OBJECT_ID> <!--40C9C50E51CF446C83AF1F4562D93FD3--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 6a7a2295a014 -r 3fe7f77af7c7 src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Wed May 19 16:54:52 2010 +0200 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Sat May 29 07:41:20 2010 +0000 @@ -26250,6 +26250,16 @@ <!--DF6BD3A8D6814A42A31B029036E3CAD0--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--DF6BD3A8D6814A42A31B029036E3CAD0--></AD_MODEL_OBJECT_MAPPING> +<!--E19F9A46454B4FCAA900720764E10CF7--><AD_MODEL_OBJECT_MAPPING> +<!--E19F9A46454B4FCAA900720764E10CF7--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[E19F9A46454B4FCAA900720764E10CF7]]></AD_MODEL_OBJECT_MAPPING_ID> +<!--E19F9A46454B4FCAA900720764E10CF7--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--E19F9A46454B4FCAA900720764E10CF7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--E19F9A46454B4FCAA900720764E10CF7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--E19F9A46454B4FCAA900720764E10CF7--> <AD_MODEL_OBJECT_ID><![CDATA[405CB5D0FE124E4BBB9A6DC13A9F28EA]]></AD_MODEL_OBJECT_ID> +<!--E19F9A46454B4FCAA900720764E10CF7--> <MAPPINGNAME><![CDATA[/ad_callouts/SE_PaymentMethod_FinAccount.html]]></MAPPINGNAME> +<!--E19F9A46454B4FCAA900720764E10CF7--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> +<!--E19F9A46454B4FCAA900720764E10CF7--></AD_MODEL_OBJECT_MAPPING> + <!--E1A4739BE84F4651830C6C78A48A7757--><AD_MODEL_OBJECT_MAPPING> <!--E1A4739BE84F4651830C6C78A48A7757--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[E1A4739BE84F4651830C6C78A48A7757]]></AD_MODEL_OBJECT_MAPPING_ID> <!--E1A4739BE84F4651830C6C78A48A7757--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 6a7a2295a014 -r 3fe7f77af7c7 src-db/database/sourcedata/AD_MODULE.xml --- a/src-db/database/sourcedata/AD_MODULE.xml Wed May 19 16:54:52 2010 +0200 +++ b/src-db/database/sourcedata/AD_MODULE.xml Sat May 29 07:41:20 2010 +0000 @@ -6,7 +6,7 @@ <!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--0--> <NAME><![CDATA[core]]></NAME> -<!--0--> <VERSION><![CDATA[2.50.17198]]></VERSION> +<!--0--> <VERSION><![CDATA[2.50.17422]]></VERSION> <!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION> <!--0--> <HELP><![CDATA[Core module is the base one, all developments in core are included as part of the standard Openbravo ERP.]]></HELP> <!--0--> <URL><![CDATA[www.openbravo.com]]></URL> @@ -21,7 +21,7 @@ <!--0--> <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS> <!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE> <!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA> -<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL> +<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--0--></AD_MODULE> diff -r 6a7a2295a014 -r 3fe7f77af7c7 src-db/database/sourcedata/AD_VAL_RULE.xml --- a/src-db/database/sourcedata/AD_VAL_RULE.xml Wed May 19 16:54:52 2010 +0200 +++ b/src-db/database/sourcedata/AD_VAL_RULE.xml Sat May 29 07:41:20 2010 +0000 @@ -1383,7 +1383,7 @@ <!--7A86F689FB1C46F19DBE338D6DECD703--> <NAME><![CDATA[FIN_Payment status for transactons]]></NAME> <!--7A86F689FB1C46F19DBE338D6DECD703--> <DESCRIPTION><![CDATA[Payment status used as transaction status in financila account]]></DESCRIPTION> <!--7A86F689FB1C46F19DBE338D6DECD703--> <TYPE><![CDATA[S]]></TYPE> -<!--7A86F689FB1C46F19DBE338D6DECD703--> <CODE><![CDATA[AND Value IN ('RDNC','RPPC','PWNC','RPPC')]]></CODE> +<!--7A86F689FB1C46F19DBE338D6DECD703--> <CODE><![CDATA[AND Value IN ('RDNC','RPPC','PWNC')]]></CODE> <!--7A86F689FB1C46F19DBE338D6DECD703--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--7A86F689FB1C46F19DBE338D6DECD703--></AD_VAL_RULE> diff -r 6a7a2295a014 -r 3fe7f77af7c7 src/org/openbravo/dal/core/OBContext.java --- a/src/org/openbravo/dal/core/OBContext.java Wed May 19 16:54:52 2010 +0200 +++ b/src/org/openbravo/dal/core/OBContext.java Sat May 29 07:41:20 2010 +0000 @@ -90,9 +90,8 @@ private static OBContext adminContext = null; /** - * @deprecated use {...@link #setAdminMode()} + * deprecated use {...@link #setAdminMode()} */ - @Deprecated public static void setAdminContext() { if (adminContext == null) { setOBContext("0", "0", "0", "0"); @@ -112,9 +111,8 @@ } /** - * @deprecated use {...@link #setAdminMode()} + * deprecated use {...@link #setAdminMode()} */ - @Deprecated public static void enableAsAdminContext() { setAdminMode(); } @@ -126,7 +124,7 @@ * To restore the previous privileges call the {...@link #restorePreviousMode()}. * * @see OBContext#restorePreviousMode() - * @since 2.50MP16 + * @since 2.50MP18 */ public static void setAdminMode() { getAdminModeStack().push(Boolean.TRUE); @@ -145,9 +143,8 @@ } /** - * @deprecated use {...@link #restorePreviousMode()} + * deprecated use {...@link #restorePreviousMode()} */ - @Deprecated public static void resetAsAdminContext() { ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
