details: https://code.openbravo.com/erp/devel/pi/rev/557136640cda changeset: 16224:557136640cda user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Thu Apr 26 12:01:48 2012 +0200 summary: fixed issue 9862 Not mandatory product and bp sequence(Org schema window) create a constraint to check: if create new account for bp then sequence for bp,account and sub account lengths and mandatory. The same for create new account for product. Callout: if create new account is not selected, the rest of the fields are null.
details: https://code.openbravo.com/erp/devel/pi/rev/85d333e1b119 changeset: 16225:85d333e1b119 user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Thu Apr 12 17:43:28 2012 +0200 summary: fixed bug 12183 Remove decimals in Minimum Lead Time field(Manufacturing tab) diffstat: src-db/database/model/tables/AD_ORG_ACCTSCHEMA.xml | 2 + src-db/database/sourcedata/AD_CALLOUT.xml | 9 + src-db/database/sourcedata/AD_COLUMN.xml | 8 +- src-db/database/sourcedata/AD_MESSAGE.xml | 22 ++++ src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 ++ src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 + src/org/openbravo/erpCommon/ad_callouts/SL_RefreshSequenceAndLength.java | 53 ++++++++++ 7 files changed, 113 insertions(+), 3 deletions(-) diffs (217 lines): diff -r 285d006fa8f8 -r 85d333e1b119 src-db/database/model/tables/AD_ORG_ACCTSCHEMA.xml --- a/src-db/database/model/tables/AD_ORG_ACCTSCHEMA.xml Thu Apr 26 14:06:37 2012 +0200 +++ b/src-db/database/model/tables/AD_ORG_ACCTSCHEMA.xml Thu Apr 12 17:43:28 2012 +0200 @@ -76,8 +76,10 @@ <foreign-key foreignTable="C_ACCTSCHEMA" name="AD_ORG_ACCTSCHEMA_C_ACCTSCHEMA"> <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/> </foreign-key> + <check name="AD_ORG_ACCTSCHEMA_BPFIELDS_CHK"><![CDATA[(ISBPNEWACCOUNT = 'N') OR ((((ISBPNEWACCOUNT = 'Y') AND (AD_SEQUENCE_BP_ID IS NOT NULL)) AND (ACCT_LENGTH IS NOT NULL)) AND (SUBACCT_LENGTH IS NOT NULL))]]></check> <check name="AD_ORG_ACCTSCHEMA_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check> <check name="AD_ORG_ACCTSCHEMA_ISBPNEWA_CHK"><![CDATA[ISBPNEWACCOUNT IN ('Y', 'N')]]></check> <check name="AD_ORG_ACCTSCHEMA_ISPRNEWA_CHK"><![CDATA[ISPRNEWACCOUNT IN ('Y', 'N')]]></check> + <check name="AD_ORG_ACCTSCHEMA_PRFIELDS_CHK"><![CDATA[(ISPRNEWACCOUNT = 'N') OR ((((ISPRNEWACCOUNT = 'Y') AND (AD_SEQUENCE_PR_ID IS NOT NULL)) AND (ACCT_LENGTH IS NOT NULL)) AND (SUBACCT_LENGTH IS NOT NULL))]]></check> </table> </database> diff -r 285d006fa8f8 -r 85d333e1b119 src-db/database/sourcedata/AD_CALLOUT.xml --- a/src-db/database/sourcedata/AD_CALLOUT.xml Thu Apr 26 14:06:37 2012 +0200 +++ b/src-db/database/sourcedata/AD_CALLOUT.xml Thu Apr 12 17:43:28 2012 +0200 @@ -878,6 +878,15 @@ <!--6C7A1DC738044D2880CF60856508FC81--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--6C7A1DC738044D2880CF60856508FC81--></AD_CALLOUT> +<!--76EB5EC472534C0C897FBD25089EA351--><AD_CALLOUT> +<!--76EB5EC472534C0C897FBD25089EA351--> <AD_CALLOUT_ID><![CDATA[76EB5EC472534C0C897FBD25089EA351]]></AD_CALLOUT_ID> +<!--76EB5EC472534C0C897FBD25089EA351--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--76EB5EC472534C0C897FBD25089EA351--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--76EB5EC472534C0C897FBD25089EA351--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--76EB5EC472534C0C897FBD25089EA351--> <NAME><![CDATA[SL_RefreshSequenceAndLength]]></NAME> +<!--76EB5EC472534C0C897FBD25089EA351--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--76EB5EC472534C0C897FBD25089EA351--></AD_CALLOUT> + <!--775917C69E0A45FFB22AEDD232C9D464--><AD_CALLOUT> <!--775917C69E0A45FFB22AEDD232C9D464--> <AD_CALLOUT_ID><![CDATA[775917C69E0A45FFB22AEDD232C9D464]]></AD_CALLOUT_ID> <!--775917C69E0A45FFB22AEDD232C9D464--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 285d006fa8f8 -r 85d333e1b119 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Apr 26 14:06:37 2012 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Apr 12 17:43:28 2012 +0200 @@ -202606,7 +202606,7 @@ <!--803709--> <HELP><![CDATA[Minimum number of days to complete the transaction]]></HELP> <!--803709--> <COLUMNNAME><![CDATA[Delaymin]]></COLUMNNAME> <!--803709--> <AD_TABLE_ID><![CDATA[800205]]></AD_TABLE_ID> -<!--803709--> <AD_REFERENCE_ID><![CDATA[22]]></AD_REFERENCE_ID> +<!--803709--> <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID> <!--803709--> <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH> <!--803709--> <ISKEY><![CDATA[N]]></ISKEY> <!--803709--> <ISPARENT><![CDATA[N]]></ISPARENT> @@ -244565,6 +244565,7 @@ <!--64C363DDF8D94AF78CAEA75380CC1056--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> <!--64C363DDF8D94AF78CAEA75380CC1056--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--64C363DDF8D94AF78CAEA75380CC1056--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--64C363DDF8D94AF78CAEA75380CC1056--> <AD_CALLOUT_ID><![CDATA[76EB5EC472534C0C897FBD25089EA351]]></AD_CALLOUT_ID> <!--64C363DDF8D94AF78CAEA75380CC1056--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--64C363DDF8D94AF78CAEA75380CC1056--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--64C363DDF8D94AF78CAEA75380CC1056--> <POSITION><![CDATA[10]]></POSITION> @@ -247085,7 +247086,7 @@ <!--699C3D66B0824AFFA3A25A679D6DD5C6--> <FIELDLENGTH><![CDATA[36]]></FIELDLENGTH> <!--699C3D66B0824AFFA3A25A679D6DD5C6--> <ISKEY><![CDATA[N]]></ISKEY> <!--699C3D66B0824AFFA3A25A679D6DD5C6--> <ISPARENT><![CDATA[N]]></ISPARENT> -<!--699C3D66B0824AFFA3A25A679D6DD5C6--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> +<!--699C3D66B0824AFFA3A25A679D6DD5C6--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> <!--699C3D66B0824AFFA3A25A679D6DD5C6--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> <!--699C3D66B0824AFFA3A25A679D6DD5C6--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> <!--699C3D66B0824AFFA3A25A679D6DD5C6--> <SEQNO><![CDATA[110]]></SEQNO> @@ -266373,7 +266374,7 @@ <!--8672E2CEC4B143EDA3FD16235CE39FF3--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> <!--8672E2CEC4B143EDA3FD16235CE39FF3--> <ISKEY><![CDATA[N]]></ISKEY> <!--8672E2CEC4B143EDA3FD16235CE39FF3--> <ISPARENT><![CDATA[N]]></ISPARENT> -<!--8672E2CEC4B143EDA3FD16235CE39FF3--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> +<!--8672E2CEC4B143EDA3FD16235CE39FF3--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> <!--8672E2CEC4B143EDA3FD16235CE39FF3--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> <!--8672E2CEC4B143EDA3FD16235CE39FF3--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> <!--8672E2CEC4B143EDA3FD16235CE39FF3--> <SEQNO><![CDATA[120]]></SEQNO> @@ -285464,6 +285465,7 @@ <!--C53D8B83AFAC4045B8CCDCCAE2CCF4F6--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> <!--C53D8B83AFAC4045B8CCDCCAE2CCF4F6--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--C53D8B83AFAC4045B8CCDCCAE2CCF4F6--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--C53D8B83AFAC4045B8CCDCCAE2CCF4F6--> <AD_CALLOUT_ID><![CDATA[76EB5EC472534C0C897FBD25089EA351]]></AD_CALLOUT_ID> <!--C53D8B83AFAC4045B8CCDCCAE2CCF4F6--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--C53D8B83AFAC4045B8CCDCCAE2CCF4F6--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--C53D8B83AFAC4045B8CCDCCAE2CCF4F6--> <POSITION><![CDATA[12]]></POSITION> diff -r 285d006fa8f8 -r 85d333e1b119 src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml Thu Apr 26 14:06:37 2012 +0200 +++ b/src-db/database/sourcedata/AD_MESSAGE.xml Thu Apr 12 17:43:28 2012 +0200 @@ -16247,6 +16247,17 @@ <!--4B01F0CD52ED45D78AD503199D5AB1C6--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--4B01F0CD52ED45D78AD503199D5AB1C6--></AD_MESSAGE> +<!--4D28E3CE943A44648FCA98F8E0AA7A0E--><AD_MESSAGE> +<!--4D28E3CE943A44648FCA98F8E0AA7A0E--> <AD_MESSAGE_ID><![CDATA[4D28E3CE943A44648FCA98F8E0AA7A0E]]></AD_MESSAGE_ID> +<!--4D28E3CE943A44648FCA98F8E0AA7A0E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--4D28E3CE943A44648FCA98F8E0AA7A0E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--4D28E3CE943A44648FCA98F8E0AA7A0E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--4D28E3CE943A44648FCA98F8E0AA7A0E--> <VALUE><![CDATA[AD_ORG_ACCTSCHEMA_PRFIELDS_CHK]]></VALUE> +<!--4D28E3CE943A44648FCA98F8E0AA7A0E--> <MSGTEXT><![CDATA[Sequence for Product, Account Length and Sub Account Length can't be null if Create New Account for Product is checked.]]></MSGTEXT> +<!--4D28E3CE943A44648FCA98F8E0AA7A0E--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--4D28E3CE943A44648FCA98F8E0AA7A0E--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--4D28E3CE943A44648FCA98F8E0AA7A0E--></AD_MESSAGE> + <!--4D438024F33D44F099C813ABF6BFCAE2--><AD_MESSAGE> <!--4D438024F33D44F099C813ABF6BFCAE2--> <AD_MESSAGE_ID><![CDATA[4D438024F33D44F099C813ABF6BFCAE2]]></AD_MESSAGE_ID> <!--4D438024F33D44F099C813ABF6BFCAE2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -16614,6 +16625,17 @@ <!--5BBAF581EEC94A11BB175D2398CE0B76--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--5BBAF581EEC94A11BB175D2398CE0B76--></AD_MESSAGE> +<!--5C378E87605D42C9BE2D9069D681DD02--><AD_MESSAGE> +<!--5C378E87605D42C9BE2D9069D681DD02--> <AD_MESSAGE_ID><![CDATA[5C378E87605D42C9BE2D9069D681DD02]]></AD_MESSAGE_ID> +<!--5C378E87605D42C9BE2D9069D681DD02--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--5C378E87605D42C9BE2D9069D681DD02--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--5C378E87605D42C9BE2D9069D681DD02--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--5C378E87605D42C9BE2D9069D681DD02--> <VALUE><![CDATA[AD_ORG_ACCTSCHEMA_BPFIELDS_CHK]]></VALUE> +<!--5C378E87605D42C9BE2D9069D681DD02--> <MSGTEXT><![CDATA[Sequence for Business Partner, Account Length and Sub Account Length can't be null if Create New Account for Business Partner is checked.]]></MSGTEXT> +<!--5C378E87605D42C9BE2D9069D681DD02--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--5C378E87605D42C9BE2D9069D681DD02--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--5C378E87605D42C9BE2D9069D681DD02--></AD_MESSAGE> + <!--5D3624FE019649CCB3B5900F32E59E17--><AD_MESSAGE> <!--5D3624FE019649CCB3B5900F32E59E17--> <AD_MESSAGE_ID><![CDATA[5D3624FE019649CCB3B5900F32E59E17]]></AD_MESSAGE_ID> <!--5D3624FE019649CCB3B5900F32E59E17--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 285d006fa8f8 -r 85d333e1b119 src-db/database/sourcedata/AD_MODEL_OBJECT.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Thu Apr 26 14:06:37 2012 +0200 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Thu Apr 12 17:43:28 2012 +0200 @@ -4064,6 +4064,18 @@ <!--CA84D1D58D6D4C5495F9FDE7549336E4--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> <!--CA84D1D58D6D4C5495F9FDE7549336E4--></AD_MODEL_OBJECT> +<!--CBD971929B504D11A3164B58D8C69CBE--><AD_MODEL_OBJECT> +<!--CBD971929B504D11A3164B58D8C69CBE--> <AD_MODEL_OBJECT_ID><![CDATA[CBD971929B504D11A3164B58D8C69CBE]]></AD_MODEL_OBJECT_ID> +<!--CBD971929B504D11A3164B58D8C69CBE--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--CBD971929B504D11A3164B58D8C69CBE--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--CBD971929B504D11A3164B58D8C69CBE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--CBD971929B504D11A3164B58D8C69CBE--> <ACTION><![CDATA[C]]></ACTION> +<!--CBD971929B504D11A3164B58D8C69CBE--> <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_callouts.SL_RefreshSequenceAndLength]]></CLASSNAME> +<!--CBD971929B504D11A3164B58D8C69CBE--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> +<!--CBD971929B504D11A3164B58D8C69CBE--> <AD_CALLOUT_ID><![CDATA[76EB5EC472534C0C897FBD25089EA351]]></AD_CALLOUT_ID> +<!--CBD971929B504D11A3164B58D8C69CBE--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--CBD971929B504D11A3164B58D8C69CBE--></AD_MODEL_OBJECT> + <!--CD9445A64E6B435AA70BFF526289C69B--><AD_MODEL_OBJECT> <!--CD9445A64E6B435AA70BFF526289C69B--> <AD_MODEL_OBJECT_ID><![CDATA[CD9445A64E6B435AA70BFF526289C69B]]></AD_MODEL_OBJECT_ID> <!--CD9445A64E6B435AA70BFF526289C69B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 285d006fa8f8 -r 85d333e1b119 src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Thu Apr 26 14:06:37 2012 +0200 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Thu Apr 12 17:43:28 2012 +0200 @@ -3950,6 +3950,16 @@ <!--6AE5F2D3163D178BE040007F010174B7--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--6AE5F2D3163D178BE040007F010174B7--></AD_MODEL_OBJECT_MAPPING> +<!--6EA067198A5C4CAC84BEFF66065C2574--><AD_MODEL_OBJECT_MAPPING> +<!--6EA067198A5C4CAC84BEFF66065C2574--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[6EA067198A5C4CAC84BEFF66065C2574]]></AD_MODEL_OBJECT_MAPPING_ID> +<!--6EA067198A5C4CAC84BEFF66065C2574--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--6EA067198A5C4CAC84BEFF66065C2574--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--6EA067198A5C4CAC84BEFF66065C2574--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--6EA067198A5C4CAC84BEFF66065C2574--> <AD_MODEL_OBJECT_ID><![CDATA[CBD971929B504D11A3164B58D8C69CBE]]></AD_MODEL_OBJECT_ID> +<!--6EA067198A5C4CAC84BEFF66065C2574--> <MAPPINGNAME><![CDATA[/ad_callouts/SL_RefreshSequenceAndLength.html]]></MAPPINGNAME> +<!--6EA067198A5C4CAC84BEFF66065C2574--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> +<!--6EA067198A5C4CAC84BEFF66065C2574--></AD_MODEL_OBJECT_MAPPING> + <!--7836070C25074DC0BE71BDB571F76B55--><AD_MODEL_OBJECT_MAPPING> <!--7836070C25074DC0BE71BDB571F76B55--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[7836070C25074DC0BE71BDB571F76B55]]></AD_MODEL_OBJECT_MAPPING_ID> <!--7836070C25074DC0BE71BDB571F76B55--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 285d006fa8f8 -r 85d333e1b119 src/org/openbravo/erpCommon/ad_callouts/SL_RefreshSequenceAndLength.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_RefreshSequenceAndLength.java Thu Apr 12 17:43:28 2012 +0200 @@ -0,0 +1,53 @@ +/* + ************************************************************************* + * 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) 2012 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************ + */ +package org.openbravo.erpCommon.ad_callouts; + +import javax.servlet.ServletException; + +import org.openbravo.base.filter.RequestFilter; +import org.openbravo.base.filter.ValueListFilter; + +public class SL_RefreshSequenceAndLength extends SimpleCallout { + + private static final long serialVersionUID = 1L; + private static final RequestFilter filterYesNo = new ValueListFilter("Y", "N", ""); + + @Override + protected void execute(CalloutInfo info) throws ServletException { + String strIsBpNewAccount = info.getStringParameter("inpisbpnewaccount", filterYesNo); + String strIsPrNewAccount = info.getStringParameter("inpisprnewaccount", filterYesNo); + + try { + if (strIsBpNewAccount.equals("N")) { + info.addResult("inpadSequenceBpId", null); + } + if (strIsPrNewAccount.equals("N")) { + info.addResult("inpadSequencePrId", null); + } + if ((strIsBpNewAccount.equals("N")) && (strIsPrNewAccount.equals("N"))) { + + info.addResult("inpacctLength", null); + info.addResult("inpsubacctLength", null); + } + } catch (Exception e) { + log4j.error("Error in the callout org schema", e); + } + + } +} ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
