details: https://code.openbravo.com/erp/devel/pi/rev/8be2ec19f76c changeset: 16820:8be2ec19f76c user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Mon Jun 11 11:07:53 2012 +0200 summary: fixes bug 20717: Creating multiple transactions when clicking the OK button several times
details: https://code.openbravo.com/erp/devel/pi/rev/d848121a4122 changeset: 16821:d848121a4122 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Tue Jun 12 17:25:18 2012 +0200 summary: Fixes bug 20718, fixes bug 20037 details: https://code.openbravo.com/erp/devel/pi/rev/8972f5cea24b changeset: 16822:8972f5cea24b user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Tue Jun 12 17:30:48 2012 +0200 summary: Fixes bug 20590 details: https://code.openbravo.com/erp/devel/pi/rev/8f9fe48cbf5c changeset: 16823:8f9fe48cbf5c user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Tue Jun 12 18:51:10 2012 +0200 summary: Fixes bug 18998 details: https://code.openbravo.com/erp/devel/pi/rev/8837bc9da36d changeset: 16824:8837bc9da36d user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Wed Jun 13 09:48:05 2012 +0200 summary: merge diffstat: CONTRIBUTORS | 1 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 112 +++++ modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html | 33 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java | 220 +++++++++- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml | 5 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html | 24 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java | 27 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 214 +++++++-- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 192 +++++--- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java | 14 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 5 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js | 20 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java | 3 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 1 - modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js | 23 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 52 ++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 48 ++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 27 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-statusbar-styles.js | 5 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateTimeUIDefinition.java | 17 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java | 7 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/TimeUIDefinition.java | 72 +++- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/i18n.ftl | 7 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java | 44 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java | 25 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java | 20 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java | 10 + src-db/database/model/functions/C_INVOICE_POST.xml | 2 +- src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml | 4 + src-db/database/model/tables/FIN_PAYMENT_RUN_PARA.xml | 1 - src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml | 24 +- src-db/database/sourcedata/AD_COLUMN.xml | 50 +- src-db/database/sourcedata/AD_FIELD.xml | 59 ++- src-db/database/sourcedata/AD_REF_LIST.xml | 15 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 66 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java | 16 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 20 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 51 ++- src/org/openbravo/erpCommon/ad_process/CopyFromGLJournal.java | 16 +- src/org/openbravo/erpCommon/ad_process/CopyFromGLJournal_data.xsql | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html | 8 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 5 +- 44 files changed, 1288 insertions(+), 286 deletions(-) diffs (truncated from 2764 to 300 lines): diff -r 2b5a9e3d2afd -r 8837bc9da36d CONTRIBUTORS --- a/CONTRIBUTORS Mon Jun 11 10:13:27 2012 +0200 +++ b/CONTRIBUTORS Wed Jun 13 09:48:05 2012 +0200 @@ -15,3 +15,4 @@ Shankar Balachandran <[email protected]> - Bug fixing Francois Le Roux - <[email protected]> - Bug fixing and documentation Shawn Laubach SAIC <[email protected]> - Development +Cheli Pineda <[email protected]> - Bug fixing diff -r 2b5a9e3d2afd -r 8837bc9da36d 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 11 10:13:27 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Wed Jun 13 09:48:05 2012 +0200 @@ -10363,6 +10363,118 @@ <!--C12ED5C93034481EAA90C46C242EE15A--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--C12ED5C93034481EAA90C46C242EE15A--></AD_FIELD> +<!--C1DE5081483C5DA7E040007F01000CB2--><AD_FIELD> +<!--C1DE5081483C5DA7E040007F01000CB2--> <AD_FIELD_ID><![CDATA[C1DE5081483C5DA7E040007F01000CB2]]></AD_FIELD_ID> +<!--C1DE5081483C5DA7E040007F01000CB2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C1DE5081483C5DA7E040007F01000CB2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--C1DE5081483C5DA7E040007F01000CB2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--C1DE5081483C5DA7E040007F01000CB2--> <NAME><![CDATA[Status]]></NAME> +<!--C1DE5081483C5DA7E040007F01000CB2--> <DESCRIPTION><![CDATA[A defined state or position of a payment.]]></DESCRIPTION> +<!--C1DE5081483C5DA7E040007F01000CB2--> <HELP><![CDATA[Status for the debt payment]]></HELP> +<!--C1DE5081483C5DA7E040007F01000CB2--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--C1DE5081483C5DA7E040007F01000CB2--> <AD_TAB_ID><![CDATA[6707D7449A8D45DB851F608BA88329C8]]></AD_TAB_ID> +<!--C1DE5081483C5DA7E040007F01000CB2--> <AD_COLUMN_ID><![CDATA[C1DE4479A025001AE040007F01000C7E]]></AD_COLUMN_ID> +<!--C1DE5081483C5DA7E040007F01000CB2--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--C1DE5081483C5DA7E040007F01000CB2--> <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH> +<!--C1DE5081483C5DA7E040007F01000CB2--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--C1DE5081483C5DA7E040007F01000CB2--> <SEQNO><![CDATA[220]]></SEQNO> +<!--C1DE5081483C5DA7E040007F01000CB2--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--C1DE5081483C5DA7E040007F01000CB2--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--C1DE5081483C5DA7E040007F01000CB2--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--C1DE5081483C5DA7E040007F01000CB2--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> +<!--C1DE5081483C5DA7E040007F01000CB2--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--C1DE5081483C5DA7E040007F01000CB2--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--C1DE5081483C5DA7E040007F01000CB2--> <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO> +<!--C1DE5081483C5DA7E040007F01000CB2--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--C1DE5081483C5DA7E040007F01000CB2--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--C1DE5081483C5DA7E040007F01000CB2--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--C1DE5081483C5DA7E040007F01000CB2--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--C1DE5081483C5DA7E040007F01000CB2--></AD_FIELD> + +<!--C1DE508148455DA7E040007F01000CB2--><AD_FIELD> +<!--C1DE508148455DA7E040007F01000CB2--> <AD_FIELD_ID><![CDATA[C1DE508148455DA7E040007F01000CB2]]></AD_FIELD_ID> +<!--C1DE508148455DA7E040007F01000CB2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C1DE508148455DA7E040007F01000CB2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--C1DE508148455DA7E040007F01000CB2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--C1DE508148455DA7E040007F01000CB2--> <NAME><![CDATA[Status]]></NAME> +<!--C1DE508148455DA7E040007F01000CB2--> <DESCRIPTION><![CDATA[A defined state or position of a payment.]]></DESCRIPTION> +<!--C1DE508148455DA7E040007F01000CB2--> <HELP><![CDATA[Status for the debt payment]]></HELP> +<!--C1DE508148455DA7E040007F01000CB2--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--C1DE508148455DA7E040007F01000CB2--> <AD_TAB_ID><![CDATA[FD40D9C2F1F14943933DEFEF4A8458E4]]></AD_TAB_ID> +<!--C1DE508148455DA7E040007F01000CB2--> <AD_COLUMN_ID><![CDATA[C1DE4479A025001AE040007F01000C7E]]></AD_COLUMN_ID> +<!--C1DE508148455DA7E040007F01000CB2--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--C1DE508148455DA7E040007F01000CB2--> <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH> +<!--C1DE508148455DA7E040007F01000CB2--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--C1DE508148455DA7E040007F01000CB2--> <SEQNO><![CDATA[200]]></SEQNO> +<!--C1DE508148455DA7E040007F01000CB2--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--C1DE508148455DA7E040007F01000CB2--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--C1DE508148455DA7E040007F01000CB2--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--C1DE508148455DA7E040007F01000CB2--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> +<!--C1DE508148455DA7E040007F01000CB2--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--C1DE508148455DA7E040007F01000CB2--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--C1DE508148455DA7E040007F01000CB2--> <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO> +<!--C1DE508148455DA7E040007F01000CB2--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--C1DE508148455DA7E040007F01000CB2--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--C1DE508148455DA7E040007F01000CB2--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--C1DE508148455DA7E040007F01000CB2--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--C1DE508148455DA7E040007F01000CB2--></AD_FIELD> + +<!--C1DE5396D867B815E040007F01000CBC--><AD_FIELD> +<!--C1DE5396D867B815E040007F01000CBC--> <AD_FIELD_ID><![CDATA[C1DE5396D867B815E040007F01000CBC]]></AD_FIELD_ID> +<!--C1DE5396D867B815E040007F01000CBC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C1DE5396D867B815E040007F01000CBC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--C1DE5396D867B815E040007F01000CBC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--C1DE5396D867B815E040007F01000CBC--> <NAME><![CDATA[Status]]></NAME> +<!--C1DE5396D867B815E040007F01000CBC--> <DESCRIPTION><![CDATA[A defined state or position of a payment.]]></DESCRIPTION> +<!--C1DE5396D867B815E040007F01000CBC--> <HELP><![CDATA[Status for the debt payment]]></HELP> +<!--C1DE5396D867B815E040007F01000CBC--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--C1DE5396D867B815E040007F01000CBC--> <AD_TAB_ID><![CDATA[F9751D712A804D57B97A36803843F2D7]]></AD_TAB_ID> +<!--C1DE5396D867B815E040007F01000CBC--> <AD_COLUMN_ID><![CDATA[C1DE4479A025001AE040007F01000C7E]]></AD_COLUMN_ID> +<!--C1DE5396D867B815E040007F01000CBC--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--C1DE5396D867B815E040007F01000CBC--> <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH> +<!--C1DE5396D867B815E040007F01000CBC--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--C1DE5396D867B815E040007F01000CBC--> <SEQNO><![CDATA[200]]></SEQNO> +<!--C1DE5396D867B815E040007F01000CBC--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--C1DE5396D867B815E040007F01000CBC--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--C1DE5396D867B815E040007F01000CBC--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--C1DE5396D867B815E040007F01000CBC--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> +<!--C1DE5396D867B815E040007F01000CBC--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--C1DE5396D867B815E040007F01000CBC--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--C1DE5396D867B815E040007F01000CBC--> <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO> +<!--C1DE5396D867B815E040007F01000CBC--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--C1DE5396D867B815E040007F01000CBC--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--C1DE5396D867B815E040007F01000CBC--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--C1DE5396D867B815E040007F01000CBC--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--C1DE5396D867B815E040007F01000CBC--></AD_FIELD> + +<!--C1DE5396D890B815E040007F01000CBC--><AD_FIELD> +<!--C1DE5396D890B815E040007F01000CBC--> <AD_FIELD_ID><![CDATA[C1DE5396D890B815E040007F01000CBC]]></AD_FIELD_ID> +<!--C1DE5396D890B815E040007F01000CBC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C1DE5396D890B815E040007F01000CBC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--C1DE5396D890B815E040007F01000CBC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--C1DE5396D890B815E040007F01000CBC--> <NAME><![CDATA[Status]]></NAME> +<!--C1DE5396D890B815E040007F01000CBC--> <DESCRIPTION><![CDATA[A defined state or position of a payment.]]></DESCRIPTION> +<!--C1DE5396D890B815E040007F01000CBC--> <HELP><![CDATA[Status for the debt payment]]></HELP> +<!--C1DE5396D890B815E040007F01000CBC--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--C1DE5396D890B815E040007F01000CBC--> <AD_TAB_ID><![CDATA[B82C02920AA84E8DB57D553185BD2F06]]></AD_TAB_ID> +<!--C1DE5396D890B815E040007F01000CBC--> <AD_COLUMN_ID><![CDATA[C1DE4479A025001AE040007F01000C7E]]></AD_COLUMN_ID> +<!--C1DE5396D890B815E040007F01000CBC--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--C1DE5396D890B815E040007F01000CBC--> <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH> +<!--C1DE5396D890B815E040007F01000CBC--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--C1DE5396D890B815E040007F01000CBC--> <SEQNO><![CDATA[220]]></SEQNO> +<!--C1DE5396D890B815E040007F01000CBC--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--C1DE5396D890B815E040007F01000CBC--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--C1DE5396D890B815E040007F01000CBC--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--C1DE5396D890B815E040007F01000CBC--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> +<!--C1DE5396D890B815E040007F01000CBC--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--C1DE5396D890B815E040007F01000CBC--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--C1DE5396D890B815E040007F01000CBC--> <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO> +<!--C1DE5396D890B815E040007F01000CBC--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--C1DE5396D890B815E040007F01000CBC--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--C1DE5396D890B815E040007F01000CBC--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--C1DE5396D890B815E040007F01000CBC--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--C1DE5396D890B815E040007F01000CBC--></AD_FIELD> + <!--C1F04275942B462999C4C827187816CC--><AD_FIELD> <!--C1F04275942B462999C4C827187816CC--> <AD_FIELD_ID><![CDATA[C1F04275942B462999C4C827187816CC]]></AD_FIELD_ID> <!--C1F04275942B462999C4C827187816CC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 2b5a9e3d2afd -r 8837bc9da36d 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 Mon Jun 11 10:13:27 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml Wed Jun 13 09:48:05 2012 +0200 @@ -29,7 +29,7 @@ <!--575E470ABADB4C278132C957A78C47E3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--575E470ABADB4C278132C957A78C47E3--> <NAME><![CDATA[Process Payment valid actions]]></NAME> <!--575E470ABADB4C278132C957A78C47E3--> <TYPE><![CDATA[S]]></TYPE> -<!--575E470ABADB4C278132C957A78C47E3--> <CODE><![CDATA[((@EM_APRM_Process_Payment@ = 'P' AND AD_Ref_List.value='P') OR (@EM_APRM_Process_Payment@ = 'R' AND AD_Ref_List.value IN ('R', 'V')) OR (@EM_APRM_Process_Payment@ is null))]]></CODE> +<!--575E470ABADB4C278132C957A78C47E3--> <CODE><![CDATA[((@EM_APRM_Process_Payment@ = 'P' AND AD_Ref_List.value='P') OR (@EM_APRM_Process_Payment@ = 'R' AND AD_Ref_List.value IN ('RE')) OR (@EM_APRM_Process_Payment@ = 'R' AND AD_Ref_List.value IN ('V') AND @Status@='RPAE') OR (@EM_APRM_Process_Payment@ is null))]]></CODE> <!--575E470ABADB4C278132C957A78C47E3--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--575E470ABADB4C278132C957A78C47E3--></AD_VAL_RULE> diff -r 2b5a9e3d2afd -r 8837bc9da36d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html Mon Jun 11 10:13:27 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html Wed Jun 13 09:48:05 2012 +0200 @@ -146,6 +146,29 @@ cellCount, row, cellGLItemDesc, cellGLITemReceivedInAmt, cellGLITemPaidOutAmt, cellRemoveButton, i, textNode, glAcctDimsDesc, acctDim, cellGLItemDim, cellText; setTextContent(table,''); + if (!OB.APRM.HasGLItems) { + var glItems = eval(document.getElementById('paramGLItems').value); + if (glItems && glItems.length>0){ + OB.APRM.APFT_GLItems = glItems; + OB.APRM.HasGLItems = true; + var amountSelected = 0; + for (i=0;i<glItems.length;i++){ + if (isTrue('isReceipt')) { + amountSelected = add(amountSelected,glItems[i].glitemReceivedInAmt); + amountSelected = subtract(amountSelected,glItems[i].glitemPaidOutAmt); + } else { + amountSelected = subtract(amountSelected,glItems[i].glitemReceivedInAmt); + amountSelected = add(amountSelected,glItems[i].glitemPaidOutAmt); + } + } + document.getElementById('paramGLItems').value = ''; + glitemCount = OB.APRM.APFT_GLItems.length; + OB.APRM.APFT_GLItemsId = glitemCount; + frm.inpGLSumAmount.value = amountSelected; + document.getElementById('paramGLItemsAmt').innerHTML = document.frmMain.inpGLSumAmount.value; + updateTotal(); + } + } if (glitemCount === 0) { OB.APRM.HasGLItems = false; frm.inpGLSumAmount.value = '0'; @@ -260,6 +283,7 @@ } document.frmMain.inpActualPayment.value = amount; } + OB.APRM.APFT_GLItemsId++; OB.APRM.APFT_GLItems.push({ id: OB.APRM.APFT_GLItemsId, @@ -557,6 +581,7 @@ //numberInputEvent('onchange', document.frmMain.inpGLItemAmount); loadGridList(); + loadGLItemList(); resizeAreaCreateFrom(); //avoid horizontal scrolling when business partner column is displayed in the grid @@ -616,7 +641,7 @@ <input type="hidden" name="inpissotrx" value="" id="fieldIsSoTrx"/> <input type="hidden" name="isFirstLoad" value="true"/> <input type="hidden" name="isInGLItemMode" value="N"/> - <input type="hidden" name="inpGLItems" value=""/> + <input type="hidden" name="inpGLItems" id="paramGLItems" value=""/> <input type="hidden" name="inpDeleteGLItem" value=""/> <input type="hidden" id="paramGeneratedCredit" name="inpGeneratedCredit" value="0"/> <input type="hidden" name="strElement_BP" id="paramStrElement_BP" value=""/> @@ -1160,14 +1185,14 @@ <td colspan="6"> <table class="FieldGroup" cellspacing="0" cellpadding="0" border="0"> <tbody> - <tr class="FieldGroup_TopMargin"/> + <tr class="FieldGroup_TopMargin"></tr> <tr> <td class="FieldGroupTitle_Left"><img class="FieldGroupTitle_Left_bg" border="0" src="../../../../../web/images/blank.gif"/></td> <td class="FieldGroupTitle">Accounting Dimensions</td> <td class="FieldGroupTitle_Right"><img class="FieldGroupTitle_Right_bg" border="0" src="../../../../../web/images/blank.gif"/></td> - <td class="FieldGroupContent"/> + <td class="FieldGroupContent"></td> </tr> - <tr class="FieldGroup_BottomMargin"/> + <tr class="FieldGroup_BottomMargin"></tr> </tbody> </table> </td> diff -r 2b5a9e3d2afd -r 8837bc9da36d modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java Mon Jun 11 10:13:27 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java Wed Jun 13 09:48:05 2012 +0200 @@ -23,6 +23,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -58,7 +59,9 @@ import org.openbravo.model.common.enterprise.Organization; import org.openbravo.model.common.plm.Product; import org.openbravo.model.financialmgmt.gl.GLItem; +import org.openbravo.model.financialmgmt.payment.FIN_OrigPaymentScheduleDetail; import org.openbravo.model.financialmgmt.payment.FIN_Payment; +import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetail; import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail; import org.openbravo.model.marketing.Campaign; import org.openbravo.model.materialmgmt.cost.ABCActivity; @@ -150,11 +153,16 @@ vars, strSelectedScheduledPaymentDetailIds); FIN_Payment payment = dao.getObject(FIN_Payment.class, strPaymentId); + // Remove edited lines which are not in final selection and adjust outstanding amount for + // documents + removeNonSelectedDetails(payment, selectedPaymentDetails); BigDecimal newPaymentAmount = new BigDecimal(strPaymentAmount); if (newPaymentAmount.compareTo(payment.getAmount()) != 0) { payment.setAmount(newPaymentAmount); + OBDal.getInstance().save(payment); } - + // load object in memory + payment.getFINPaymentDetailList(); if (addedGLITemsArray != null) { for (int i = 0; i < addedGLITemsArray.length(); i++) { JSONObject glItem = addedGLITemsArray.getJSONObject(i); @@ -168,7 +176,6 @@ } final String strGLItemId = glItem.getString("glitemId"); checkID(strGLItemId); - // Accounting Dimensions final String strElement_BP = glItem.getString("cBpartnerDim"); checkID(strElement_BP); @@ -201,9 +208,10 @@ } FIN_AddPayment.setFinancialTransactionAmountAndRate(payment, exchangeRate, convertedAmount); payment = FIN_AddPayment.savePayment(payment, isReceipt, null, null, null, null, null, - null, null, null, null, selectedPaymentDetails, selectedPaymentDetailAmounts, - strDifferenceAction.equals("writeoff"), strDifferenceAction.equals("refund"), - dao.getObject(Currency.class, paymentCurrencyId), exchangeRate, convertedAmount); + strPaymentAmount, null, null, null, selectedPaymentDetails, + selectedPaymentDetailAmounts, strDifferenceAction.equals("writeoff"), + strDifferenceAction.equals("refund"), dao.getObject(Currency.class, paymentCurrencyId), + exchangeRate, convertedAmount); if (strAction.equals("PRP") || strAction.equals("PPP") || strAction.equals("PRD") || strAction.equals("PPW")) { @@ -249,6 +257,7 @@ } bdErrorGeneralPopUp(request, response, "Error", strMessage); OBDal.getInstance().rollbackAndClose(); + log4j.error("AddOrderOrInvoice - SAVE AND PROCESS", ex); return; } finally { @@ -261,6 +270,70 @@ } + /* + * Removes lines and schedule details which are not included in the given selected list + */ + private void removeNonSelectedDetails(FIN_Payment payment, + List<FIN_PaymentScheduleDetail> selectedPaymentDetails) { + Set<String> toRemovePDs = new HashSet<String>(); + for (FIN_PaymentDetail pd : payment.getFINPaymentDetailList()) { + + for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) { ------------------------------------------------------------------------------ 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
