details: https://code.openbravo.com/erp/devel/pi/rev/1a32963110b9 changeset: 16721:1a32963110b9 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Mon May 28 12:15:41 2012 +0200 summary: [OrphanRMA]Modify P&E to allow editing records not related to a shipment.
details: https://code.openbravo.com/erp/devel/pi/rev/5f2f8cfff590 changeset: 16722:5f2f8cfff590 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Tue May 29 12:03:21 2012 +0200 summary: Fixed issue 20629.Filter by readable clients instead of current client. details: https://code.openbravo.com/erp/devel/pi/rev/d674eb0e81dd changeset: 16723:d674eb0e81dd user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Wed May 30 15:46:09 2012 +0200 summary: Fixed issue 20633.Add insert orphan line process in RFC. details: https://code.openbravo.com/erp/devel/pi/rev/fe3f4c2a8a74 changeset: 16724:fe3f4c2a8a74 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Wed May 30 16:09:19 2012 +0200 summary: Merge with latest pi details: https://code.openbravo.com/erp/devel/pi/rev/cd4d7012f8c8 changeset: 16725:cd4d7012f8c8 user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Thu May 31 18:15:32 2012 +0200 summary: [OrphanRM]Fixed issue not getting tax. details: https://code.openbravo.com/erp/devel/pi/rev/66f1b36f7b4d changeset: 16726:66f1b36f7b4d user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com> date: Thu May 31 18:25:48 2012 +0200 summary: Merge pi-orphanrma branch. diffstat: .hgsigs | 3 + .hgtags | 3 + build.xml | 34 +- config/Openbravo.properties.template | 7 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/tables/APRM_PENDING_PAYMENTINVOICE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 11 + 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 | 63 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java | 41 +- 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/src/org/openbravo/client/application/window/FormInitializationComponent.java | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-yesno.js | 10 + 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/grid/ob-grid.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 11 +- 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/personalization/ob-personalization-treegrid.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js | 6 +- 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 | 7 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java | 10 - 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.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 17 +- 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.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java | 4 +- 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 | 4 +- 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 | 145 +- 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/load_skin.js | 22 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/skin_styles.css | 1422 ++++----- 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 +- referencedata/sampledata/F_B_International_Group.xml | 1308 ++++---- src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/tables/C_ORDER.xml | 4 + src-db/database/model/triggers/C_INVOICETAX_TRG2.xml | 23 +- src-db/database/model/triggers/C_PROJECT_TRG3.xml | 13 +- src-db/database/model/triggers/M_INOUTLINE_TRG.xml | 10 +- src-db/database/model/views/C_RM_ORDER_PICK_EDIT_LINES.xml | 8 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 22 + src-db/database/sourcedata/AD_COLUMN.xml | 115 +- src-db/database/sourcedata/AD_ELEMENT.xml | 12 + src-db/database/sourcedata/AD_FIELD.xml | 87 +- src-db/database/sourcedata/AD_MESSAGE.xml | 151 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 + src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_PROCESS.xml | 21 + src-db/database/sourcedata/AD_PROCESS_PARA.xml | 115 + src-db/database/sourcedata/AD_REFERENCE.xml | 25 + src-db/database/sourcedata/AD_REF_LIST.xml | 35 + src-db/database/sourcedata/AD_REF_SEARCH.xml | 10 + src-db/database/sourcedata/AD_TAB.xml | 2 +- src-db/database/sourcedata/AD_TABLE.xml | 1 + src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 22 + src-db/database/sourcedata/AD_VAL_RULE.xml | 11 + src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml | 10 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 56 +- src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 419 ++- 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/SRMOPickEditLines.java | 53 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java | 67 + src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 2 +- src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct.java | 7 +- src/org/openbravo/erpCommon/ad_actionButton/RMInsertOrphanLine.java | 236 + src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java | 61 +- src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java | 40 +- src/org/openbravo/erpCommon/ad_callouts/SE_Project_BPartner.java | 28 +- src/org/openbravo/erpCommon/ad_callouts/SE_Proposal_BPartner.java | 29 +- src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java | 32 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 136 +- src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.html | 15 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java | 17 +- src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java | 6 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 89 + src/org/openbravo/erpCommon/ad_forms/ModuleManagement_LocalChanges.html | 154 + src/org/openbravo/erpCommon/ad_forms/ModuleManagement_LocalChanges.xml | 27 + src/org/openbravo/erpCommon/ad_forms/Role.java | 5 +- src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 8 +- src/org/openbravo/erpCommon/businessUtility/InitialOrgSetup.java | 38 +- src/org/openbravo/erpCommon/info/AttributeSetInstance.java | 7 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 327 +- 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/OBMessageUtils.java | 15 + 127 files changed, 4140 insertions(+), 2047 deletions(-) diffs (truncated from 11066 to 300 lines): diff -r af4557ab55b2 -r 66f1b36f7b4d .hgsigs --- a/.hgsigs Thu May 24 18:00:18 2012 +0200 +++ b/.hgsigs Thu May 31 18:25: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,5 @@ ec66c54fad7f8821269266cd7de52b09a423cdae 0 iEYEABECAAYFAk99aVgACgkQCX/oGf+2qkOiDwCg+Ne5Dp5L0X34APNzA7rBeCmZVsQAoJ5AU9K9+Dhn7iuBHVyTisbUJ/oC 17bc2224a41a30d10472bd14581378201c1ca44b 0 iEYEABECAAYFAk+IHlMACgkQCX/oGf+2qkM3MACgoR2lLVuhzaAg2v0PAHTOsvCgEIoAoP5uBTyNv/CqYuf+XIwD6F9nxa+y 80da674a77f9339af5985c3ca3aa7fb7f817a114 0 iEYEABECAAYFAk+qnzoACgkQCX/oGf+2qkPyuQCfaHkf4c4QgZar7nuCzp84iUkxWPsAoOQyyXYJaWZwwbjUBzoPNbRIBLLE +a34b12cbb8a43db069a8ea2caab186b90ab2b8b5 0 iEYEABECAAYFAk++B4UACgkQCX/oGf+2qkNwWQCg2FdpFCBmDEU/VvuZskSHu1WB7A0AoNL6MUMZcwO8Uy37kn1kfliFCFyF +358b14e92651ccf4e020a1420bd0b25b662f35ba 0 iEYEABECAAYFAk+0CeUACgkQCX/oGf+2qkMSIQCg8m8XwFqk/oFw5Cq1odJNq3ZiHIEAn2MHDVw5hRV7eD+c/zNOnQnAnp1n diff -r af4557ab55b2 -r 66f1b36f7b4d .hgtags --- a/.hgtags Thu May 24 18:00:18 2012 +0200 +++ b/.hgtags Thu May 31 18:25:48 2012 +0200 @@ -77,6 +77,9 @@ 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 +40c4dd7ff48945d073007753a5f296207c0c0f22 3.0MP10.3 +f96fd5be357082854f418944e69fb406ae0dcda6 3.0MP11 diff -r af4557ab55b2 -r 66f1b36f7b4d build.xml --- a/build.xml Thu May 24 18:00:18 2012 +0200 +++ b/build.xml Thu May 31 18:25:48 2012 +0200 @@ -325,6 +325,19 @@ </sequential> </macrodef> + <macrodef name="updatesystemstatuswhennot"> + <attribute name="v" default="NOT SET"/> + <attribute name="previous" default="NOT SET"/> + <sequential> + <sql driver="${bbdd.driver}" url="${bbdd.owner.url}" userid="${bbdd.user}" password="${bbdd.password}" onerror="continue" autocommit="true"> + <classpath> <fileset dir="${base.lib}"> <include name="**/*.jar"> </include> </fileset> </classpath> + <transaction> UPDATE ad_system_info SET system_status='@{v}' where system_status!='@{previous}' ; + DELETE FROM ad_error_log where system_status=(select system_status from ad_system_info) + </transaction> + </sql> + </sequential> + </macrodef> + <taskdef resource="axis-tasks.properties" classpathref="project.class.path" /> <target name="init" depends="code.rev"> @@ -383,7 +396,7 @@ <ant dir="${base.db}" target="setApplied" inheritAll="true" inheritRefs="true" /> <antcall target="build.deploy" /> - <updatesystemstatus v="RB51"/> + <updatesystemstatuswhennot v="RB51" previous="RB12"/> <!-- only restart tomcat if the restart prop was set to true --> <condition property="dorestart"> <istrue value="${restart}" /> @@ -1140,6 +1153,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 af4557ab55b2 -r 66f1b36f7b4d config/Openbravo.properties.template --- a/config/Openbravo.properties.template Thu May 24 18:00:18 2012 +0200 +++ b/config/Openbravo.properties.template Thu May 31 18:25: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 af4557ab55b2 -r 66f1b36f7b4d modules/org.openbravo.advpaymentmngt/src-db/database/model/tables/APRM_PENDING_PAYMENTINVOICE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/tables/APRM_PENDING_PAYMENTINVOICE.xml Thu May 24 18:00:18 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/tables/APRM_PENDING_PAYMENTINVOICE.xml Thu May 31 18:25:48 2012 +0200 @@ -61,7 +61,7 @@ <foreign-key foreignTable="AD_ORG" name="APRM_PENDING_PAYINV_ORG"> <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/> </foreign-key> - <foreign-key foreignTable="FIN_PAYMENT" name="APRM_PENDING_PAYINV_PAYMENT"> + <foreign-key foreignTable="FIN_PAYMENT" name="APRM_PENDING_PAYINV_PAYMENT" onDelete="cascade"> <reference local="FIN_PAYMENT_ID" foreign="FIN_PAYMENT_ID"/> </foreign-key> <check name="APRM_PENDINGPAYINV_ACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check> diff -r af4557ab55b2 -r 66f1b36f7b4d modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Thu May 24 18:00:18 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Thu May 31 18:25:48 2012 +0200 @@ -485,6 +485,17 @@ <!--8A4E2745545245ED81BFBC5324648833--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--8A4E2745545245ED81BFBC5324648833--></AD_MESSAGE> +<!--8E01FDCFBE034863898A47F1AE37BB15--><AD_MESSAGE> +<!--8E01FDCFBE034863898A47F1AE37BB15--> <AD_MESSAGE_ID><![CDATA[8E01FDCFBE034863898A47F1AE37BB15]]></AD_MESSAGE_ID> +<!--8E01FDCFBE034863898A47F1AE37BB15--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--8E01FDCFBE034863898A47F1AE37BB15--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--8E01FDCFBE034863898A47F1AE37BB15--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--8E01FDCFBE034863898A47F1AE37BB15--> <VALUE><![CDATA[APRM_ZeroAmountNotInserted]]></VALUE> +<!--8E01FDCFBE034863898A47F1AE37BB15--> <MSGTEXT><![CDATA[%s row/s inserted.<br/>%s row/s not inserted because credit and debit amount were 0.]]></MSGTEXT> +<!--8E01FDCFBE034863898A47F1AE37BB15--> <MSGTYPE><![CDATA[S]]></MSGTYPE> +<!--8E01FDCFBE034863898A47F1AE37BB15--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--8E01FDCFBE034863898A47F1AE37BB15--></AD_MESSAGE> + <!--92EC1935A8B947BA83EF82DBD169CA8B--><AD_MESSAGE> <!--92EC1935A8B947BA83EF82DBD169CA8B--> <AD_MESSAGE_ID><![CDATA[92EC1935A8B947BA83EF82DBD169CA8B]]></AD_MESSAGE_ID> <!--92EC1935A8B947BA83EF82DBD169CA8B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r af4557ab55b2 -r 66f1b36f7b4d modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu May 24 18:00:18 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu May 31 18:25: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.16699]]></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 af4557ab55b2 -r 66f1b36f7b4d 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 Thu May 24 18:00:18 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu May 31 18:25: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.16699]]></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.16699]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r af4557ab55b2 -r 66f1b36f7b4d 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 Thu May 24 18:00:18 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html Thu May 31 18:25:48 2012 +0200 @@ -53,7 +53,8 @@ </script> <script language="JavaScript" type="text/javascript"> var APRMMatchStatementIds; -var matchingTransaction; +var serverWorking=false; +var checksToEnable=[]; function transactionFind(selected) { var depositAmt = returnCalcToFormatted(selected.depositAmount, globalMaskNumeric, globalDecSeparator, globalGroupSeparator, globalGroupInterval); var paymentAmt = returnCalcToFormatted(selected.paymentAmount, globalMaskNumeric, globalDecSeparator, globalGroupSeparator, globalGroupInterval); @@ -83,7 +84,6 @@ } function openSelector(bslId) { - document.frmMain.buttonProcess.disabled = false; document.frmMain.inpFinBankStatementLineId.value = bslId; if(bslId) { sc_FIN_FinAcc_Transaction_ID.bslId = bslId; @@ -104,10 +104,28 @@ bslId: '' }); +function enableChecks(){ + for(var i=0; i<checksToEnable.length; i++){ + document.getElementById(checksToEnable[i]).disabled=false; + } +} + +function disableChecks(){ + var items = document.frmMain.getElementsByTagName("input"); + checksToEnable = []; + for(var i=0; i<items.length; i++){ + if(items[i].name === 'inpBankStatementLineId'){ + if(items[i].checked){ + items[i].disabled=true; + checksToEnable.push(items[i].id); + } + } + } +} + function unMatchLine(bankStatementLineId, isChecked) { if (!isChecked) { - matchingTransaction = true ; - document.frmMain.buttonProcess.disabled = true; + disableChecks(); APRMMatchStatementIds[bankStatementLineId]=false; document.frmMain.inpFinBankStatementLineId.value = bankStatementLineId; document.getElementById("inpMatchedDocument_" + bankStatementLineId).innerHTML = ""; @@ -122,7 +140,6 @@ } else { APRMMatchStatementIds[bankStatementLineId]=true; - document.frmMain.buttonProcess.disabled = false; } return true; } @@ -133,15 +150,16 @@ return true; } function submitThisPage(strCommand) { - APRMMatchStatementIds = null; - if (validate(strCommand)) { - submitCommandForm(strCommand, false, null, 'MatchTransaction.html', '_self'); + //if server is working the button should be disabled + if(serverWorking == false){ + APRMMatchStatementIds = null; + if (validate(strCommand)) { + submitCommandForm(strCommand, false, null, 'MatchTransaction.html', '_self'); + } return true; } - 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; @@ -152,6 +170,8 @@ try { var url = "../org.openbravo.advpaymentmngt.ad_actionbutton/MatchTransaction.html"; var paramXMLReq = null; + serverWorking = true; + document.frmMain.buttonProcess.disabled = true; return submitXmlHttpRequest(callBackGrid, document.frmMain, "GRID", url, false, null, paramXMLReq); } catch (e) { alert(e); @@ -163,6 +183,8 @@ if (getReadyStateHandler(XMLHttpRequestObj)) { try { if (XMLHttpRequestObj.responseText) { + serverWorking = false; + document.frmMain.buttonProcess.disabled = false; strText = XMLHttpRequestObj.responseText; var data = eval(strText); var grid = data.grid; @@ -198,10 +220,6 @@ } } } - if (matchingTransaction === true){ - matchingTransaction = false; - document.frmMain.buttonProcess.disabled = false; - } showWarning(); } else { document.getElementById('sectionGrid').innerHTML = ''; @@ -220,6 +238,8 @@ try { var url = "../org.openbravo.advpaymentmngt.ad_actionbutton/MatchTransaction.html"; var paramXMLReq = null; + serverWorking = true; + document.frmMain.buttonProcess.disabled = true; return submitXmlHttpRequest(dummyCallBack, document.frmMain, action, url, false, null, paramXMLReq); ------------------------------------------------------------------------------ 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
