details: https://code.openbravo.com/erp/devel/main/rev/39f27ff472c6 changeset: 18260:39f27ff472c6 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Mon Oct 22 10:36:49 2012 +0200 summary: Fixes Issue 0022000: The callprocess java class does not close the cursors
details: https://code.openbravo.com/erp/devel/main/rev/7f4c9828b9ed changeset: 18261:7f4c9828b9ed user: Naiara Garcia <naiara.garcia <at> openbravo.com> date: Mon Oct 22 11:14:49 2012 +0200 summary: Fixed issue 22013: The Order UOM field should not have a value selected by default details: https://code.openbravo.com/erp/devel/main/rev/34fd0be1e4c4 changeset: 18262:34fd0be1e4c4 user: Guillermo Álvarez de Eulate <guillermo.alvarez <at> openbravo.com> date: Mon Oct 22 12:59:10 2012 +0200 summary: fixed issue 22020: organization table doesn't need this validation details: https://code.openbravo.com/erp/devel/main/rev/6961cb2251b2 changeset: 18263:6961cb2251b2 user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Oct 22 13:26:33 2012 +0200 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/f45ce2b2a704 changeset: 18264:f45ce2b2a704 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Mon Oct 22 16:25:29 2012 +0200 summary: Related to issue 21903 Change font type in JER to Dejavu Sans Change font type in Jounal Entries Report to font supported in Openbravo ERP details: https://code.openbravo.com/erp/devel/main/rev/021d7e0895a3 changeset: 18265:021d7e0895a3 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Tue Oct 23 11:35:08 2012 +0200 summary: Fixes Issue 21725 : New UI Pattern Edit or Delete Only (No Insert) details: https://code.openbravo.com/erp/devel/main/rev/bea2418527bf changeset: 18266:bea2418527bf user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Mon Oct 22 12:39:12 2012 +0200 summary: Fixed issue 22063 Accrual and deferrals plans for product (Sale) details: https://code.openbravo.com/erp/devel/main/rev/3ae1a7bf1d80 changeset: 18267:3ae1a7bf1d80 user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Mon Oct 22 13:23:13 2012 +0200 summary: Related to issue 22063 Accrual and deferrals plans for product (Purchase) details: https://code.openbravo.com/erp/devel/main/rev/5e3903a17a28 changeset: 18268:5e3903a17a28 user: David Baz Fayos <david.baz <at> openbravo.com> date: Tue Oct 23 14:10:28 2012 +0200 summary: Related to issue 19728: Do more JS code formatting details: https://code.openbravo.com/erp/devel/main/rev/ec10f528e45f changeset: 18269:ec10f528e45f user: Martin Taal <martin.taal <at> openbravo.com> date: Tue Oct 23 15:14:04 2012 +0200 summary: Related to issue 21468: Ability to disable buttons like "delete" and "attach" in the toolbar Put back lines which were removed by accident, replaced standardWindow.id with standardWindow.windowId details: https://code.openbravo.com/erp/devel/main/rev/90820fdcd175 changeset: 18270:90820fdcd175 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Wed Oct 24 11:11:00 2012 +0200 summary: Fixes Issue 0022031: Now selectors are working properly but not as before The way selectors were working was modified to work properly in this issue https://issues.openbravo.com/view.php?id=21470.Prior to this change, even though 'startsWith' was set, the suggestion box always worked with the 'Contains' filter. Because of the change the behaviour was different from the existing behaviour of the selector, so modified the suggestion text match style from 'startsWith' to 'Contains' so that the existing behaviour will be restored. details: https://code.openbravo.com/erp/devel/main/rev/0a2bdc2397de changeset: 18271:0a2bdc2397de user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Tue Oct 23 10:27:54 2012 +0200 summary: Fixes Issue 21934: Readonly logic in column definition has wrong format details: https://code.openbravo.com/erp/devel/main/rev/b6bb21d67c4b changeset: 18272:b6bb21d67c4b user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Tue Oct 23 17:25:30 2012 +0200 summary: Fixes Issue 19578: Should not allow to create new record in the organization window details: https://code.openbravo.com/erp/devel/main/rev/36c0d02f28b3 changeset: 18273:36c0d02f28b3 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Tue Oct 23 12:29:09 2012 +0200 summary: Fixes Issue 21947: Unclear error when trying to delete a Payment Out details: https://code.openbravo.com/erp/devel/main/rev/5d1507be93aa changeset: 18274:5d1507be93aa user: Eduardo Argal <eduardo.argal <at> openbravo.com> date: Mon Oct 22 16:36:31 2012 +0200 summary: Fixed issue 22066 Reconciliation Improvements details: https://code.openbravo.com/erp/devel/main/rev/360196c01a82 changeset: 18275:360196c01a82 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Oct 24 12:37:48 2012 +0200 summary: Fixes issue 22088: Sends the Parameters in the correct Order to the Insert Sentence. details: https://code.openbravo.com/erp/devel/main/rev/ab39dd401cd5 changeset: 18276:ab39dd401cd5 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Wed Oct 24 14:02:55 2012 +0200 summary: Fixes Issue 0021468 : Ability to disable buttons like "delete" and "attach" in the toolbar Refactored code to include two properties 'allowDelete' and 'allowAttachment' in OBStandardWindow and set them using preference value. Added logic to prevent delete using contextual menu (right click in grid). details: https://code.openbravo.com/erp/devel/main/rev/ca38f3f7ec3b changeset: 18277:ca38f3f7ec3b user: Martin Taal <martin.taal <at> openbravo.com> date: Wed Oct 24 22:53:37 2012 +0200 summary: Fixes issue 22083: Computed columns should work also with non primitive references Property formula is also supported for many-to-one details: https://code.openbravo.com/erp/devel/main/rev/0d7d2c8be2bb changeset: 18278:0d7d2c8be2bb user: Martin Taal <martin.taal <at> openbravo.com> date: Wed Oct 24 23:53:31 2012 +0200 summary: Fixes issue 22098: Filtering by partial contents has changed since inclusion of grouping feature Filtering now happens when exiting the filter field, the grid is not filtered automatically on keypress the suggestion box is filtered. details: https://code.openbravo.com/erp/devel/main/rev/391e1978c9f6 changeset: 18279:391e1978c9f6 user: Martin Taal <martin.taal <at> openbravo.com> date: Thu Oct 25 00:30:23 2012 +0200 summary: Reformatted details: https://code.openbravo.com/erp/devel/main/rev/4a27e27689bc changeset: 18280:4a27e27689bc user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Oct 25 12:26:13 2012 +0200 summary: CI: update AD_MODULE to version 18279 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_REFERENCE.xml | 13 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml | 36 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 22 - modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 14 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java | 7 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml | 1 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html | 18 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java | 34 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.xml | 13 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html | 2 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java | 64 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 23 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/MatchTransactionDao.java | 36 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java | 144 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 7 +- 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_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 18 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js | 17 +- 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-standard-window.js | 6 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-application-menu.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 14 +- 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.selector/src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 4 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js | 11 +- 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/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml | 6 +- src-db/database/model/functions/M_PRODUCT_CATEGORY_ACCT_COPY.xml | 8 +- src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml | 14 + src-db/database/model/tables/C_INVOICELINE.xml | 44 + src-db/database/model/tables/FIN_BANKFILE_EXCEPTION.xml | 62 + src-db/database/model/tables/FIN_BANKSTATEMENTLINE.xml | 7 + src-db/database/model/tables/FIN_FINACC_PAYMENTMETHOD.xml | 5 + src-db/database/model/tables/M_PRODUCT.xml | 30 + src-db/database/model/tables/M_PRODUCT_ACCT.xml | 14 + src-db/database/model/tables/M_PRODUCT_CATEGORY_ACCT.xml | 14 + src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml | 16 +- src-db/database/model/triggers/M_PRODUCT_CATEGORY_TRG.xml | 4 +- src-db/database/model/triggers/M_PRODUCT_TRG.xml | 18 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 + src-db/database/sourcedata/AD_COLUMN.xml | 1197 +++++++++- src-db/database/sourcedata/AD_ELEMENT.xml | 168 + src-db/database/sourcedata/AD_FIELD.xml | 879 +++++++- src-db/database/sourcedata/AD_FIELDGROUP.xml | 18 + src-db/database/sourcedata/AD_MESSAGE.xml | 66 + src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REFERENCE.xml | 12 + src-db/database/sourcedata/AD_REF_LIST.xml | 12 + src-db/database/sourcedata/AD_TAB.xml | 28 +- src-db/database/sourcedata/AD_TABLE.xml | 23 + src-db/database/sourcedata/AD_VAL_RULE.xml | 11 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 16 +- src/org/openbravo/dal/core/DalMappingGenerator.java | 9 +- src/org/openbravo/erpCommon/ad_actionButton/CopyFromInvoice.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java | 60 +- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java | 6 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 5 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 282 ++- src/org/openbravo/erpCommon/ad_forms/DocLine.java | 42 +- src/org/openbravo/erpCommon/ad_forms/DocLineInvoice_data.xsql | 8 +- src/org/openbravo/erpCommon/ad_forms/DocLine_Invoice.java | 83 +- src/org/openbravo/erpCommon/ad_forms/ProductInfo.java | 14 +- src/org/openbravo/erpCommon/ad_forms/ProductInfo_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.jrxml | 74 +- src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 10 + src/org/openbravo/service/db/CallProcess.java | 8 +- src/org/openbravo/service/system/DatabaseValidator.java | 2 +- 108 files changed, 3655 insertions(+), 323 deletions(-) diffs (truncated from 6912 to 300 lines): diff -r f5d73c19e245 -r 4a27e27689bc modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Oct 19 13:17:31 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Oct 25 12:26:13 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.18231]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.18279]]></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 f5d73c19e245 -r 4a27e27689bc 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 Oct 19 13:17:31 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Oct 25 12:26:13 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.18231]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.18279]]></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.18231]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.18279]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r f5d73c19e245 -r 4a27e27689bc modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml Fri Oct 19 13:17:31 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml Thu Oct 25 12:26:13 2012 +0200 @@ -108,6 +108,19 @@ <!--B8C833E4F0A44A2DA5FC7606F3CD9439--> <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED> <!--B8C833E4F0A44A2DA5FC7606F3CD9439--></AD_REFERENCE> +<!--C1B4345A1F8841C2B1ADD403CA733D75--><AD_REFERENCE> +<!--C1B4345A1F8841C2B1ADD403CA733D75--> <AD_REFERENCE_ID><![CDATA[C1B4345A1F8841C2B1ADD403CA733D75]]></AD_REFERENCE_ID> +<!--C1B4345A1F8841C2B1ADD403CA733D75--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C1B4345A1F8841C2B1ADD403CA733D75--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--C1B4345A1F8841C2B1ADD403CA733D75--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--C1B4345A1F8841C2B1ADD403CA733D75--> <NAME><![CDATA[Transaction Type AddTransaction]]></NAME> +<!--C1B4345A1F8841C2B1ADD403CA733D75--> <DESCRIPTION><![CDATA[List of options for transaction type in Add Transaction popup]]></DESCRIPTION> +<!--C1B4345A1F8841C2B1ADD403CA733D75--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--C1B4345A1F8841C2B1ADD403CA733D75--> <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE> +<!--C1B4345A1F8841C2B1ADD403CA733D75--> <PARENTREFERENCE_ID><![CDATA[17]]></PARENTREFERENCE_ID> +<!--C1B4345A1F8841C2B1ADD403CA733D75--> <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED> +<!--C1B4345A1F8841C2B1ADD403CA733D75--></AD_REFERENCE> + <!--DB71FC312327430EAEACF42918405BF9--><AD_REFERENCE> <!--DB71FC312327430EAEACF42918405BF9--> <AD_REFERENCE_ID><![CDATA[DB71FC312327430EAEACF42918405BF9]]></AD_REFERENCE_ID> <!--DB71FC312327430EAEACF42918405BF9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r f5d73c19e245 -r 4a27e27689bc modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml Fri Oct 19 13:17:31 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml Thu Oct 25 12:26:13 2012 +0200 @@ -1,5 +1,17 @@ <?xml version='1.0' encoding='UTF-8'?> <data> +<!--298F4C20A76B4B30860330F188BD7AEA--><AD_REF_LIST> +<!--298F4C20A76B4B30860330F188BD7AEA--> <AD_REF_LIST_ID><![CDATA[298F4C20A76B4B30860330F188BD7AEA]]></AD_REF_LIST_ID> +<!--298F4C20A76B4B30860330F188BD7AEA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--298F4C20A76B4B30860330F188BD7AEA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--298F4C20A76B4B30860330F188BD7AEA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--298F4C20A76B4B30860330F188BD7AEA--> <VALUE><![CDATA[F]]></VALUE> +<!--298F4C20A76B4B30860330F188BD7AEA--> <NAME><![CDATA[Fee]]></NAME> +<!--298F4C20A76B4B30860330F188BD7AEA--> <AD_REFERENCE_ID><![CDATA[C1B4345A1F8841C2B1ADD403CA733D75]]></AD_REFERENCE_ID> +<!--298F4C20A76B4B30860330F188BD7AEA--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--298F4C20A76B4B30860330F188BD7AEA--> <SEQNO><![CDATA[30]]></SEQNO> +<!--298F4C20A76B4B30860330F188BD7AEA--></AD_REF_LIST> + <!--2C29C3C687FC403A802A15DEAF9E0D26--><AD_REF_LIST> <!--2C29C3C687FC403A802A15DEAF9E0D26--> <AD_REF_LIST_ID><![CDATA[2C29C3C687FC403A802A15DEAF9E0D26]]></AD_REF_LIST_ID> <!--2C29C3C687FC403A802A15DEAF9E0D26--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -153,6 +165,18 @@ <!--B481A754BB024A1BA57D3DF852386B87--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B481A754BB024A1BA57D3DF852386B87--></AD_REF_LIST> +<!--BABE6BF881DD471BB18BF1AD764A3B78--><AD_REF_LIST> +<!--BABE6BF881DD471BB18BF1AD764A3B78--> <AD_REF_LIST_ID><![CDATA[BABE6BF881DD471BB18BF1AD764A3B78]]></AD_REF_LIST_ID> +<!--BABE6BF881DD471BB18BF1AD764A3B78--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--BABE6BF881DD471BB18BF1AD764A3B78--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--BABE6BF881DD471BB18BF1AD764A3B78--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--BABE6BF881DD471BB18BF1AD764A3B78--> <VALUE><![CDATA[GL]]></VALUE> +<!--BABE6BF881DD471BB18BF1AD764A3B78--> <NAME><![CDATA[GL Item]]></NAME> +<!--BABE6BF881DD471BB18BF1AD764A3B78--> <AD_REFERENCE_ID><![CDATA[C1B4345A1F8841C2B1ADD403CA733D75]]></AD_REFERENCE_ID> +<!--BABE6BF881DD471BB18BF1AD764A3B78--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--BABE6BF881DD471BB18BF1AD764A3B78--> <SEQNO><![CDATA[20]]></SEQNO> +<!--BABE6BF881DD471BB18BF1AD764A3B78--></AD_REF_LIST> + <!--C5D1596D065545B49156C1F9426C9E14--><AD_REF_LIST> <!--C5D1596D065545B49156C1F9426C9E14--> <AD_REF_LIST_ID><![CDATA[C5D1596D065545B49156C1F9426C9E14]]></AD_REF_LIST_ID> <!--C5D1596D065545B49156C1F9426C9E14--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -164,6 +188,18 @@ <!--C5D1596D065545B49156C1F9426C9E14--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--C5D1596D065545B49156C1F9426C9E14--></AD_REF_LIST> +<!--E047F81FACD0440EACB0EE63EB18A4EE--><AD_REF_LIST> +<!--E047F81FACD0440EACB0EE63EB18A4EE--> <AD_REF_LIST_ID><![CDATA[E047F81FACD0440EACB0EE63EB18A4EE]]></AD_REF_LIST_ID> +<!--E047F81FACD0440EACB0EE63EB18A4EE--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--E047F81FACD0440EACB0EE63EB18A4EE--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--E047F81FACD0440EACB0EE63EB18A4EE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--E047F81FACD0440EACB0EE63EB18A4EE--> <VALUE><![CDATA[P]]></VALUE> +<!--E047F81FACD0440EACB0EE63EB18A4EE--> <NAME><![CDATA[Payment In/Out]]></NAME> +<!--E047F81FACD0440EACB0EE63EB18A4EE--> <AD_REFERENCE_ID><![CDATA[C1B4345A1F8841C2B1ADD403CA733D75]]></AD_REFERENCE_ID> +<!--E047F81FACD0440EACB0EE63EB18A4EE--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--E047F81FACD0440EACB0EE63EB18A4EE--> <SEQNO><![CDATA[10]]></SEQNO> +<!--E047F81FACD0440EACB0EE63EB18A4EE--></AD_REF_LIST> + <!--FF8080812E443491012E443C4ED60020--><AD_REF_LIST> <!--FF8080812E443491012E443C4ED60020--> <AD_REF_LIST_ID><![CDATA[FF8080812E443491012E443C4ED60020]]></AD_REF_LIST_ID> <!--FF8080812E443491012E443C4ED60020--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r f5d73c19e245 -r 4a27e27689bc modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Fri Oct 19 13:17:31 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu Oct 25 12:26:13 2012 +0200 @@ -583,17 +583,6 @@ <!--4E68CD319FF945578CCF11CF38E0C58C--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--4E68CD319FF945578CCF11CF38E0C58C--></AD_TEXTINTERFACES> -<!--4F85512699C241C58A3E7AD76FC4B4C6--><AD_TEXTINTERFACES> -<!--4F85512699C241C58A3E7AD76FC4B4C6--> <AD_TEXTINTERFACES_ID><![CDATA[4F85512699C241C58A3E7AD76FC4B4C6]]></AD_TEXTINTERFACES_ID> -<!--4F85512699C241C58A3E7AD76FC4B4C6--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--4F85512699C241C58A3E7AD76FC4B4C6--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--4F85512699C241C58A3E7AD76FC4B4C6--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--4F85512699C241C58A3E7AD76FC4B4C6--> <TEXT><![CDATA[GL Item]]></TEXT> -<!--4F85512699C241C58A3E7AD76FC4B4C6--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html]]></FILENAME> -<!--4F85512699C241C58A3E7AD76FC4B4C6--> <ISUSED><![CDATA[Y]]></ISUSED> -<!--4F85512699C241C58A3E7AD76FC4B4C6--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--4F85512699C241C58A3E7AD76FC4B4C6--></AD_TEXTINTERFACES> - <!--549D43D3510845D1965ACD2697B007FA--><AD_TEXTINTERFACES> <!--549D43D3510845D1965ACD2697B007FA--> <AD_TEXTINTERFACES_ID><![CDATA[549D43D3510845D1965ACD2697B007FA]]></AD_TEXTINTERFACES_ID> <!--549D43D3510845D1965ACD2697B007FA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -2673,17 +2662,6 @@ <!--D2238E00427F496CB8D5A0F24935D4DB--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--D2238E00427F496CB8D5A0F24935D4DB--></AD_TEXTINTERFACES> -<!--D355AEFFF148477FBBA0711575E575F2--><AD_TEXTINTERFACES> -<!--D355AEFFF148477FBBA0711575E575F2--> <AD_TEXTINTERFACES_ID><![CDATA[D355AEFFF148477FBBA0711575E575F2]]></AD_TEXTINTERFACES_ID> -<!--D355AEFFF148477FBBA0711575E575F2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--D355AEFFF148477FBBA0711575E575F2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--D355AEFFF148477FBBA0711575E575F2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--D355AEFFF148477FBBA0711575E575F2--> <TEXT><![CDATA[Fee]]></TEXT> -<!--D355AEFFF148477FBBA0711575E575F2--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html]]></FILENAME> -<!--D355AEFFF148477FBBA0711575E575F2--> <ISUSED><![CDATA[Y]]></ISUSED> -<!--D355AEFFF148477FBBA0711575E575F2--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--D355AEFFF148477FBBA0711575E575F2--></AD_TEXTINTERFACES> - <!--D516788B09FF4747BECF206430E96AA4--><AD_TEXTINTERFACES> <!--D516788B09FF4747BECF206430E96AA4--> <AD_TEXTINTERFACES_ID><![CDATA[D516788B09FF4747BECF206430E96AA4]]></AD_TEXTINTERFACES_ID> <!--D516788B09FF4747BECF206430E96AA4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r f5d73c19e245 -r 4a27e27689bc modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Fri Oct 19 13:17:31 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml Thu Oct 25 12:26:13 2012 +0200 @@ -33,7 +33,7 @@ <!--9FAD469CE4414A25974CF45C0AD22D35--> <FILTER_EXPRESSION><![CDATA[OB.getFilterExpression("org.openbravo.advpaymentmngt.ad_actionbutton.GLItemSelectorFilterExpression")]]></FILTER_EXPRESSION> <!--9FAD469CE4414A25974CF45C0AD22D35--> <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID> <!--9FAD469CE4414A25974CF45C0AD22D35--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--9FAD469CE4414A25974CF45C0AD22D35--> <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE> +<!--9FAD469CE4414A25974CF45C0AD22D35--> <SUGGESTIONTEXTMATCHSTYLE><![CDATA[substring]]></SUGGESTIONTEXTMATCHSTYLE> <!--9FAD469CE4414A25974CF45C0AD22D35--> <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE> <!--9FAD469CE4414A25974CF45C0AD22D35--> <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY> <!--9FAD469CE4414A25974CF45C0AD22D35--></OBUISEL_SELECTOR> @@ -49,7 +49,7 @@ <!--A98899B1C75A4F4EBD3414F1B654EFAB--> <FILTER_EXPRESSION><![CDATA["e.active=true"]]></FILTER_EXPRESSION> <!--A98899B1C75A4F4EBD3414F1B654EFAB--> <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID> <!--A98899B1C75A4F4EBD3414F1B654EFAB--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--A98899B1C75A4F4EBD3414F1B654EFAB--> <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE> +<!--A98899B1C75A4F4EBD3414F1B654EFAB--> <SUGGESTIONTEXTMATCHSTYLE><![CDATA[substring]]></SUGGESTIONTEXTMATCHSTYLE> <!--A98899B1C75A4F4EBD3414F1B654EFAB--> <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE> <!--A98899B1C75A4F4EBD3414F1B654EFAB--> <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY> <!--A98899B1C75A4F4EBD3414F1B654EFAB--></OBUISEL_SELECTOR> @@ -65,7 +65,7 @@ <!--FF808181312D569C01312D8C1EC40036--> <AD_COLUMN_ID><![CDATA[3457]]></AD_COLUMN_ID> <!--FF808181312D569C01312D8C1EC40036--> <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID> <!--FF808181312D569C01312D8C1EC40036--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--FF808181312D569C01312D8C1EC40036--> <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE> +<!--FF808181312D569C01312D8C1EC40036--> <SUGGESTIONTEXTMATCHSTYLE><![CDATA[substring]]></SUGGESTIONTEXTMATCHSTYLE> <!--FF808181312D569C01312D8C1EC40036--> <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE> <!--FF808181312D569C01312D8C1EC40036--> <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY> <!--FF808181312D569C01312D8C1EC40036--></OBUISEL_SELECTOR> @@ -81,7 +81,7 @@ <!--FF808181312D569C01312D8DCCD50045--> <AD_COLUMN_ID><![CDATA[2570]]></AD_COLUMN_ID> <!--FF808181312D569C01312D8DCCD50045--> <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID> <!--FF808181312D569C01312D8DCCD50045--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--FF808181312D569C01312D8DCCD50045--> <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE> +<!--FF808181312D569C01312D8DCCD50045--> <SUGGESTIONTEXTMATCHSTYLE><![CDATA[substring]]></SUGGESTIONTEXTMATCHSTYLE> <!--FF808181312D569C01312D8DCCD50045--> <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE> <!--FF808181312D569C01312D8DCCD50045--> <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY> <!--FF808181312D569C01312D8DCCD50045--></OBUISEL_SELECTOR> @@ -97,7 +97,7 @@ <!--FF808181312D569C01312D8EE5430054--> <AD_COLUMN_ID><![CDATA[1823]]></AD_COLUMN_ID> <!--FF808181312D569C01312D8EE5430054--> <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID> <!--FF808181312D569C01312D8EE5430054--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--FF808181312D569C01312D8EE5430054--> <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE> +<!--FF808181312D569C01312D8EE5430054--> <SUGGESTIONTEXTMATCHSTYLE><![CDATA[substring]]></SUGGESTIONTEXTMATCHSTYLE> <!--FF808181312D569C01312D8EE5430054--> <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE> <!--FF808181312D569C01312D8EE5430054--> <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY> <!--FF808181312D569C01312D8EE5430054--></OBUISEL_SELECTOR> @@ -113,7 +113,7 @@ <!--FF808181312D569C01312D90408D005D--> <AD_COLUMN_ID><![CDATA[1349]]></AD_COLUMN_ID> <!--FF808181312D569C01312D90408D005D--> <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID> <!--FF808181312D569C01312D90408D005D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--FF808181312D569C01312D90408D005D--> <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE> +<!--FF808181312D569C01312D90408D005D--> <SUGGESTIONTEXTMATCHSTYLE><![CDATA[substring]]></SUGGESTIONTEXTMATCHSTYLE> <!--FF808181312D569C01312D90408D005D--> <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE> <!--FF808181312D569C01312D90408D005D--> <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY> <!--FF808181312D569C01312D90408D005D--></OBUISEL_SELECTOR> @@ -131,7 +131,7 @@ <!--FF808181312DA8D801312DDE869B000C--> <FILTER_EXPRESSION><![CDATA[OB.getFilterExpression("org.openbravo.erpCommon.info.RMProductSelectorFilterExpression")]]></FILTER_EXPRESSION> <!--FF808181312DA8D801312DDE869B000C--> <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID> <!--FF808181312DA8D801312DDE869B000C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--FF808181312DA8D801312DDE869B000C--> <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE> +<!--FF808181312DA8D801312DDE869B000C--> <SUGGESTIONTEXTMATCHSTYLE><![CDATA[substring]]></SUGGESTIONTEXTMATCHSTYLE> <!--FF808181312DA8D801312DDE869B000C--> <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE> <!--FF808181312DA8D801312DDE869B000C--> <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY> <!--FF808181312DA8D801312DDE869B000C--></OBUISEL_SELECTOR> diff -r f5d73c19e245 -r 4a27e27689bc modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html Fri Oct 19 13:17:31 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html Thu Oct 25 12:26:13 2012 +0200 @@ -1114,7 +1114,7 @@ <tr> <td style="padding-top: 0px;"> <script>var sc_C_Bpartner_ID = null;</script> - <input type="hidden" name="inpcBpartnerId" id="C_Bpartner_ID" value="" onreset="sc_C_Bpartner_ID.resetSelector();" onchange="openbravo.Utilities.updateSmartClientComponentValue(this, sc_C_Bpartner_ID.selectorField);"></input> + <input type="hidden" name="inpcBpartnerId" id="C_Bpartner_ID" identifier="" value="" onreset="sc_C_Bpartner_ID.resetSelector();" onchange="openbravo.Utilities.updateSmartClientComponentValue(this, sc_C_Bpartner_ID.selectorField);"></input> <script id="selectorLink" src="../org.openbravo.client.kernel/OBUISEL_Selector/A98899B1C75A4F4EBD3414F1B654EFAB?columnName=C_Bpartner_ID&disabled=false&CssSize=TwoCells&DisplayLength=45.0&callOut=onchangeBPartner&required=false&filterClass=org.openbravo.userinterface.selector.SelectorDataSourceFilter&_selectorDefinitionId=A98899B1C75A4F4EBD3414F1B654EFAB"></script> </td> </tr> diff -r f5d73c19e245 -r 4a27e27689bc modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java Fri Oct 19 13:17:31 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java Thu Oct 25 12:26:13 2012 +0200 @@ -383,13 +383,16 @@ OBCriteria<BusinessPartner> obcBP = OBDal.getInstance().createCriteria( BusinessPartner.class); obcBP.add(Restrictions.eq(BusinessPartner.PROPERTY_NAME, bsline.getBpartnername())); + obcBP.setMaxResults(1); if (obcBP.list() != null && obcBP.list().size() > 0) { - xmlDocument.setParameter("businessPartner", obcBP.list().get(0).getIdentifier()); + xmlDocument.setParameter("businessPartner", obcBP.list().get(0).getId()); + xmlDocument.setParameter("businessPartnerName", obcBP.list().get(0).getName()); defaultPaymentMethod = (obcBP.list().get(0).getPaymentMethod() != null) ? obcBP.list() .get(0).getPaymentMethod().getId() : ""; } } else { - xmlDocument.setParameter("businessPartner", bsline.getBusinessPartner().getIdentifier()); + xmlDocument.setParameter("businessPartner", bsline.getBusinessPartner().getId()); + xmlDocument.setParameter("businessPartnerName", bsline.getBusinessPartner().getName()); } } // Take payment date from the add transaction popup diff -r f5d73c19e245 -r 4a27e27689bc modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml Fri Oct 19 13:17:31 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml Thu Oct 25 12:26:13 2012 +0200 @@ -45,6 +45,7 @@ <PARAMETER id="paramExpectedConverted" name="expectedConverted" attribute="value" format="euroEdition"/> <PARAMETER id="paramActualConverted" name="actualConverted" attribute="value" format="euroEdition" default="0"/> <PARAMETER id="C_Bpartner_ID" name="businessPartner" attribute="value"/> + <PARAMETER id="C_Bpartner_ID" name="businessPartnerName" attribute="identifier"/> <PARAMETER id="paramCredit" name="credit" attribute="value" format="euroEdition"/> <PARAMETER id="fieldReceipt" name="isReceipt" attribute="value"/> <PARAMETER id="fieldIsSoTrx" name="isSoTrx" attribute="value"/> diff -r f5d73c19e245 -r 4a27e27689bc modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html Fri Oct 19 13:17:31 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html Thu Oct 25 12:26:13 2012 +0200 @@ -143,6 +143,7 @@ displayLogicElement('client_middle', true); autoDisplayLogicDimensions(false); loadGrid(); + resizeAreaCreateFrom(); } else if (opt == 'GL') { displayLogicElement('FeeSection1', false); displayLogicElement('FeeSection2', false); @@ -336,7 +337,6 @@ onloadFunctions(); } catch (e) {} showHideLayers(); - resizeAreaCreateFrom(); } function onResizeDo(){ @@ -538,13 +538,11 @@ <!-- <td class="Combo_ContentCell" colspan="2"><select name="inpTransactionType" id="paramTransactionType" class="dojoValidateValid required Combo Combo_TwoCells_width"> <div id="reportTransactionType"></div></select> </td> --> - <td class="Combo_ContentCell" colspan="2"> - <select id="paramTransactionType" name="inpTransactionType" class="ComboKey Combo_TwoCells_width required" onchange="showHideLayers();"> - <option value="P" selected="selected">Payment In/Out</option> - <option value="GL">GL Item</option> - <option value="F">Fee</option> - </select> - </td> + <td class="Combo_ContentCell"> + <select name="inpTransactionType" id="inpTransactionType" class="ComboKey Combo_TwoCells_width required" required="true" onchange="showHideLayers(); return true;"> + <option value=""> <div id="reportTransactionType"></div></option> + </select></td> + ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_sfd2d_oct _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
