details: https://code.openbravo.com/erp/devel/main/rev/468cdf851655 changeset: 20146:468cdf851655 user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Apr 19 12:52:05 2013 +0200 summary: CI: merge back from main
details: https://code.openbravo.com/erp/devel/main/rev/68f4bfe6d0cd changeset: 20147:68f4bfe6d0cd user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Thu Apr 11 13:33:00 2013 +0530 summary: Fixes issue 22565: The behaviour of the "Include Accounting" in ICS window should change details: https://code.openbravo.com/erp/devel/main/rev/9534810b6032 changeset: 20148:9534810b6032 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue Apr 16 10:32:29 2013 +0200 summary: Related to issue 22565 details: https://code.openbravo.com/erp/devel/main/rev/ca3b550183cb changeset: 20149:ca3b550183cb user: David Miguelez <david.miguelez <at> openbravo.com> date: Fri Apr 19 14:10:40 2013 +0200 summary: Fixes Issue 23583. When the C_Invoice_Post Process fails, it returns an error message without doing more actions. details: https://code.openbravo.com/erp/devel/main/rev/3f93afd1a9f2 changeset: 20150:3f93afd1a9f2 user: David Miguelez <david.miguelez <at> openbravo.com> date: Fri Apr 19 14:11:18 2013 +0200 summary: Fixes Issue 23591: It prevents from querying a large list without any filters. details: https://code.openbravo.com/erp/devel/main/rev/1b9a1df0a891 changeset: 20151:1b9a1df0a891 user: David Baz Fayos <david.baz <at> openbravo.com> date: Fri Apr 19 15:55:25 2013 +0200 summary: Fixed issue 23595: 'Copy record' toolbar button now only is available when the record has not been edited details: https://code.openbravo.com/erp/devel/main/rev/b24931f09dcd changeset: 20152:b24931f09dcd user: Documentation Bot <doc <at> openbravo.com> date: Fri Apr 19 14:07:55 2013 +0000 summary: documentation details: https://code.openbravo.com/erp/devel/main/rev/290a173d1040 changeset: 20153:290a173d1040 user: David Baz Fayos <david.baz <at> openbravo.com> date: Fri Apr 19 17:57:21 2013 +0200 summary: Fixed issue 23596: Added 'OB.ToolbarUtils.createCloneButton' function details: https://code.openbravo.com/erp/devel/main/rev/dceedab02219 changeset: 20154:dceedab02219 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Apr 19 18:04:36 2013 +0200 summary: related to issue 23550: enable MenuManager to be used out of a CDI container details: https://code.openbravo.com/erp/devel/main/rev/c09f69635bed changeset: 20155:c09f69635bed user: David Baz Fayos <david.baz <at> openbravo.com> date: Fri Apr 19 18:16:45 2013 +0200 summary: Fixed issue 23597: Added 'overwriteIfExists' capabilities to 'registerButton' function details: https://code.openbravo.com/erp/devel/main/rev/cdaa760eb486 changeset: 20156:cdaa760eb486 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Apr 19 18:21:54 2013 +0200 summary: Fixes issue 23012 details: https://code.openbravo.com/erp/devel/main/rev/9236c5ce39d9 changeset: 20157:9236c5ce39d9 user: Documentation Bot <doc <at> openbravo.com> date: Fri Apr 19 16:43:16 2013 +0000 summary: fixed db consistency details: https://code.openbravo.com/erp/devel/main/rev/61602390f123 changeset: 20158:61602390f123 user: David Baz Fayos <david.baz <at> openbravo.com> date: Fri Apr 19 19:56:02 2013 +0200 summary: Fixed issue 23598: Added 'tabIdsToAvoid' capabilities to 'registerButton' function details: https://code.openbravo.com/erp/devel/main/rev/df60e05286a8 changeset: 20159:df60e05286a8 user: David Baz Fayos <david.baz <at> openbravo.com> date: Fri Apr 19 20:36:08 2013 +0200 summary: Related to issue 23596: proper variable name details: https://code.openbravo.com/erp/devel/main/rev/1a725f0ecbe0 changeset: 20160:1a725f0ecbe0 user: David Baz Fayos <david.baz <at> openbravo.com> date: Fri Apr 19 22:56:51 2013 +0200 summary: Related to issue 23596: added 'requestParams' variable details: https://code.openbravo.com/erp/devel/main/rev/5b4ec31e99fd changeset: 20161:5b4ec31e99fd user: David Baz Fayos <david.baz <at> openbravo.com> date: Sat Apr 20 00:58:48 2013 +0200 summary: Related to issue 23596: added 'tabId' and 'windowId' to 'requestParams details: https://code.openbravo.com/erp/devel/main/rev/0b2c505c3e21 changeset: 20162:0b2c505c3e21 user: David Baz Fayos <david.baz <at> openbravo.com> date: Sat Apr 20 16:00:10 2013 +0200 summary: Fixed issue 23601: Toolbar button sort position definition moved to button definition details: https://code.openbravo.com/erp/devel/main/rev/0d16137a3524 changeset: 20163:0d16137a3524 user: David Baz Fayos <david.baz <at> openbravo.com> date: Sat Apr 20 16:33:07 2013 +0200 summary: Fixed issue 23602: Now 'Right click -> Delete' in grid performs the same action than Toolbar 'Eliminate' button (if exists) details: https://code.openbravo.com/erp/devel/main/rev/c0d4406ef0c0 changeset: 20164:c0d4406ef0c0 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Mon Apr 22 09:53:02 2013 +0530 summary: Fixes Issue 0020587: [Pick&Execute] Mandatory column validation is not working The mandatory columns of pick and execute windows are validated on cellEditEnd event and onSubmit. details: https://code.openbravo.com/erp/devel/main/rev/6f099465923b changeset: 20165:6f099465923b user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Mon Apr 22 11:03:54 2013 +0530 summary: Related to Issue 0020587 : Added missing variable details: https://code.openbravo.com/erp/devel/main/rev/f78aa78542fa changeset: 20166:f78aa78542fa user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Apr 22 16:17:14 2013 +0200 summary: CI: update AD_MODULE to version 20165 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 1 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 17 +- 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 | 24 + 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/MenuManager.java | 9 + modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 17 +- 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/personalization/ob-manage-views-toolbar.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 41 ++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 15 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-clone-order.js | 40 +-- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 137 ++++++++- 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.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.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/sourcedata/AD_MENU.xml | 2 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_PROCESS.xml | 6 +- src-db/database/sourcedata/AD_TAB.xml | 24 +- src/org/openbravo/erpCommon/ad_forms/InitialClientSetup.html | 21 +- src/org/openbravo/erpCommon/businessUtility/InitialClientSetup.java | 30 ++- 60 files changed, 385 insertions(+), 179 deletions(-) diffs (truncated from 1726 to 300 lines): diff -r 872081925d42 -r f78aa78542fa modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Apr 19 12:33:19 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Apr 22 16:17:14 2013 +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.20144]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.20165]]></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 872081925d42 -r f78aa78542fa 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 Fri Apr 19 12:33:19 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Apr 22 16:17:14 2013 +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.20144]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.20165]]></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.20144]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.20165]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 872081925d42 -r f78aa78542fa modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Fri Apr 19 12:33:19 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Mon Apr 22 16:17:14 2013 +0200 @@ -55,7 +55,7 @@ <!--1EA4A3F31A27483A8C6E93176AE912D3--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--1EA4A3F31A27483A8C6E93176AE912D3--> <UIPATTERN><![CDATA[SR]]></UIPATTERN> <!--1EA4A3F31A27483A8C6E93176AE912D3--> <HQLWHERECLAUSE><![CDATA[e.table.id = '30721072789F410E9606D2235CB2A226' and e.recordID = @FIN_Doubtful_Debt.id@]]></HQLWHERECLAUSE> -<!--1EA4A3F31A27483A8C6E93176AE912D3--> <HQLORDERBYCLAUSE><![CDATA[accountingSchema.name, accountingDate, debit desc, credit desc, value]]></HQLORDERBYCLAUSE> +<!--1EA4A3F31A27483A8C6E93176AE912D3--> <HQLORDERBYCLAUSE><![CDATA[accountingSchema.name, accountingDate, abs(debit) desc, credit desc, value]]></HQLORDERBYCLAUSE> <!--1EA4A3F31A27483A8C6E93176AE912D3--> <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS> <!--1EA4A3F31A27483A8C6E93176AE912D3--> <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD> <!--1EA4A3F31A27483A8C6E93176AE912D3--> <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE> diff -r 872081925d42 -r f78aa78542fa modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java Fri Apr 19 12:33:19 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java Mon Apr 22 16:17:14 2013 +0200 @@ -200,6 +200,7 @@ if (strWindowPath.equals("")) strWindowPath = strDefaultServlet; printPageClosePopUp(response, vars, strWindowPath); + return; } } finally { OBContext.restorePreviousMode(); diff -r 872081925d42 -r f78aa78542fa modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java Fri Apr 19 12:33:19 2013 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java Mon Apr 22 16:17:14 2013 +0200 @@ -1813,16 +1813,17 @@ strInvoiceId).getFINPaymentScheduleList(); OBCriteria<FIN_PaymentScheduleDetail> psdCriteria = OBDal.getInstance().createCriteria( FIN_PaymentScheduleDetail.class); - if (!paySchedList.isEmpty()) + if (!paySchedList.isEmpty()) { psdCriteria.add(Restrictions.in(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE, paySchedList)); - for (FIN_PaymentScheduleDetail psd : psdCriteria.list()) { - if (psd.getPaymentDetails() != null) { - FIN_Payment payment = psd.getPaymentDetails().getFinPayment(); - if ("RPAE".equals(payment.getStatus()) - && hasNotDeferredExecutionProcess(payment.getAccount(), payment.getPaymentMethod(), - payment.isReceipt())) - payments.add(payment); + for (FIN_PaymentScheduleDetail psd : psdCriteria.list()) { + if (psd.getPaymentDetails() != null) { + FIN_Payment payment = psd.getPaymentDetails().getFinPayment(); + if ("RPAE".equals(payment.getStatus()) + && hasNotDeferredExecutionProcess(payment.getAccount(), payment.getPaymentMethod(), + payment.isReceipt())) + payments.add(payment); + } } } diff -r 872081925d42 -r f78aa78542fa 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 Fri Apr 19 12:33:19 2013 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Mon Apr 22 16:17:14 2013 +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.20144]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.20165]]></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 872081925d42 -r f78aa78542fa 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 Fri Apr 19 12:33:19 2013 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Apr 22 16:17:14 2013 +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.20144]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.20165]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 872081925d42 -r f78aa78542fa 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 Fri Apr 19 12:33:19 2013 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Mon Apr 22 16:17:14 2013 +0200 @@ -96,6 +96,18 @@ <!--04E5DFD5293748308CF3ED2848CE8AE4--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--04E5DFD5293748308CF3ED2848CE8AE4--></AD_MESSAGE> +<!--050A887278BB4AF0A40D7FBEC4BFED0D--><AD_MESSAGE> +<!--050A887278BB4AF0A40D7FBEC4BFED0D--> <AD_MESSAGE_ID><![CDATA[050A887278BB4AF0A40D7FBEC4BFED0D]]></AD_MESSAGE_ID> +<!--050A887278BB4AF0A40D7FBEC4BFED0D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--050A887278BB4AF0A40D7FBEC4BFED0D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--050A887278BB4AF0A40D7FBEC4BFED0D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--050A887278BB4AF0A40D7FBEC4BFED0D--> <VALUE><![CDATA[OBUIAPP_WantToCloneRecord]]></VALUE> +<!--050A887278BB4AF0A40D7FBEC4BFED0D--> <MSGTEXT><![CDATA[Do you want to clone the selected record?]]></MSGTEXT> +<!--050A887278BB4AF0A40D7FBEC4BFED0D--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--050A887278BB4AF0A40D7FBEC4BFED0D--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--050A887278BB4AF0A40D7FBEC4BFED0D--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--050A887278BB4AF0A40D7FBEC4BFED0D--></AD_MESSAGE> + <!--07272FCDEEA64054AF2F983D9814EE00--><AD_MESSAGE> <!--07272FCDEEA64054AF2F983D9814EE00--> <AD_MESSAGE_ID><![CDATA[07272FCDEEA64054AF2F983D9814EE00]]></AD_MESSAGE_ID> <!--07272FCDEEA64054AF2F983D9814EE00--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -783,6 +795,18 @@ <!--7410A9E707384D369419188644A31430--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--7410A9E707384D369419188644A31430--></AD_MESSAGE> +<!--744877846A1D4E3EAD6F4BFF308C148D--><AD_MESSAGE> +<!--744877846A1D4E3EAD6F4BFF308C148D--> <AD_MESSAGE_ID><![CDATA[744877846A1D4E3EAD6F4BFF308C148D]]></AD_MESSAGE_ID> +<!--744877846A1D4E3EAD6F4BFF308C148D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--744877846A1D4E3EAD6F4BFF308C148D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--744877846A1D4E3EAD6F4BFF308C148D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--744877846A1D4E3EAD6F4BFF308C148D--> <VALUE><![CDATA[OBUIAPP_FillMandatoryFields]]></VALUE> +<!--744877846A1D4E3EAD6F4BFF308C148D--> <MSGTEXT><![CDATA[Few mandatory fields have not been filled. Refer lines]]></MSGTEXT> +<!--744877846A1D4E3EAD6F4BFF308C148D--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--744877846A1D4E3EAD6F4BFF308C148D--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--744877846A1D4E3EAD6F4BFF308C148D--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--744877846A1D4E3EAD6F4BFF308C148D--></AD_MESSAGE> + <!--75E47FA30B8D438E9569B4C688E863EB--><AD_MESSAGE> <!--75E47FA30B8D438E9569B4C688E863EB--> <AD_MESSAGE_ID><![CDATA[75E47FA30B8D438E9569B4C688E863EB]]></AD_MESSAGE_ID> <!--75E47FA30B8D438E9569B4C688E863EB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 872081925d42 -r f78aa78542fa 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 Fri Apr 19 12:33:19 2013 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Mon Apr 22 16:17:14 2013 +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> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.20144]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.20165]]></VERSION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL> diff -r 872081925d42 -r f78aa78542fa modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Apr 19 12:33:19 2013 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Apr 22 16:17:14 2013 +0200 @@ -7,7 +7,7 @@ <!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID> -<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.20144]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.20165]]></STARTVERSION> <!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID> -<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.20144]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.20165]]></STARTVERSION> <!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ <!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.20144]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.20165]]></STARTVERSION> <!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -49,7 +49,7 @@ <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID> -<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.20144]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.20165]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 872081925d42 -r f78aa78542fa modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java Fri Apr 19 12:33:19 2013 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java Mon Apr 22 16:17:14 2013 +0200 @@ -569,4 +569,13 @@ return selectableMenuOptions; } + + /** + * Sets globalMenuOptions. This method is intended to be used only when running out of a context; + * + * @param globalMenuOptions + */ + public void setGlobalMenuOptions(GlobalMenu globalMenuOptions) { + this.globalMenuOptions = globalMenuOptions; + } } diff -r 872081925d42 -r f78aa78542fa modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java Fri Apr 19 12:33:19 2013 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java Mon Apr 22 16:17:14 2013 +0200 @@ -11,7 +11,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) 2011 Openbravo SLU + * All portions are Copyright (C) 2011-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): Mallikarjun M ************************************************************************ @@ -52,7 +52,7 @@ final DataToJsonConverter jsonConverter = new DataToJsonConverter(); JSONObject json = null; try { - String orderId = (String) parameters.get("orderId"); + String orderId = (String) parameters.get("recordId"); Order objOrder = OBDal.getInstance().get(Order.class, orderId); Order objCloneOrder = (Order) DalUtil.copy(objOrder, false); BigDecimal bLineNetAmt = getLineNetAmt(orderId); diff -r 872081925d42 -r f78aa78542fa modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Fri Apr 19 12:33:19 2013 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Mon Apr 22 16:17:14 2013 +0200 @@ -2178,7 +2178,22 @@ title: OB.I18N.getLabel('OBUIAPP_Delete'), keyTitle: OB.KeyboardManager.Shortcuts.getProperty('keyComb.text', 'ToolBar_Eliminate', 'id'), click: function () { - grid.view.deleteSelectedRows(); + // The click action should be the same than the toolbar button, so if this last one is overwritten, this click should perform the same action. + var isToolbarButtonFound = false, + i; + if (grid.view.toolBar && grid.view.toolBar.leftMembers && isc.OBToolbar.TYPE_DELETE) { + for (i = 0; i < grid.view.toolBar.leftMembers.length; i++) { + if (grid.view.toolBar.leftMembers[i].buttonType === isc.OBToolbar.TYPE_DELETE) { + isToolbarButtonFound = true; + grid.view.toolBar.leftMembers[i].action(); + break; + } + } + } + // But if the toolbar button is not found, do the default action + if (!isToolbarButtonFound) { + grid.view.deleteSelectedRows(); + } } }); } diff -r 872081925d42 -r f78aa78542fa modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Fri Apr 19 12:33:19 2013 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Mon Apr 22 16:17:14 2013 +0200 @@ -250,7 +250,7 @@ length = this.iconToolbarButtons.length; for (i = 0; i < length; i++) { // note create a somewhat unique id by concatenating the tabid and the index - OB.ToolbarRegistry.registerButton(this.tabId + '_' + i, isc.OBToolbarIconButton, this.iconToolbarButtons[i], 200 + (i * 10), this.tabId); + OB.ToolbarRegistry.registerButton(this.tabId + '_' + i, isc.OBToolbarIconButton, this.iconToolbarButtons[i], 200 + (i * 10), this.tabId, null, false); } } diff -r 872081925d42 -r f78aa78542fa modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js Fri Apr 19 12:33:19 2013 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js Mon Apr 22 16:17:14 2013 +0200 @@ -11,7 +11,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) 2011-2012 Openbravo SLU + * All portions are Copyright (C) 2011-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ___________ ************************************************************************ @@ -228,6 +228,6 @@ keyboardShortcutId: 'ToolBar_ManageViews' }; - OB.ToolbarRegistry.registerButton(manageViewButtonProperties.buttonType, isc.OBToolbarIconButton, manageViewButtonProperties, 320, null); + OB.ToolbarRegistry.registerButton(manageViewButtonProperties.buttonType, isc.OBToolbarIconButton, manageViewButtonProperties, 320, null, null, false); }()); \ No newline at end of file diff -r 872081925d42 -r f78aa78542fa modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js ------------------------------------------------------------------------------ Precog is a next-generation analytics platform capable of advanced analytics on semi-structured data. The platform includes APIs for building apps and a phenomenal toolset for data science. Developers can use our toolset for easy data analysis & visualization. Get a free account! http://www2.precog.com/precogplatform/slashdotnewsletter _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
