details: https://code.openbravo.com/erp/devel/main/rev/d098ea6d07c7 changeset: 27049:d098ea6d07c7 user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Jun 29 22:53:12 2015 +0000 summary: CI: merge back from main
details: https://code.openbravo.com/erp/devel/main/rev/59a8db5a95cb changeset: 27050:59a8db5a95cb user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jun 30 09:04:31 2015 +0200 summary: Related to issue 29675: improvements in log messages details: https://code.openbravo.com/erp/devel/main/rev/9d2b4c014bca changeset: 27051:9d2b4c014bca user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Tue Jun 30 09:08:18 2015 +0200 summary: Related to issue 29675: fix in comment details: https://code.openbravo.com/erp/devel/main/rev/e5bce5d67077 changeset: 27052:e5bce5d67077 user: David Baz Fayos <david.baz <at> openbravo.com> date: Tue Jun 30 10:27:55 2015 +0200 summary: Related to issue 29414: Updated browser supported/recommended list for PR15Q3 * Chrome. Supported 42, Recommended 43 or higher. * Firefox. Supported 31, Recommended 38 or higher. * Internet Explorer. Supported 9, Recommended 11 or higher. * Safari. Supported 7, Recommended 8 or higher. details: https://code.openbravo.com/erp/devel/main/rev/3c0ec0ba6d2d changeset: 27053:3c0ec0ba6d2d user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Jun 30 10:27:33 2015 +0200 summary: Related to issue 30143. Filters Add Payments Pop up by Financial Account If a different Financial Account is selected it is taken into account when creating the Transacion. details: https://code.openbravo.com/erp/devel/main/rev/6241ce627129 changeset: 27054:6241ce627129 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Tue Jun 30 11:40:10 2015 +0200 summary: Related to issue 29042: Backout changeset e8bebe16d4bf The reverted changeset creates a mutanting trigger in Oracle details: https://code.openbravo.com/erp/devel/main/rev/0562e0074222 changeset: 27055:0562e0074222 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Tue Jun 30 14:19:30 2015 +0200 summary: Related to issue 30143: Synchronize Terminology details: https://code.openbravo.com/erp/devel/main/rev/a0fd6a76a3d5 changeset: 27056:a0fd6a76a3d5 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Jun 30 18:27:51 2015 +0000 summary: CI: update AD_MODULE to version 27055 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 54 ++++++++- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml | 2 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddMultiplePaymentsHandler.java | 19 ++- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java | 9 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 ++-- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 20 +- src-db/database/model/triggers/AD_ACCOUNTINGRPT_ELEMENT_TRG.xml | 27 +---- src-db/database/sourcedata/AD_MESSAGE.xml | 12 -- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src/org/openbravo/erpCommon/security/Login.html | 6 +- 50 files changed, 155 insertions(+), 142 deletions(-) diffs (truncated from 1252 to 300 lines): diff -r 8d846f99ad0b -r a0fd6a76a3d5 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Mon Jun 29 22:37:53 2015 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Tue Jun 30 18:27:51 2015 +0000 @@ -597,13 +597,14 @@ <!--07FA7810A55745B8BCC4BC590253DA6A--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> <!--07FA7810A55745B8BCC4BC590253DA6A--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH> <!--07FA7810A55745B8BCC4BC590253DA6A--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> -<!--07FA7810A55745B8BCC4BC590253DA6A--> <SEQNO><![CDATA[50]]></SEQNO> +<!--07FA7810A55745B8BCC4BC590253DA6A--> <SEQNO><![CDATA[60]]></SEQNO> <!--07FA7810A55745B8BCC4BC590253DA6A--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--07FA7810A55745B8BCC4BC590253DA6A--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--07FA7810A55745B8BCC4BC590253DA6A--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--07FA7810A55745B8BCC4BC590253DA6A--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> <!--07FA7810A55745B8BCC4BC590253DA6A--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> <!--07FA7810A55745B8BCC4BC590253DA6A--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--07FA7810A55745B8BCC4BC590253DA6A--> <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO> <!--07FA7810A55745B8BCC4BC590253DA6A--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> <!--07FA7810A55745B8BCC4BC590253DA6A--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> <!--07FA7810A55745B8BCC4BC590253DA6A--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> @@ -3208,13 +3209,14 @@ <!--30B197597EBD41FE98B013F412583A6F--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> <!--30B197597EBD41FE98B013F412583A6F--> <DISPLAYLENGTH><![CDATA[3]]></DISPLAYLENGTH> <!--30B197597EBD41FE98B013F412583A6F--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> -<!--30B197597EBD41FE98B013F412583A6F--> <SEQNO><![CDATA[60]]></SEQNO> +<!--30B197597EBD41FE98B013F412583A6F--> <SEQNO><![CDATA[70]]></SEQNO> <!--30B197597EBD41FE98B013F412583A6F--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--30B197597EBD41FE98B013F412583A6F--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--30B197597EBD41FE98B013F412583A6F--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--30B197597EBD41FE98B013F412583A6F--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> <!--30B197597EBD41FE98B013F412583A6F--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> <!--30B197597EBD41FE98B013F412583A6F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--30B197597EBD41FE98B013F412583A6F--> <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO> <!--30B197597EBD41FE98B013F412583A6F--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> <!--30B197597EBD41FE98B013F412583A6F--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> <!--30B197597EBD41FE98B013F412583A6F--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> @@ -8407,6 +8409,36 @@ <!--76314390FC424317A60214DBD7DE8882--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--76314390FC424317A60214DBD7DE8882--></AD_FIELD> +<!--7646717C13CA46B18B80E6F6D9CDE888--><AD_FIELD> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <AD_FIELD_ID><![CDATA[7646717C13CA46B18B80E6F6D9CDE888]]></AD_FIELD_ID> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <NAME><![CDATA[Financial Account]]></NAME> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <DESCRIPTION><![CDATA[Financial account used to deposit / withdrawal money such as bank accounts or petty cash]]></DESCRIPTION> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <HELP><![CDATA[Financial account used to deposit / withdrawal money such as bank accounts or petty cash]]></HELP> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <AD_TAB_ID><![CDATA[2700A962BC484D4C9B3E30B1C3C66BFB]]></AD_TAB_ID> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <AD_COLUMN_ID><![CDATA[03276FB53CC54CC1829E0AA6EC0F2EE6]]></AD_COLUMN_ID> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <PROPERTY><![CDATA[account]]></PROPERTY> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <SEQNO><![CDATA[10]]></SEQNO> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--7646717C13CA46B18B80E6F6D9CDE888--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--7646717C13CA46B18B80E6F6D9CDE888--></AD_FIELD> + <!--7722431F4C9C4A9E9BAA150686682D57--><AD_FIELD> <!--7722431F4C9C4A9E9BAA150686682D57--> <AD_FIELD_ID><![CDATA[7722431F4C9C4A9E9BAA150686682D57]]></AD_FIELD_ID> <!--7722431F4C9C4A9E9BAA150686682D57--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -12280,13 +12312,14 @@ <!--8AA33C2BAE2F447680A672A3B8C16837--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> <!--8AA33C2BAE2F447680A672A3B8C16837--> <DISPLAYLENGTH><![CDATA[15]]></DISPLAYLENGTH> <!--8AA33C2BAE2F447680A672A3B8C16837--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> -<!--8AA33C2BAE2F447680A672A3B8C16837--> <SEQNO><![CDATA[80]]></SEQNO> +<!--8AA33C2BAE2F447680A672A3B8C16837--> <SEQNO><![CDATA[90]]></SEQNO> <!--8AA33C2BAE2F447680A672A3B8C16837--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--8AA33C2BAE2F447680A672A3B8C16837--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--8AA33C2BAE2F447680A672A3B8C16837--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--8AA33C2BAE2F447680A672A3B8C16837--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> <!--8AA33C2BAE2F447680A672A3B8C16837--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> <!--8AA33C2BAE2F447680A672A3B8C16837--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--8AA33C2BAE2F447680A672A3B8C16837--> <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO> <!--8AA33C2BAE2F447680A672A3B8C16837--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> <!--8AA33C2BAE2F447680A672A3B8C16837--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> <!--8AA33C2BAE2F447680A672A3B8C16837--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> @@ -16791,13 +16824,14 @@ <!--B283607F4D9A4EE6BF2FF2BB7ADCF36A--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> <!--B283607F4D9A4EE6BF2FF2BB7ADCF36A--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH> <!--B283607F4D9A4EE6BF2FF2BB7ADCF36A--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> -<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A--> <SEQNO><![CDATA[20]]></SEQNO> +<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A--> <SEQNO><![CDATA[30]]></SEQNO> <!--B283607F4D9A4EE6BF2FF2BB7ADCF36A--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--B283607F4D9A4EE6BF2FF2BB7ADCF36A--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--B283607F4D9A4EE6BF2FF2BB7ADCF36A--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--B283607F4D9A4EE6BF2FF2BB7ADCF36A--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> <!--B283607F4D9A4EE6BF2FF2BB7ADCF36A--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> <!--B283607F4D9A4EE6BF2FF2BB7ADCF36A--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A--> <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO> <!--B283607F4D9A4EE6BF2FF2BB7ADCF36A--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> <!--B283607F4D9A4EE6BF2FF2BB7ADCF36A--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> <!--B283607F4D9A4EE6BF2FF2BB7ADCF36A--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> @@ -16879,13 +16913,14 @@ <!--B3035C3662CF4A33B574693E8AB317C6--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> <!--B3035C3662CF4A33B574693E8AB317C6--> <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH> <!--B3035C3662CF4A33B574693E8AB317C6--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> -<!--B3035C3662CF4A33B574693E8AB317C6--> <SEQNO><![CDATA[10]]></SEQNO> +<!--B3035C3662CF4A33B574693E8AB317C6--> <SEQNO><![CDATA[20]]></SEQNO> <!--B3035C3662CF4A33B574693E8AB317C6--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--B3035C3662CF4A33B574693E8AB317C6--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--B3035C3662CF4A33B574693E8AB317C6--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--B3035C3662CF4A33B574693E8AB317C6--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> <!--B3035C3662CF4A33B574693E8AB317C6--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> <!--B3035C3662CF4A33B574693E8AB317C6--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--B3035C3662CF4A33B574693E8AB317C6--> <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO> <!--B3035C3662CF4A33B574693E8AB317C6--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> <!--B3035C3662CF4A33B574693E8AB317C6--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> <!--B3035C3662CF4A33B574693E8AB317C6--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> @@ -17782,13 +17817,14 @@ <!--BB3881C8631049FDB8BCB0176C2D8D21--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> <!--BB3881C8631049FDB8BCB0176C2D8D21--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH> <!--BB3881C8631049FDB8BCB0176C2D8D21--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> -<!--BB3881C8631049FDB8BCB0176C2D8D21--> <SEQNO><![CDATA[70]]></SEQNO> +<!--BB3881C8631049FDB8BCB0176C2D8D21--> <SEQNO><![CDATA[80]]></SEQNO> <!--BB3881C8631049FDB8BCB0176C2D8D21--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--BB3881C8631049FDB8BCB0176C2D8D21--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--BB3881C8631049FDB8BCB0176C2D8D21--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--BB3881C8631049FDB8BCB0176C2D8D21--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> <!--BB3881C8631049FDB8BCB0176C2D8D21--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> <!--BB3881C8631049FDB8BCB0176C2D8D21--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--BB3881C8631049FDB8BCB0176C2D8D21--> <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO> <!--BB3881C8631049FDB8BCB0176C2D8D21--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> <!--BB3881C8631049FDB8BCB0176C2D8D21--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> <!--BB3881C8631049FDB8BCB0176C2D8D21--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> @@ -19779,13 +19815,14 @@ <!--D82958A43B8D4FC18F9C24467ED00115--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> <!--D82958A43B8D4FC18F9C24467ED00115--> <DISPLAYLENGTH><![CDATA[9]]></DISPLAYLENGTH> <!--D82958A43B8D4FC18F9C24467ED00115--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> -<!--D82958A43B8D4FC18F9C24467ED00115--> <SEQNO><![CDATA[30]]></SEQNO> +<!--D82958A43B8D4FC18F9C24467ED00115--> <SEQNO><![CDATA[40]]></SEQNO> <!--D82958A43B8D4FC18F9C24467ED00115--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--D82958A43B8D4FC18F9C24467ED00115--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--D82958A43B8D4FC18F9C24467ED00115--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--D82958A43B8D4FC18F9C24467ED00115--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> <!--D82958A43B8D4FC18F9C24467ED00115--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> <!--D82958A43B8D4FC18F9C24467ED00115--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--D82958A43B8D4FC18F9C24467ED00115--> <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO> <!--D82958A43B8D4FC18F9C24467ED00115--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> <!--D82958A43B8D4FC18F9C24467ED00115--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> <!--D82958A43B8D4FC18F9C24467ED00115--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> @@ -22046,13 +22083,14 @@ <!--F98BFF6DF6EA41CB96E0B3042E5181A5--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> <!--F98BFF6DF6EA41CB96E0B3042E5181A5--> <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH> <!--F98BFF6DF6EA41CB96E0B3042E5181A5--> <ISREADONLY><![CDATA[Y]]></ISREADONLY> -<!--F98BFF6DF6EA41CB96E0B3042E5181A5--> <SEQNO><![CDATA[40]]></SEQNO> +<!--F98BFF6DF6EA41CB96E0B3042E5181A5--> <SEQNO><![CDATA[50]]></SEQNO> <!--F98BFF6DF6EA41CB96E0B3042E5181A5--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> <!--F98BFF6DF6EA41CB96E0B3042E5181A5--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--F98BFF6DF6EA41CB96E0B3042E5181A5--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> <!--F98BFF6DF6EA41CB96E0B3042E5181A5--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> <!--F98BFF6DF6EA41CB96E0B3042E5181A5--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> <!--F98BFF6DF6EA41CB96E0B3042E5181A5--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--F98BFF6DF6EA41CB96E0B3042E5181A5--> <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO> <!--F98BFF6DF6EA41CB96E0B3042E5181A5--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> <!--F98BFF6DF6EA41CB96E0B3042E5181A5--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> <!--F98BFF6DF6EA41CB96E0B3042E5181A5--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> diff -r 8d846f99ad0b -r a0fd6a76a3d5 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Jun 29 22:37:53 2015 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 30 18:27:51 2015 +0000 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.27047]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.27055]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> diff -r 8d846f99ad0b -r a0fd6a76a3d5 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Jun 29 22:37:53 2015 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jun 30 18:27:51 2015 +0000 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.27047]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.27055]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.27047]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.27055]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 8d846f99ad0b -r a0fd6a76a3d5 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Mon Jun 29 22:37:53 2015 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Tue Jun 30 18:27:51 2015 +0000 @@ -92,6 +92,8 @@ <!--2700A962BC484D4C9B3E30B1C3C66BFB--> <UIPATTERN><![CDATA[RO]]></UIPATTERN> <!--2700A962BC484D4C9B3E30B1C3C66BFB--> <HQLWHERECLAUSE><![CDATA[e.status in ('RPR', 'PPM') and e.amount <>0 and exists ( select 1 from FinancialMgmtFinAccPaymentMethod as fapm join fapm.account as fa where fapm.paymentMethod = e.paymentMethod and fa.id = @FIN_Financial_Account.id@ and (case when e.receipt = true then fapm.payinAllow else fapm.payoutAllow end) = true and fa.currency = e.account.currency) and not exists (select 1 from FIN_Finacc_Transaction as ft where e = ft.finPayment) and AD_ISORGINCLUDED(e.organization.id, @FIN_Financial_Account.organization@, e.client.id)<>-1]]></HQLWHERECLAUSE> <!--2700A962BC484D4C9B3E30B1C3C66BFB--> <HQLORDERBYCLAUSE><![CDATA[paymentDate, documentNo]]></HQLORDERBYCLAUSE> +<!--2700A962BC484D4C9B3E30B1C3C66BFB--> <HQLFILTERCLAUSE><![CDATA[e.account.id = @FIN_Financial_Account.id@]]></HQLFILTERCLAUSE> +<!--2700A962BC484D4C9B3E30B1C3C66BFB--> <FILTERNAME><![CDATA[Payments are filtered by the selected Financial Account]]></FILTERNAME> <!--2700A962BC484D4C9B3E30B1C3C66BFB--> <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS> <!--2700A962BC484D4C9B3E30B1C3C66BFB--> <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY> <!--2700A962BC484D4C9B3E30B1C3C66BFB--> <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE> diff -r 8d846f99ad0b -r a0fd6a76a3d5 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddMultiplePaymentsHandler.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddMultiplePaymentsHandler.java Mon Jun 29 22:37:53 2015 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddMultiplePaymentsHandler.java Tue Jun 30 18:27:51 2015 +0000 @@ -33,6 +33,7 @@ import org.openbravo.dal.service.OBDal; import org.openbravo.erpCommon.utility.OBMessageUtils; import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction; +import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount; import org.openbravo.model.financialmgmt.payment.FIN_Payment; import org.openbravo.service.db.DbUtility; import org.openbravo.service.json.JsonUtils; @@ -51,20 +52,21 @@ final JSONArray selectedPayments = jsonparams.getJSONObject("payments").getJSONArray( "_selection"); final Date statementDate = jsDateFormat.parse(jsonparams.getString("statementDate")); + final String strAccountId = jsonData.getString("Fin_Financial_Account_ID"); - int selectedInvoiceLinesLength = selectedPayments.length(); - if (selectedInvoiceLinesLength == 0) { + int selectedPaymentsLength = selectedPayments.length(); + if (selectedPaymentsLength == 0) { // Validation error: No lines selected return getErrorMessage(OBMessageUtils.messageBD("APRM_NO_PAYMENTS_SELECTED")); } - for (int i = 0; i < selectedInvoiceLinesLength; i++) { + for (int i = 0; i < selectedPaymentsLength; i++) { final JSONObject paymentJS = selectedPayments.getJSONObject(i); - createAndProcessTransactionFromPayment(paymentJS, statementDate); + createAndProcessTransactionFromPayment(paymentJS, statementDate, strAccountId); } // Success Message return getSuccessMessage(String.format( - OBMessageUtils.messageBD("APRM_MULTIPLE_TRANSACTIONS_ADDED"), selectedInvoiceLinesLength)); + OBMessageUtils.messageBD("APRM_MULTIPLE_TRANSACTIONS_ADDED"), selectedPaymentsLength)); } catch (Exception e) { OBDal.getInstance().rollbackAndClose(); @@ -85,15 +87,20 @@ * Creates a new transaction from the payment and then it processes the transaction */ private void createAndProcessTransactionFromPayment(final JSONObject paymentJS, - final Date transactionDate) throws JSONException { + final Date transactionDate, String strAccountId) throws JSONException { + try { OBContext.setAdminMode(true); final String paymentId = paymentJS.getString("id"); log.debug("Creating transaction for FIN_Payment_ID: " + paymentId); final FIN_Payment payment = OBDal.getInstance().get(FIN_Payment.class, paymentId); + FIN_FinancialAccount account = OBDal.getInstance().get(FIN_FinancialAccount.class, + strAccountId); + if (payment != null) { final FIN_FinaccTransaction transaction = TransactionsDao.createFinAccTransaction(payment); transaction.setTransactionDate(transactionDate); + transaction.setAccount(account); FIN_TransactionProcess.doTransactionProcess(ACTION_PROCESS_TRANSACTION, transaction); } } finally { diff -r 8d846f99ad0b -r a0fd6a76a3d5 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Mon Jun 29 22:37:53 2015 +0000 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 30 18:27:51 2015 +0000 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.27047]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.27055]]></VERSION> <!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION> <!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP> <!--C70732EA90A14EC0916078B85CC33D2D--> <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL> diff -r 8d846f99ad0b -r a0fd6a76a3d5 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Jun 29 22:37:53 2015 +0000 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Jun 30 18:27:51 2015 +0000 @@ -7,7 +7,7 @@ <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.27047]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.27055]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 8d846f99ad0b -r a0fd6a76a3d5 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Mon Jun 29 22:37:53 2015 +0000 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 30 18:27:51 2015 +0000 ------------------------------------------------------------------------------ Don't Limit Your Business. Reach for the Cloud. GigeNET's Cloud Solutions provide you with the tools and support that you need to offload your IT needs and focus on growing your business. Configured For All Businesses. Start Your Cloud Today. https://www.gigenetcloud.com/ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
