details: https://code.openbravo.com/erp/devel/pi/rev/46b18190755e changeset: 33534:46b18190755e user: Atul Gaware <atul.gaware <at> openbravo.com> date: Mon Feb 19 16:43:27 2018 +0530 summary: Fixes Issue 0037898:Funds Transfer user experience improvements
** Added description field in funds transfer popup with a default value as "Funds Transfer Transaction". User can overwrite this description. ** Added Default G/L Item for Funds Transfer field in Organization. It is used to show default value in G/L Item field of Funds Transfer pop up. Gets G/L Item from Financial Account's Organization or its Parent Organization. If no default g/l item is defined for financial account's organization or its parent organization then set it as blank. ** Added a flag "Funds Transfer Enabled" in financial account. Used in display logic to show/hide Funds Transfer button process. details: https://code.openbravo.com/erp/devel/pi/rev/e2242452ecea changeset: 33535:e2242452ecea user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Feb 20 12:59:12 2018 +0100 summary: Related to Issue 37898. Code Review changes Added check constraint for boolean column in databasRelated to Issue 37898. Code Review changes Added check constraint for boolean column in databasee details: https://code.openbravo.com/erp/devel/pi/rev/77f399514112 changeset: 33536:77f399514112 user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Feb 20 13:31:18 2018 +0100 summary: Related to Issue 37898. Code Review changes. Moved Parameter to the same module as the Process Definition details: https://code.openbravo.com/erp/devel/pi/rev/25c6ef9f00f0 changeset: 33537:25c6ef9f00f0 user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Feb 20 13:32:03 2018 +0100 summary: Related to issue 37898. Code Review changes Added clause in validation to show only financial accounts with the flag Funds Transfer enabled in the Deposit To selector details: https://code.openbravo.com/erp/devel/pi/rev/79b64a2837e1 changeset: 33538:79b64a2837e1 user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Feb 20 13:32:36 2018 +0100 summary: Related to Issue 37898. Code Review changes Updated elements and synchronized terminology details: https://code.openbravo.com/erp/devel/pi/rev/3a86e381b846 changeset: 33539:3a86e381b846 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Feb 21 09:28:15 2018 +0100 summary: Related to Issue 37898. Code Review changes * Use JavaScript code instead of Java to retrieve default value for description field * Set message as used in client * Removed call to Java for Default value in Parameter * Added logic for OnLoad method in JavaScript * Changed Java to retrieve default value only for GL Item * Refactor Code * Remove unnecessary code * To retrieve default GL Item for Organization Tree use a query instead of a recursive method. The AD_Tree_Org table can be used to retrieve this value since only Ready Organizations should be taken into account. details: https://code.openbravo.com/erp/devel/pi/rev/07ecbaf90734 changeset: 33540:07ecbaf90734 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Feb 21 09:31:04 2018 +0100 summary: Related to Issue 37898. Code Review changes Added Doc to the class and final modifiers to final variables details: https://code.openbravo.com/erp/devel/pi/rev/620e7de654ce changeset: 33541:620e7de654ce user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Feb 21 10:10:51 2018 +0100 summary: Related to Issue 37898. Code Review changes. * Use description set by the user when creating the transaction. * Use getResponseBuilder util to build the response * Remove unnecessary methods details: https://code.openbravo.com/erp/devel/pi/rev/2863ed7b271c changeset: 33542:2863ed7b271c user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Feb 21 10:30:37 2018 +0100 summary: Related to Issue 37898. Code Review changes. Change ordering of fields in Organization Window to avoid conflicts with other modules like WebPOS diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/AD_ORG.xml | 12 + modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml | 5 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml | 78 ++++++ modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml | 28 ++ modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 61 ++++- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml | 5 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 26 ++ modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 1 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferActionHandler.java | 121 ++++----- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/FundsTransferGLItemDefaultValueExpression.java | 121 ++++++++++ modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-fundsTransfer.js | 6 + src-db/database/sourcedata/AD_FIELD.xml | 2 +- src-db/database/sourcedata/AD_MESSAGE.xml | 2 +- 13 files changed, 401 insertions(+), 67 deletions(-) diffs (truncated from 708 to 300 lines): diff -r 6b20e7da0de3 -r 2863ed7b271c modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/AD_ORG.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/AD_ORG.xml Wed Feb 21 10:30:37 2018 +0100 @@ -0,0 +1,12 @@ +<?xml version="1.0"?> + <database name="MODIFIED TABLE AD_ORG"> + <table name="AD_ORG" primaryKey="AD_ORG_KEY"> + <column name="EM_APRM_GLITEM_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <foreign-key foreignTable="C_GLITEM" name="EM_APRM_ORG_GLITEM"> + <reference local="EM_APRM_GLITEM_ID" foreign="C_GLITEM_ID"/> + </foreign-key> + </table> + </database> diff -r 6b20e7da0de3 -r 2863ed7b271c modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml Thu Feb 22 09:09:51 2018 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml Wed Feb 21 10:30:37 2018 +0100 @@ -37,5 +37,10 @@ <default/> <onCreateDefault/> </column> + <column name="EM_APRM_ISFUNDSTRANS_ENABLED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[Y]]></default> + <onCreateDefault/> + </column> + <check name="EM_APRM_FIN_FINACC_ISFUNDS_CHK"><![CDATA[EM_APRM_ISFUNDSTRANS_ENABLED IN ('Y', 'N')]]></check> </table> </database> diff -r 6b20e7da0de3 -r 2863ed7b271c modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Thu Feb 22 09:09:51 2018 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Wed Feb 21 10:30:37 2018 +0100 @@ -10100,6 +10100,45 @@ <!--B44BDBCFCEC243179D78A333FA0497A5--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> <!--B44BDBCFCEC243179D78A333FA0497A5--></AD_COLUMN> +<!--B502077EB5A64A43A07CD42323BBAC57--><AD_COLUMN> +<!--B502077EB5A64A43A07CD42323BBAC57--> <AD_COLUMN_ID><![CDATA[B502077EB5A64A43A07CD42323BBAC57]]></AD_COLUMN_ID> +<!--B502077EB5A64A43A07CD42323BBAC57--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--B502077EB5A64A43A07CD42323BBAC57--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--B502077EB5A64A43A07CD42323BBAC57--> <NAME><![CDATA[EM_Aprm_Isfundstrans_Enabled]]></NAME> +<!--B502077EB5A64A43A07CD42323BBAC57--> <DESCRIPTION><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process.]]></DESCRIPTION> +<!--B502077EB5A64A43A07CD42323BBAC57--> <HELP><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process and to show/hide Financial Accounts in Funds Transfer Process]]></HELP> +<!--B502077EB5A64A43A07CD42323BBAC57--> <COLUMNNAME><![CDATA[EM_Aprm_Isfundstrans_Enabled]]></COLUMNNAME> +<!--B502077EB5A64A43A07CD42323BBAC57--> <AD_TABLE_ID><![CDATA[B129E53BC0E747879F7BA17F0AECEC32]]></AD_TABLE_ID> +<!--B502077EB5A64A43A07CD42323BBAC57--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> +<!--B502077EB5A64A43A07CD42323BBAC57--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> +<!--B502077EB5A64A43A07CD42323BBAC57--> <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ISKEY><![CDATA[N]]></ISKEY> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--B502077EB5A64A43A07CD42323BBAC57--> <SEQNO><![CDATA[520]]></SEQNO> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--B502077EB5A64A43A07CD42323BBAC57--> <AD_ELEMENT_ID><![CDATA[F18571A261AB41D49246E1C04D647256]]></AD_ELEMENT_ID> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--B502077EB5A64A43A07CD42323BBAC57--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--B502077EB5A64A43A07CD42323BBAC57--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--B502077EB5A64A43A07CD42323BBAC57--> <POSITION><![CDATA[45]]></POSITION> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--B502077EB5A64A43A07CD42323BBAC57--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--B502077EB5A64A43A07CD42323BBAC57--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> +<!--B502077EB5A64A43A07CD42323BBAC57--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> +<!--B502077EB5A64A43A07CD42323BBAC57--></AD_COLUMN> + <!--B50241F11C4F404583CACB2A88CE875F--><AD_COLUMN> <!--B50241F11C4F404583CACB2A88CE875F--> <AD_COLUMN_ID><![CDATA[B50241F11C4F404583CACB2A88CE875F]]></AD_COLUMN_ID> <!--B50241F11C4F404583CACB2A88CE875F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -10141,6 +10180,45 @@ <!--B50241F11C4F404583CACB2A88CE875F--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> <!--B50241F11C4F404583CACB2A88CE875F--></AD_COLUMN> +<!--B5066970A1944B9EBDA0A2BE48F026F6--><AD_COLUMN> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <AD_COLUMN_ID><![CDATA[B5066970A1944B9EBDA0A2BE48F026F6]]></AD_COLUMN_ID> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <NAME><![CDATA[EM_APRM_Glitem_ID]]></NAME> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <DESCRIPTION><![CDATA[Default G/L Item used for Funds Transfer Process]]></DESCRIPTION> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <HELP><![CDATA[Default G/L Item used for Funds Transfer Process in Financial Account Window]]></HELP> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <COLUMNNAME><![CDATA[EM_APRM_Glitem_ID]]></COLUMNNAME> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <AD_REFERENCE_VALUE_ID><![CDATA[1A6C5E0A5868417786ECCF3C02B17D65]]></AD_REFERENCE_VALUE_ID> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ISKEY><![CDATA[N]]></ISKEY> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <SEQNO><![CDATA[81]]></SEQNO> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <AD_ELEMENT_ID><![CDATA[A3F4495893084689A6F604722ACA1EC2]]></AD_ELEMENT_ID> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <POSITION><![CDATA[20]]></POSITION> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> +<!--B5066970A1944B9EBDA0A2BE48F026F6--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> +<!--B5066970A1944B9EBDA0A2BE48F026F6--></AD_COLUMN> + <!--B591815987C54A369525A5BA485F5FC0--><AD_COLUMN> <!--B591815987C54A369525A5BA485F5FC0--> <AD_COLUMN_ID><![CDATA[B591815987C54A369525A5BA485F5FC0]]></AD_COLUMN_ID> <!--B591815987C54A369525A5BA485F5FC0--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 6b20e7da0de3 -r 2863ed7b271c modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml Thu Feb 22 09:09:51 2018 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml Wed Feb 21 10:30:37 2018 +0100 @@ -1208,6 +1208,20 @@ <!--A37C6F84AA463F50E040007F01006E35--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> <!--A37C6F84AA463F50E040007F01006E35--></AD_ELEMENT> +<!--A3F4495893084689A6F604722ACA1EC2--><AD_ELEMENT> +<!--A3F4495893084689A6F604722ACA1EC2--> <AD_ELEMENT_ID><![CDATA[A3F4495893084689A6F604722ACA1EC2]]></AD_ELEMENT_ID> +<!--A3F4495893084689A6F604722ACA1EC2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A3F4495893084689A6F604722ACA1EC2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A3F4495893084689A6F604722ACA1EC2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A3F4495893084689A6F604722ACA1EC2--> <COLUMNNAME><![CDATA[EM_APRM_Glitem_ID]]></COLUMNNAME> +<!--A3F4495893084689A6F604722ACA1EC2--> <NAME><![CDATA[Default G/L Item for Funds Transfer]]></NAME> +<!--A3F4495893084689A6F604722ACA1EC2--> <PRINTNAME><![CDATA[Default G/L Item for Funds Transfer]]></PRINTNAME> +<!--A3F4495893084689A6F604722ACA1EC2--> <DESCRIPTION><![CDATA[Default G/L Item used for Funds Transfer Process]]></DESCRIPTION> +<!--A3F4495893084689A6F604722ACA1EC2--> <HELP><![CDATA[Default G/L Item used for Funds Transfer Process in Financial Account Window]]></HELP> +<!--A3F4495893084689A6F604722ACA1EC2--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--A3F4495893084689A6F604722ACA1EC2--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> +<!--A3F4495893084689A6F604722ACA1EC2--></AD_ELEMENT> + <!--A62C80360F274C44AA6BF58315DF65FF--><AD_ELEMENT> <!--A62C80360F274C44AA6BF58315DF65FF--> <AD_ELEMENT_ID><![CDATA[A62C80360F274C44AA6BF58315DF65FF]]></AD_ELEMENT_ID> <!--A62C80360F274C44AA6BF58315DF65FF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1706,6 +1720,20 @@ <!--F109FCAF8CC1462AB2A94F73F4E51EA7--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> <!--F109FCAF8CC1462AB2A94F73F4E51EA7--></AD_ELEMENT> +<!--F18571A261AB41D49246E1C04D647256--><AD_ELEMENT> +<!--F18571A261AB41D49246E1C04D647256--> <AD_ELEMENT_ID><![CDATA[F18571A261AB41D49246E1C04D647256]]></AD_ELEMENT_ID> +<!--F18571A261AB41D49246E1C04D647256--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--F18571A261AB41D49246E1C04D647256--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--F18571A261AB41D49246E1C04D647256--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--F18571A261AB41D49246E1C04D647256--> <COLUMNNAME><![CDATA[EM_Aprm_Isfundstrans_Enabled]]></COLUMNNAME> +<!--F18571A261AB41D49246E1C04D647256--> <NAME><![CDATA[Funds Transfer Enabled]]></NAME> +<!--F18571A261AB41D49246E1C04D647256--> <PRINTNAME><![CDATA[Funds Transfer Enabled]]></PRINTNAME> +<!--F18571A261AB41D49246E1C04D647256--> <DESCRIPTION><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process.]]></DESCRIPTION> +<!--F18571A261AB41D49246E1C04D647256--> <HELP><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process and to show/hide Financial Accounts in Funds Transfer Process]]></HELP> +<!--F18571A261AB41D49246E1C04D647256--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--F18571A261AB41D49246E1C04D647256--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> +<!--F18571A261AB41D49246E1C04D647256--></AD_ELEMENT> + <!--F1D81ADE47094291B577E6B10B2B95E4--><AD_ELEMENT> <!--F1D81ADE47094291B577E6B10B2B95E4--> <AD_ELEMENT_ID><![CDATA[F1D81ADE47094291B577E6B10B2B95E4]]></AD_ELEMENT_ID> <!--F1D81ADE47094291B577E6B10B2B95E4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 6b20e7da0de3 -r 2863ed7b271c modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Thu Feb 22 09:09:51 2018 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Wed Feb 21 10:30:37 2018 +0100 @@ -877,7 +877,8 @@ <!--0A650E8E8BD944018FD4FD6866AF1481--> <AD_COLUMN_ID><![CDATA[AFFEB1DBCEFF4A63871F1E214E01071C]]></AD_COLUMN_ID> <!--0A650E8E8BD944018FD4FD6866AF1481--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> <!--0A650E8E8BD944018FD4FD6866AF1481--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--0A650E8E8BD944018FD4FD6866AF1481--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH> +<!--0A650E8E8BD944018FD4FD6866AF1481--> <DISPLAYLOGIC><![CDATA[@EM_Aprm_Isfundstrans_Enabled@='Y']]></DISPLAYLOGIC> +<!--0A650E8E8BD944018FD4FD6866AF1481--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> <!--0A650E8E8BD944018FD4FD6866AF1481--> <ISREADONLY><![CDATA[N]]></ISREADONLY> <!--0A650E8E8BD944018FD4FD6866AF1481--> <SEQNO><![CDATA[440]]></SEQNO> <!--0A650E8E8BD944018FD4FD6866AF1481--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> @@ -13580,6 +13581,35 @@ <!--9AF76E97875345F587C9DD8F64B96431--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--9AF76E97875345F587C9DD8F64B96431--></AD_FIELD> +<!--9BF656872BAF4AFBA443E4430237D527--><AD_FIELD> +<!--9BF656872BAF4AFBA443E4430237D527--> <AD_FIELD_ID><![CDATA[9BF656872BAF4AFBA443E4430237D527]]></AD_FIELD_ID> +<!--9BF656872BAF4AFBA443E4430237D527--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--9BF656872BAF4AFBA443E4430237D527--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--9BF656872BAF4AFBA443E4430237D527--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--9BF656872BAF4AFBA443E4430237D527--> <NAME><![CDATA[Default G/L Item for Funds Transfer]]></NAME> +<!--9BF656872BAF4AFBA443E4430237D527--> <DESCRIPTION><![CDATA[Default G/L Item used for Funds Transfer Process]]></DESCRIPTION> +<!--9BF656872BAF4AFBA443E4430237D527--> <HELP><![CDATA[Default G/L Item used for Funds Transfer Process in Financial Account Window]]></HELP> +<!--9BF656872BAF4AFBA443E4430237D527--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--9BF656872BAF4AFBA443E4430237D527--> <AD_TAB_ID><![CDATA[143]]></AD_TAB_ID> +<!--9BF656872BAF4AFBA443E4430237D527--> <AD_COLUMN_ID><![CDATA[B5066970A1944B9EBDA0A2BE48F026F6]]></AD_COLUMN_ID> +<!--9BF656872BAF4AFBA443E4430237D527--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--9BF656872BAF4AFBA443E4430237D527--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--9BF656872BAF4AFBA443E4430237D527--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH> +<!--9BF656872BAF4AFBA443E4430237D527--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--9BF656872BAF4AFBA443E4430237D527--> <SEQNO><![CDATA[106]]></SEQNO> +<!--9BF656872BAF4AFBA443E4430237D527--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--9BF656872BAF4AFBA443E4430237D527--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--9BF656872BAF4AFBA443E4430237D527--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--9BF656872BAF4AFBA443E4430237D527--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--9BF656872BAF4AFBA443E4430237D527--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--9BF656872BAF4AFBA443E4430237D527--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--9BF656872BAF4AFBA443E4430237D527--> <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO> +<!--9BF656872BAF4AFBA443E4430237D527--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--9BF656872BAF4AFBA443E4430237D527--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--9BF656872BAF4AFBA443E4430237D527--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--9BF656872BAF4AFBA443E4430237D527--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--9BF656872BAF4AFBA443E4430237D527--></AD_FIELD> + <!--9CB868DC0BCD49C197CA4AFBBF92093E--><AD_FIELD> <!--9CB868DC0BCD49C197CA4AFBBF92093E--> <AD_FIELD_ID><![CDATA[9CB868DC0BCD49C197CA4AFBBF92093E]]></AD_FIELD_ID> <!--9CB868DC0BCD49C197CA4AFBBF92093E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -13778,6 +13808,35 @@ <!--9E41C5369B034F2DB102624F5277353B--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--9E41C5369B034F2DB102624F5277353B--></AD_FIELD> +<!--9E4ED210DB344E538CA6921C0111E8DD--><AD_FIELD> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <AD_FIELD_ID><![CDATA[9E4ED210DB344E538CA6921C0111E8DD]]></AD_FIELD_ID> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <NAME><![CDATA[Funds Transfer Enabled]]></NAME> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <DESCRIPTION><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process.]]></DESCRIPTION> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <HELP><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process.]]></HELP> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <AD_TAB_ID><![CDATA[2845D761A8394468BD3BA4710AA888D4]]></AD_TAB_ID> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <AD_COLUMN_ID><![CDATA[B502077EB5A64A43A07CD42323BBAC57]]></AD_COLUMN_ID> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <SEQNO><![CDATA[135]]></SEQNO> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--9E4ED210DB344E538CA6921C0111E8DD--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--9E4ED210DB344E538CA6921C0111E8DD--></AD_FIELD> + <!--9FF475A41081408A892922BF1F7EC5CE--><AD_FIELD> <!--9FF475A41081408A892922BF1F7EC5CE--> <AD_FIELD_ID><![CDATA[9FF475A41081408A892922BF1F7EC5CE]]></AD_FIELD_ID> <!--9FF475A41081408A892922BF1F7EC5CE--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 6b20e7da0de3 -r 2863ed7b271c modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml Thu Feb 22 09:09:51 2018 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml Wed Feb 21 10:30:37 2018 +0100 @@ -93,9 +93,10 @@ <!--8CEAB789915E4575BDEB66F1930067BA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--8CEAB789915E4575BDEB66F1930067BA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--8CEAB789915E4575BDEB66F1930067BA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--8CEAB789915E4575BDEB66F1930067BA--> <NAME><![CDATA[Not selected FIN_Financial_Account]]></NAME> +<!--8CEAB789915E4575BDEB66F1930067BA--> <NAME><![CDATA[Not selected Financial Account with enabled Funds Transfer]]></NAME> +<!--8CEAB789915E4575BDEB66F1930067BA--> <DESCRIPTION><![CDATA[Validates that the financial account is not the same as the selected one and that it has the flag Funds Transfer enabled]]></DESCRIPTION> <!--8CEAB789915E4575BDEB66F1930067BA--> <TYPE><![CDATA[HQL_JS]]></TYPE> -<!--8CEAB789915E4575BDEB66F1930067BA--> <CODE><![CDATA["e.id != '" + OB.getParameters().get('inpfinFinancialAccountId') + "'"]]></CODE> +<!--8CEAB789915E4575BDEB66F1930067BA--> <CODE><![CDATA["e.aprmIsfundstransEnabled = true and e.id != '" + OB.getParameters().get('inpfinFinancialAccountId') + "'"]]></CODE> <!--8CEAB789915E4575BDEB66F1930067BA--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--8CEAB789915E4575BDEB66F1930067BA--></AD_VAL_RULE> diff -r 6b20e7da0de3 -r 2863ed7b271c modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml Thu Feb 22 09:09:51 2018 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml Wed Feb 21 10:30:37 2018 +0100 @@ -207,6 +207,31 @@ <!--111000BF6C4445E785AA08331A268E1B--> <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION> <!--111000BF6C4445E785AA08331A268E1B--></OBUIAPP_PARAMETER> +<!--11D3060AAE0C4BA8BDC136623F250CD3--><OBUIAPP_PARAMETER> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <OBUIAPP_PARAMETER_ID><![CDATA[11D3060AAE0C4BA8BDC136623F250CD3]]></OBUIAPP_PARAMETER_ID> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <NAME><![CDATA[Description]]></NAME> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <HELP><![CDATA[A description is limited to 255 characters.]]></HELP> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <SEQNO><![CDATA[255]]></SEQNO> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <COLUMNNAME><![CDATA[description]]></COLUMNNAME> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <AD_ELEMENT_ID><![CDATA[275]]></AD_ELEMENT_ID> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <ISFIXED><![CDATA[N]]></ISFIXED> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></OBUIAPP_PROCESS_ID> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS> +<!--11D3060AAE0C4BA8BDC136623F250CD3--> <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE> ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
