details: https://code.openbravo.com/erp/devel/pi/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.
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
| 52 ++++++++-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
| 2 +
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddMultiplePaymentsHandler.java
| 19 ++-
3 files changed, 59 insertions(+), 14 deletions(-)
diffs (238 lines):
diff -r e5bce5d67077 -r 3c0ec0ba6d2d
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Tue Jun 30 10:27:55 2015 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Tue Jun 30 10:27:33 2015 +0200
@@ -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,34 @@
<!--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-->
<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 +12310,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 +16822,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 +16911,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 +17815,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 +19813,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 +22081,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 e5bce5d67077 -r 3c0ec0ba6d2d
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
Tue Jun 30 10:27:55 2015 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
Tue Jun 30 10:27:33 2015 +0200
@@ -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 e5bce5d67077 -r 3c0ec0ba6d2d
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddMultiplePaymentsHandler.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddMultiplePaymentsHandler.java
Tue Jun 30 10:27:55 2015 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddMultiplePaymentsHandler.java
Tue Jun 30 10:27:33 2015 +0200
@@ -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 {
------------------------------------------------------------------------------
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
