details: https://code.openbravo.com/erp/devel/pi/rev/886177e54298 changeset: 16641:886177e54298 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu May 17 10:12:41 2012 +0200 summary: [demand] Implemented ant task to allow admins to activate instance from console
details: https://code.openbravo.com/erp/devel/pi/rev/9f90a57bdd42 changeset: 16642:9f90a57bdd42 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu May 17 13:15:30 2012 +0200 summary: [demand] Reload AK if it was updated using ant details: https://code.openbravo.com/erp/devel/pi/rev/d2b867c95baa changeset: 16643:d2b867c95baa user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri May 18 09:39:59 2012 +0200 summary: [demand] Implemented prevention of multiple sessions for same user details: https://code.openbravo.com/erp/devel/pi/rev/77979f3f3dc3 changeset: 16644:77979f3f3dc3 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri May 18 11:35:36 2012 +0200 summary: [demand] Implemented on Demand License -On demand licenses cannot have concurrent session of same user -This can also be set for other licenses details: https://code.openbravo.com/erp/devel/pi/rev/9a5071c3bbec changeset: 16645:9a5071c3bbec user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 21 08:34:23 2012 +0200 summary: [demand] Limit 2 concurrent users when off platform details: https://code.openbravo.com/erp/devel/pi/rev/7e43dec1b3b2 changeset: 16646:7e43dec1b3b2 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 21 12:37:20 2012 +0200 summary: [demand] Managing off platform usage details: https://code.openbravo.com/erp/devel/pi/rev/47f8485b5126 changeset: 16647:47f8485b5126 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 21 16:26:25 2012 +0200 summary: [demand] proper redirect on error details: https://code.openbravo.com/erp/devel/pi/rev/d208a80ddea3 changeset: 16648:d208a80ddea3 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 21 16:28:10 2012 +0200 summary: [demand] Show messagin in login window if off platform details: https://code.openbravo.com/erp/devel/pi/rev/18fe2549adfa changeset: 16649:18fe2549adfa user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon May 21 16:38:52 2012 +0200 summary: [demand] Updated year in licenses details: https://code.openbravo.com/erp/devel/pi/rev/e695e7c45c43 changeset: 16650:e695e7c45c43 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue May 22 10:20:27 2012 +0200 summary: [demand] Proper check of concurrent users + named users details: https://code.openbravo.com/erp/devel/pi/rev/c636040cf571 changeset: 16651:c636040cf571 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue May 22 15:02:58 2012 +0200 summary: [demand] Added missing val rule details: https://code.openbravo.com/erp/devel/pi/rev/bf4e8307038b changeset: 16652:bf4e8307038b user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue May 22 15:03:47 2012 +0200 summary: [demand] Added missing messages details: https://code.openbravo.com/erp/devel/pi/rev/971221eb3540 changeset: 16653:971221eb3540 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu May 24 08:54:18 2012 +0200 summary: [demand] Invalidate session on concurrent named users details: https://code.openbravo.com/erp/devel/pi/rev/69cb97f93332 changeset: 16654:69cb97f93332 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu May 24 10:09:11 2012 +0200 summary: [demand] qry for onDemand server details: https://code.openbravo.com/erp/devel/pi/rev/911b73b1283d changeset: 16655:911b73b1283d user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu May 24 10:10:14 2012 +0200 summary: [demand] Don't close twice details: https://code.openbravo.com/erp/devel/pi/rev/ca5d4c6c84b5 changeset: 16656:ca5d4c6c84b5 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri May 25 10:51:13 2012 +0200 summary: [demand] Improved messages details: https://code.openbravo.com/erp/devel/pi/rev/4b8e89dd6675 changeset: 16657:4b8e89dd6675 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri May 25 15:11:45 2012 +0200 summary: Merged new On Demand license type details: https://code.openbravo.com/erp/devel/pi/rev/5c264d6210c1 changeset: 16658:5c264d6210c1 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri May 25 15:12:48 2012 +0200 summary: merge diffstat: .hgsigs | 2 + .hgtags | 2 + build.xml | 19 +- config/Openbravo.properties.template | 7 +- 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/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html | 33 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt | 2 +- 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_MESSAGE.xml | 11 + 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.application/src/org/openbravo/client/application/HeartBeatPopupActionHandler.java | 4 + modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl | 12 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js | 2 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 23 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 4 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 175 ++-- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-rtl-styles.css | 1 + 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/reference/DateUIDefinition.java | 9 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java | 12 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl | 1 + 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.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped_data.xsql | 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 | 8 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js | 87 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_History.js | 6 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/skin_styles.css | 356 ++++++--- 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 | 18 +- src-db/database/model/functions/C_COMMISSION_PROCESS.xml | 16 +- src-db/database/model/triggers/C_INVOICETAX_TRG2.xml | 4 - src-db/database/model/triggers/C_PROJECTPHASE_TRG.xml | 12 +- src-db/database/model/triggers/C_PROJECT_TRG.xml | 18 +- src-db/database/model/triggers/M_INOUTLINE_TRG.xml | 10 + src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml | 2 +- src-db/database/sourcedata/AD_MESSAGE.xml | 77 ++ src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_REF_LIST.xml | 24 + src-db/database/sourcedata/AD_VAL_RULE.xml | 11 + src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 5 +- src/org/openbravo/base/secureApp/LoginHandler.java | 36 +- src/org/openbravo/base/session/OBPropertiesProvider.java | 21 +- src/org/openbravo/common/actionhandler/RMInOutPickEditLines.java | 6 +- src/org/openbravo/common/actionhandler/RMShipmentPickEditLines.java | 6 +- src/org/openbravo/common/actionhandler/SRMOPickEditLines.java | 9 +- src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.java | 29 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 5 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java | 17 +- src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java | 6 +- src/org/openbravo/erpCommon/ad_forms/Role.java | 5 +- src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 8 +- src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcel_data.xsql | 10 +- src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitability_data.xsql | 6 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 321 +++++++- src/org/openbravo/erpCommon/obps/ActivationTask.java | 150 ++++ src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java | 8 +- src/org/openbravo/erpCommon/obps/DisabledModules.java | 4 +- src/org/openbravo/erpCommon/security/Login.html | 23 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 2 +- 95 files changed, 1316 insertions(+), 483 deletions(-) diffs (truncated from 4481 to 300 lines): diff -r 9715e0922173 -r 5c264d6210c1 .hgsigs --- a/.hgsigs Tue May 22 14:14:35 2012 +0200 +++ b/.hgsigs Fri May 25 15:12:48 2012 +0200 @@ -61,6 +61,7 @@ f7c288af065f5425b20bd8bbef645df237282d4c 0 iEYEABECAAYFAk87pWEACgkQCX/oGf+2qkM1cgCg5Cp8jLM2gcEh+e+4QiJSJanE6J4An1iZUE2/OlrA8jLt9SQCs6/efCNq 4f5fd4acb98e5fb7ef587debb5ffd20487e2bb32 0 iEYEABECAAYFAk9CRa4ACgkQCX/oGf+2qkPC4ACeJ5HQ20QAW0ULMU/+SUGJvz9YNEYAoJwLMrqwWkt3GuJFyp7TwpULPeKu cab708e2de98b574cc10f344845b7dff184080b6 0 iEYEABECAAYFAk9Pi+oACgkQCX/oGf+2qkP4kwCfT5nGx/E4gn7sZh+d7L5/9JpcplwAoJ5C4WwVNpNaO+tNEx8oMlqdu8mc +d43b1a2305e3ff6f308b329faa5692002b02afa7 0 iEYEABECAAYFAk+7NKsACgkQCX/oGf+2qkNZcwCg+fFWPtrKJ5ioNyiFuo/ueyydZEYAoOXHGh6h3dVnLByWnDUQCTOUZp5b b7b91ddca1a3817cff372c077cf8445c54bcc96a 0 iEYEABECAAYFAk+j4O4ACgkQCX/oGf+2qkPfowCePjPiaz1QWjCS55j1cOfFBLoQ2fwAoPfE0pPbRpBt6osM4vUAmJn9AGVH f4d0cceea00d21e244c7d6e5ddf3aa78e8610660 0 iEYEABECAAYFAk952D8ACgkQCX/oGf+2qkPmMACgo6qZwLG5GJcVYFhZqD2ASYXiEcAAn3Sis7yogN+qwyb1BokA+KSnEmjZ 3565692a3ec1a33a8cb71014aa7fa0e4488a47b3 0 iEYEABECAAYFAk+OsrsACgkQCX/oGf+2qkM/yQCfUNjwjTN32jfek9UBwpNfxq1IqigAnA2Aq5NLUsUtDCw9DmJ5kjx6U26t @@ -69,3 +70,4 @@ ec66c54fad7f8821269266cd7de52b09a423cdae 0 iEYEABECAAYFAk99aVgACgkQCX/oGf+2qkOiDwCg+Ne5Dp5L0X34APNzA7rBeCmZVsQAoJ5AU9K9+Dhn7iuBHVyTisbUJ/oC 17bc2224a41a30d10472bd14581378201c1ca44b 0 iEYEABECAAYFAk+IHlMACgkQCX/oGf+2qkM3MACgoR2lLVuhzaAg2v0PAHTOsvCgEIoAoP5uBTyNv/CqYuf+XIwD6F9nxa+y 80da674a77f9339af5985c3ca3aa7fb7f817a114 0 iEYEABECAAYFAk+qnzoACgkQCX/oGf+2qkPyuQCfaHkf4c4QgZar7nuCzp84iUkxWPsAoOQyyXYJaWZwwbjUBzoPNbRIBLLE +358b14e92651ccf4e020a1420bd0b25b662f35ba 0 iEYEABECAAYFAk+0CeUACgkQCX/oGf+2qkMSIQCg8m8XwFqk/oFw5Cq1odJNq3ZiHIEAn2MHDVw5hRV7eD+c/zNOnQnAnp1n diff -r 9715e0922173 -r 5c264d6210c1 .hgtags --- a/.hgtags Tue May 22 14:14:35 2012 +0200 +++ b/.hgtags Fri May 25 15:12:48 2012 +0200 @@ -77,6 +77,8 @@ 952c381e3ada4a4e3511782945d3aa66e09a697e 3.0MP9 fb8d27aba52ce894846d0561c08aced707d99069 3.0MP9.1 5f9198ef9b16258149c3de30d5811e9c9d50cbf6 3.0MP9.2 +d9a8fbfa1c964ee8c1c951302f9be3d50966c656 3.0MP9.3 00280ab1ed3ab01d41ed048ccd01694af1223341 3.0MP10 4a4cc349c6babb0d72149613cc3e4988427ee0ff 3.0MP10.1 35a1ec14c74d970e083b2d195ea2eed784d5ac1c 3.0MP10.2 +f96fd5be357082854f418944e69fb406ae0dcda6 3.0MP11 diff -r 9715e0922173 -r 5c264d6210c1 build.xml --- a/build.xml Tue May 22 14:14:35 2012 +0200 +++ b/build.xml Fri May 25 15:12:48 2012 +0200 @@ -1140,6 +1140,23 @@ <ant dir="${base.src.core}" target="clean" inheritAll="true" inheritRefs="true" /> <ant dir="${base.src.trl}" target="clean" inheritAll="true" inheritRefs="true" /> <ant dir="${base.src.wad}" target="clean" inheritAll="true" inheritRefs="true" /> - </target> + </target> + + <target name="activate.instance" depends="init" + description="Activates the instance with the provided public key"> + <taskdef name="activateInstace" classname="org.openbravo.erpCommon.obps.ActivationTask"> + <classpath refid="project.class.path" /> + </taskdef> + <property name="purpose" value="" /> + <property name="publicKey" value="" /> + <property name="publicKeyFile" value="" /> + + <activateInstace purpose="${purpose}" + publicKey="${publicKey}" + publicKeyFile="${publicKeyFile}" + userId="0" + adminMode="true" + propertiesFile="${base.config}/Openbravo.properties"/> + </target> </project> diff -r 9715e0922173 -r 5c264d6210c1 config/Openbravo.properties.template --- a/config/Openbravo.properties.template Tue May 22 14:14:35 2012 +0200 +++ b/config/Openbravo.properties.template Fri May 25 15:12:48 2012 +0200 @@ -10,7 +10,7 @@ # * under the License. # * The Original Code is Openbravo ERP. # * The Initial Developer of the Original Code is Openbravo SLU -# * All portions are Copyright (C) 2007-2010 Openbravo SLU +# * All portions are Copyright (C) 2007-2012 Openbravo SLU # * All Rights Reserved. # * Contributor(s): ______________________________________. # ************************************************************************ @@ -184,6 +184,9 @@ login.trial.delay.max=0 login.trial.user.lock=0 +# Prevents concurrent sessions for same user. +login.limit.user.session=false + ########## # Others # ########## @@ -195,4 +198,4 @@ # Specifies if the current instance is used for automated tests. # Setting this to true will enable extra (hidden) functionality used # automated test scripts. -test.environment=false \ No newline at end of file +test.environment=false diff -r 9715e0922173 -r 5c264d6210c1 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue May 22 14:14:35 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri May 25 15:12:48 2012 +0200 @@ -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.16249]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.16636]]></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 9715e0922173 -r 5c264d6210c1 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 Tue May 22 14:14:35 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri May 25 15:12:48 2012 +0200 @@ -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.16249]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.16636]]></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.16249]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.16636]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 9715e0922173 -r 5c264d6210c1 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html Tue May 22 14:14:35 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html Fri May 25 15:12:48 2012 +0200 @@ -52,6 +52,8 @@ var sc_JsDateFormat = null; </script> <script language="JavaScript" type="text/javascript"> +var APRMMatchStatementIds; +var matchingTransaction; function transactionFind(selected) { var depositAmt = returnCalcToFormatted(selected.depositAmount, globalMaskNumeric, globalDecSeparator, globalGroupSeparator, globalGroupInterval); var paymentAmt = returnCalcToFormatted(selected.paymentAmount, globalMaskNumeric, globalDecSeparator, globalGroupSeparator, globalGroupInterval); @@ -81,6 +83,7 @@ } function openSelector(bslId) { + document.frmMain.buttonProcess.disabled = false; document.frmMain.inpFinBankStatementLineId.value = bslId; if(bslId) { sc_FIN_FinAcc_Transaction_ID.bslId = bslId; @@ -103,6 +106,9 @@ function unMatchLine(bankStatementLineId, isChecked) { if (!isChecked) { + matchingTransaction = true ; + document.frmMain.buttonProcess.disabled = true; + APRMMatchStatementIds[bankStatementLineId]=false; document.frmMain.inpFinBankStatementLineId.value = bankStatementLineId; document.getElementById("inpMatchedDocument_" + bankStatementLineId).innerHTML = ""; document.getElementById("inpTransactionDate_" + bankStatementLineId).innerHTML = ""; @@ -114,6 +120,10 @@ document.getElementById("inpMatchingType_" + bankStatementLineId).value = ""; sendActionToServer("UNMATCH"); } + else { + APRMMatchStatementIds[bankStatementLineId]=true; + document.frmMain.buttonProcess.disabled = false; + } return true; } </script> @@ -123,6 +133,7 @@ return true; } function submitThisPage(strCommand) { + APRMMatchStatementIds = null; if (validate(strCommand)) { submitCommandForm(strCommand, false, null, 'MatchTransaction.html', '_self'); return true; @@ -130,6 +141,7 @@ return true; } function openAddTransaction(bankStatementLineId){ + document.frmMain.buttonProcess.disabled = false; document.frmMain.inpFinBankStatementLineId.value = bankStatementLineId; openServletNewWindow('DEFAULT', false, '../org.openbravo.advpaymentmngt.ad_actionbutton/AddTransaction.html', 'ADDTRANSACTION', '2EED9BC16DB34D2B80BA40A21564BECF', false,600, 900, null, null, false, true, true); return true; @@ -179,6 +191,17 @@ }else{ initialize_MessageBox('messageBoxID'); } + for (var i in APRMMatchStatementIds) { + if(data.grid.indexOf('inpCheckBox_'+i)){ + if (document.getElementById('inpCheckBox_'+i).checked !== true){ + document.getElementById('inpCheckBox_'+i).checked=APRMMatchStatementIds[i]; + } + } + } + if (matchingTransaction === true){ + matchingTransaction = false; + document.frmMain.buttonProcess.disabled = false; + } showWarning(); } else { document.getElementById('sectionGrid').innerHTML = ''; @@ -213,6 +236,12 @@ if (data.forceLoadGrid) { loadGrid(); } + else{ + if (matchingTransaction === true){ + matchingTransaction = false; + document.frmMain.buttonProcess.disabled = false; + } + } } } catch (e) { } @@ -256,6 +285,8 @@ } else initialize_MessageBox('messageBoxID'); } function onLoadDo(){ + matchingTransaction = false; + APRMMatchStatementIds = new Object(); this.windowTables = new Array( new windowTableId('client_top_popup', 'buttonProcess'), new windowTableId('client_middle', 'buttonProcess'), @@ -647,4 +678,4 @@ </table> </form> </body> -</html> \ No newline at end of file +</html> diff -r 9715e0922173 -r 5c264d6210c1 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java Tue May 22 14:14:35 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java Fri May 25 15:12:48 2012 +0200 @@ -1160,9 +1160,8 @@ FIN_BankStatementLine.class); obc.add(Restrictions.eq(FIN_BankStatementLine.PROPERTY_BANKSTATEMENT, bsline.getBankStatement())); obc.add(Restrictions.eq(FIN_BankStatementLine.PROPERTY_LINENO, bsline.getLineNo())); - obc.add(Restrictions.isNull(FIN_BankStatementLine.PROPERTY_FINANCIALACCOUNTTRANSACTION)); - return (obc.list().size() > 0); + return (obc.list().size() > 1); } /** diff -r 9715e0922173 -r 5c264d6210c1 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt Tue May 22 14:14:35 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt Fri May 25 15:12:48 2012 +0200 @@ -29,7 +29,7 @@ <td class="DataGrid_Body_LineNoCell" style="background-color: xx; text-align: center;" id="inpMatchStyle_xx" name="inpMatchStyle_xx"> <a href="#" onClick="openSelector('xx');" id="fieldFindLink"><img src="../../../../../web/org.openbravo.advpaymentmngt/images/view.png" style="border-style: none"/></a> <!--span> </span--> - <input id="inpCheckBox_xx" type="checkbox" name="inpBankStatementLineId" value="" onclick="unMatchLine('xx', this.checked);"/> + <input id="inpCheckBox_xx" type="checkbox" name="inpBankStatementLineId" value="" onclick="(matchingTransaction === false) ? unMatchLine('xx', this.checked):matchingTransaction = true ; "/> <input type="hidden" name="inpFinancialTransactionId_xx" id="inpFinancialTransactionId_xx" value=""></input> <input type="hidden" name="inpMatchingType_xx" id="inpMatchingType_xx" value=""></input> <!--span> </span--> diff -r 9715e0922173 -r 5c264d6210c1 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 Tue May 22 14:14:35 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Fri May 25 15:12:48 2012 +0200 @@ -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.16249]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.16636]]></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 9715e0922173 -r 5c264d6210c1 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 Tue May 22 14:14:35 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri May 25 15:12:48 2012 +0200 @@ -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.16249]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.16636]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 9715e0922173 -r 5c264d6210c1 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Tue May 22 14:14:35 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Fri May 25 15:12:48 2012 +0200 @@ -619,6 +619,17 @@ <!--9EFEA3F8412B4F5C836DFB40034156EA--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--9EFEA3F8412B4F5C836DFB40034156EA--></AD_MESSAGE> +<!--A0B273389C804A118EF44AD4E8D97515--><AD_MESSAGE> +<!--A0B273389C804A118EF44AD4E8D97515--> <AD_MESSAGE_ID><![CDATA[A0B273389C804A118EF44AD4E8D97515]]></AD_MESSAGE_ID> +<!--A0B273389C804A118EF44AD4E8D97515--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A0B273389C804A118EF44AD4E8D97515--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A0B273389C804A118EF44AD4E8D97515--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A0B273389C804A118EF44AD4E8D97515--> <VALUE><![CDATA[OBUIAPP_InstanceActivation]]></VALUE> +<!--A0B273389C804A118EF44AD4E8D97515--> <MSGTEXT><![CDATA[Instance Activation]]></MSGTEXT> +<!--A0B273389C804A118EF44AD4E8D97515--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--A0B273389C804A118EF44AD4E8D97515--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--A0B273389C804A118EF44AD4E8D97515--></AD_MESSAGE> + <!--A57B3DD733264DB1BB3D6F84EA104931--><AD_MESSAGE> <!--A57B3DD733264DB1BB3D6F84EA104931--> <AD_MESSAGE_ID><![CDATA[A57B3DD733264DB1BB3D6F84EA104931]]></AD_MESSAGE_ID> <!--A57B3DD733264DB1BB3D6F84EA104931--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 9715e0922173 -r 5c264d6210c1 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 Tue May 22 14:14:35 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Fri May 25 15:12:48 2012 +0200 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface Application]]></NAME> ------------------------------------------------------------------------------ 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
