details: https://code.openbravo.com/erp/devel/main/rev/6f9831dd17ba changeset: 16218:6f9831dd17ba user: Guillermo Álvarez de Eulate <guillermo.alvarez <at> openbravo.com> date: Thu Apr 26 12:02:01 2012 +0200 summary: Related to issue 19362: Improving quality of code in response to code review
details: https://code.openbravo.com/erp/devel/main/rev/c88ce1de44de changeset: 16219:c88ce1de44de user: Egoitz Castillo <egoitz.castillo <at> openbravo.com> date: Thu Apr 26 12:26:28 2012 +0200 summary: Fixed Issues 0020358: Long time to calculate LinkedItems details: https://code.openbravo.com/erp/devel/main/rev/abbf0e7f2325 changeset: 16220:abbf0e7f2325 user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Thu Apr 26 11:24:42 2012 +0200 summary: fixed bug 10797 Set sales transaction ='Y' in windows when appropiate details: https://code.openbravo.com/erp/devel/main/rev/9f1665574f35 changeset: 16221:9f1665574f35 user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Thu Apr 26 10:01:01 2012 +0200 summary: fixed bug 19016 Calculate the weekends in Insert Maintenances details: https://code.openbravo.com/erp/devel/main/rev/153cac4dbab2 changeset: 16222:153cac4dbab2 user: Egoitz Castillo <egoitz.castillo <at> openbravo.com> date: Thu Apr 26 12:49:00 2012 +0200 summary: Fixed Issue 0020358: Revert the previous chan ge details: https://code.openbravo.com/erp/devel/main/rev/c03f5142dd60 changeset: 16223:c03f5142dd60 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Thu Apr 26 13:35:37 2012 +0200 summary: Related to issue 19016: rename function to C_GET_ISOWEEK_DAY details: https://code.openbravo.com/erp/devel/main/rev/285d006fa8f8 changeset: 16224:285d006fa8f8 user: Pablo Sarobe <pablo.sarobe <at> openbravo.com> date: Thu Apr 26 14:06:37 2012 +0200 summary: Update F&B data for April details: https://code.openbravo.com/erp/devel/main/rev/557136640cda changeset: 16225:557136640cda user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Thu Apr 26 12:01:48 2012 +0200 summary: fixed issue 9862 Not mandatory product and bp sequence(Org schema window) create a constraint to check: if create new account for bp then sequence for bp,account and sub account lengths and mandatory. The same for create new account for product. Callout: if create new account is not selected, the rest of the fields are null. details: https://code.openbravo.com/erp/devel/main/rev/85d333e1b119 changeset: 16226:85d333e1b119 user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Thu Apr 12 17:43:28 2012 +0200 summary: fixed bug 12183 Remove decimals in Minimum Lead Time field(Manufacturing tab) details: https://code.openbravo.com/erp/devel/main/rev/37ae4fda8880 changeset: 16227:37ae4fda8880 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Thu Apr 26 17:29:26 2012 +0200 summary: Fixed issue 20352. Do not remove an invalid value from the selector. Reverted change done in changeset bcbda0ffe5d8. This change was causing the following behaviour to happen: - When a field is used as part of a displaylogic of a different field, a redraw of the window will be done in case the selector value happens. - This redraw will cause a call to the mapValueToDisplay method. - If the user is typing the name of the business partner, the value will not be one of the valid business partner names (yet). - With the previous version of the method, the value was then discarded. This produced the very annoying effect of reverting what the user had typed just after he had done it, if he hadn't been 'fast enough' to type the whole identifier of the business partner. With the change done, the selector will not be cleared if a user types a (not yet completely correct) value in the selector, even if there is a valueMap which doesn't contain what the user has typed. The issue which was supposedly fixed with this part of the mentioned changeset (issue 19724) still works fine as far as I can tell, even after having removed this part of the change. details: https://code.openbravo.com/erp/devel/main/rev/567eea69e702 changeset: 16228:567eea69e702 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Thu Apr 26 12:05:29 2012 +0200 summary: Fixes issue 14448: consistency in Add payment window labels Amount --> Actual Payment In/Out Receiving From --> Received From Paying To --> To Be Paid To details: https://code.openbravo.com/erp/devel/main/rev/0a1670b979e2 changeset: 16229:0a1670b979e2 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Thu Apr 26 18:37:11 2012 +0200 summary: Fixed issue 20352. Fixed also in case of combos. Provided a better solution which doesn't cancel previous fix. - After the previous fix, we've realized that the same problem happened in the case of combos. - Also, the previous fix reverted the fix of issue 19724, which could still be reproduceable in very specific circumstances. Due to this, a new fix has been done. Instead of never removing the value if it didn't comply with any of the values in the map, we remove it if and only if the value is a UUID. This way, we avoid the problem in issue 19724 while still fixing the problem which happens when the user types a value. details: https://code.openbravo.com/erp/devel/main/rev/4d01e2d25895 changeset: 16230:4d01e2d25895 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Apr 26 19:24:48 2012 +0200 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/e0ef24f40f60 changeset: 16231:e0ef24f40f60 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Thu Apr 26 20:05:27 2012 +0200 summary: F&B sampledata: Fixes bug 20320, Fixes bug 20321, Fixes bug 20355, Fixes bug 20356. Fixes int-full-pgsql #3434 details: https://code.openbravo.com/erp/devel/main/rev/1f536d3d1619 changeset: 16232:1f536d3d1619 user: Guillermo Álvarez de Eulate <guillermo.alvarez <at> openbravo.com> date: Thu Apr 26 19:52:11 2012 +0200 summary: fixed issue 19986: WAD validation to avoid more than one field pointing to the same column in a tab. details: https://code.openbravo.com/erp/devel/main/rev/400415a4f8ae changeset: 16233:400415a4f8ae user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Apr 26 17:10:09 2012 +0200 summary: Fixes Issue 0020105: Automatic processes create goods shipments with inact. bins details: https://code.openbravo.com/erp/devel/main/rev/d70218caa062 changeset: 16234:d70218caa062 user: Asier Galdos <asier.galdos <at> almis.com> date: Thu Apr 26 17:05:23 2012 +0200 summary: Fixes issue 20357: Support for property filtering in EntityXMLConverter details: https://code.openbravo.com/erp/devel/main/rev/054ca3ab4a63 changeset: 16235:054ca3ab4a63 user: Iván Perdomo <ivan.perdomo <at> openbravo.com> date: Fri Apr 27 09:39:49 2012 +0200 summary: Related to issue 20357: Added simple test, filtering product xml by id and name details: https://code.openbravo.com/erp/devel/main/rev/1a9ed7b323c5 changeset: 16236:1a9ed7b323c5 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Fri Apr 27 09:58:41 2012 +0200 summary: Related to issue 0020105: Change delete of trigger from true to false details: https://code.openbravo.com/erp/devel/main/rev/0d30cd20c9f8 changeset: 16237:0d30cd20c9f8 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Fri Apr 27 12:10:26 2012 +0200 summary: Fixes issue 20136: Error in Pick and Edit process in Return to Vendor window. Where receipt has not an associated order. details: https://code.openbravo.com/erp/devel/main/rev/f18674b4824a changeset: 16238:f18674b4824a user: Jon Alegría <jon.alegria <at> openbravo.com> date: Fri Apr 27 12:38:53 2012 +0200 summary: Fixes issue 0020204: Create lines from should use ad_column_identifier to show the product name. Added several changes missing in several sql files, to complete de feature request. details: https://code.openbravo.com/erp/devel/main/rev/842e751a4665 changeset: 16239:842e751a4665 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Apr 25 17:04:24 2012 +0200 summary: Fixed bug 20270 Remove C_Payment_Post Online in report and process details: https://code.openbravo.com/erp/devel/main/rev/ece49150e4a5 changeset: 16240:ece49150e4a5 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Mon Apr 23 17:37:21 2012 +0200 summary: Fixed bug 12916 Recalculate line.no when complete a purchase invoice Recalculate line number when complete a purchase invoice in C_INVOICE_POST. details: https://code.openbravo.com/erp/devel/main/rev/3ef120570704 changeset: 16241:3ef120570704 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Fri Apr 27 13:00:31 2012 +0200 summary: Related to issue 12916: code review, indentation details: https://code.openbravo.com/erp/devel/main/rev/0a1174509a27 changeset: 16242:0a1174509a27 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Fri Apr 27 14:00:25 2012 +0200 summary: Fixes int-full-pgsql build 3444 and int-full-oracle build 3457 details: https://code.openbravo.com/erp/devel/main/rev/ef9b9a588ce3 changeset: 16243:ef9b9a588ce3 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri Apr 27 14:52:20 2012 +0200 summary: Fixes issue 20367: Create Standards can not be executed. The problem was that in the create standares process, application create one record in m_storage_detail with one product without any atrributeset and with qty's zero. So the m_update_inventory tries to delete but it has a related record in m_stock_aux details: https://code.openbravo.com/erp/devel/main/rev/cd923b317af4 changeset: 16244:cd923b317af4 user: RM packaging bot <staff.rm <at> openbravo.com> date: Sat Apr 28 02:10:22 2012 +0200 summary: CI: update AD_MODULE to version 16243 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_TEXTINTERFACES.xml | 66 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html | 4 +- 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/src-db/database/sourcedata/AD_WINDOW.xml | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 14 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js | 4 +- 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_FIELD.xml | 8 +- 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-db/database/sourcedata/AD_WINDOW.xml | 2 +- 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_FIELD.xml | 4 +- 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.datasource/src-db/database/sourcedata/AD_WINDOW.xml | 2 +- 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/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 2 +- 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 +- referencedata/sampledata/F_B_International_Group.xml | 26586 +++++++++- referencedata/sampledata/QA_Testing.xml | 27 - src-db/database/model/functions/C_GET_ISOWEEK_DAY.xml | 32 + src-db/database/model/functions/C_INVOICE_POST.xml | 12 + src-db/database/model/functions/C_PAYMENTDUEDATE.xml | 6 +- src-db/database/model/functions/MA_MAINTENANCE_SCHEDULE.xml | 20 +- src-db/database/model/functions/M_UPDATE_INVENTORY.xml | 6 +- src-db/database/model/functions/M_UPDATE_STOCKAUX.xml | 28 + src-db/database/model/tables/AD_ORG_ACCTSCHEMA.xml | 2 + src-db/database/model/triggers/M_LOCATOR_TRG.xml | 57 + src-db/database/sourcedata/AD_CALLOUT.xml | 9 + src-db/database/sourcedata/AD_COLUMN.xml | 8 +- src-db/database/sourcedata/AD_FIELD.xml | 38 +- src-db/database/sourcedata/AD_MESSAGE.xml | 55 + src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 + src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 + src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_PROCESS.xml | 21 - src-db/database/sourcedata/AD_WINDOW.xml | 14 +- src-test/org/openbravo/test/xml/EntityXMLIssues.java | 35 + src-wad/src/org/openbravo/wad/validation/WADValidationResult.java | 3 +- src-wad/src/org/openbravo/wad/validation/WADValidator.java | 18 +- src-wad/src/org/openbravo/wad/validation/WADValidator_data.xsql | 30 +- src/org/openbravo/common/actionhandler/SRMOPickEditLines.java | 194 +- src/org/openbravo/dal/xml/EntityXMLConverter.java | 31 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java | 2 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 31 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql | 31 +- src/org/openbravo/erpCommon/ad_actionButton/Posted.java | 22 +- src/org/openbravo/erpCommon/ad_callouts/SL_RefreshSequenceAndLength.java | 53 + 81 files changed, 25234 insertions(+), 2433 deletions(-) diffs (truncated from 46680 to 300 lines): diff -r 86fe6f8c5c29 -r cd923b317af4 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Apr 25 20:29:57 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Sat Apr 28 02:10:22 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.16162]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.16243]]></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 86fe6f8c5c29 -r cd923b317af4 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 Wed Apr 25 20:29:57 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Apr 28 02:10:22 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.16162]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.16243]]></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.16162]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.16243]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 86fe6f8c5c29 -r cd923b317af4 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Wed Apr 25 20:29:57 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Sat Apr 28 02:10:22 2012 +0200 @@ -297,17 +297,6 @@ <!--30E50BD12DB1498B817E07734F7A6D9C--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--30E50BD12DB1498B817E07734F7A6D9C--></AD_TEXTINTERFACES> -<!--31A4C0C03B794C6281EC0B396C678D15--><AD_TEXTINTERFACES> -<!--31A4C0C03B794C6281EC0B396C678D15--> <AD_TEXTINTERFACES_ID><![CDATA[31A4C0C03B794C6281EC0B396C678D15]]></AD_TEXTINTERFACES_ID> -<!--31A4C0C03B794C6281EC0B396C678D15--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--31A4C0C03B794C6281EC0B396C678D15--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--31A4C0C03B794C6281EC0B396C678D15--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--31A4C0C03B794C6281EC0B396C678D15--> <TEXT><![CDATA[Receiving From]]></TEXT> -<!--31A4C0C03B794C6281EC0B396C678D15--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME> -<!--31A4C0C03B794C6281EC0B396C678D15--> <ISUSED><![CDATA[Y]]></ISUSED> -<!--31A4C0C03B794C6281EC0B396C678D15--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--31A4C0C03B794C6281EC0B396C678D15--></AD_TEXTINTERFACES> - <!--3276B307A1404A97A4F885E3B26A890C--><AD_TEXTINTERFACES> <!--3276B307A1404A97A4F885E3B26A890C--> <AD_TEXTINTERFACES_ID><![CDATA[3276B307A1404A97A4F885E3B26A890C]]></AD_TEXTINTERFACES_ID> <!--3276B307A1404A97A4F885E3B26A890C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -2497,6 +2486,50 @@ <!--BE73A5F0775447398C2ECD4C30CE7155--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--BE73A5F0775447398C2ECD4C30CE7155--></AD_TEXTINTERFACES> +<!--BE924775AF967C78E040007F010017BF--><AD_TEXTINTERFACES> +<!--BE924775AF967C78E040007F010017BF--> <AD_TEXTINTERFACES_ID><![CDATA[BE924775AF967C78E040007F010017BF]]></AD_TEXTINTERFACES_ID> +<!--BE924775AF967C78E040007F010017BF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--BE924775AF967C78E040007F010017BF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--BE924775AF967C78E040007F010017BF--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--BE924775AF967C78E040007F010017BF--> <TEXT><![CDATA[To Be Paid To]]></TEXT> +<!--BE924775AF967C78E040007F010017BF--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME> +<!--BE924775AF967C78E040007F010017BF--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--BE924775AF967C78E040007F010017BF--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--BE924775AF967C78E040007F010017BF--></AD_TEXTINTERFACES> + +<!--BE924775AF997C78E040007F010017BF--><AD_TEXTINTERFACES> +<!--BE924775AF997C78E040007F010017BF--> <AD_TEXTINTERFACES_ID><![CDATA[BE924775AF997C78E040007F010017BF]]></AD_TEXTINTERFACES_ID> +<!--BE924775AF997C78E040007F010017BF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--BE924775AF997C78E040007F010017BF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--BE924775AF997C78E040007F010017BF--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--BE924775AF997C78E040007F010017BF--> <TEXT><![CDATA[Received From]]></TEXT> +<!--BE924775AF997C78E040007F010017BF--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME> +<!--BE924775AF997C78E040007F010017BF--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--BE924775AF997C78E040007F010017BF--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--BE924775AF997C78E040007F010017BF--></AD_TEXTINTERFACES> + +<!--BE924775AF9C7C78E040007F010017BF--><AD_TEXTINTERFACES> +<!--BE924775AF9C7C78E040007F010017BF--> <AD_TEXTINTERFACES_ID><![CDATA[BE924775AF9C7C78E040007F010017BF]]></AD_TEXTINTERFACES_ID> +<!--BE924775AF9C7C78E040007F010017BF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--BE924775AF9C7C78E040007F010017BF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--BE924775AF9C7C78E040007F010017BF--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--BE924775AF9C7C78E040007F010017BF--> <TEXT><![CDATA[Actual Payment Out]]></TEXT> +<!--BE924775AF9C7C78E040007F010017BF--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME> +<!--BE924775AF9C7C78E040007F010017BF--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--BE924775AF9C7C78E040007F010017BF--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--BE924775AF9C7C78E040007F010017BF--></AD_TEXTINTERFACES> + +<!--BE924775AF9F7C78E040007F010017BF--><AD_TEXTINTERFACES> +<!--BE924775AF9F7C78E040007F010017BF--> <AD_TEXTINTERFACES_ID><![CDATA[BE924775AF9F7C78E040007F010017BF]]></AD_TEXTINTERFACES_ID> +<!--BE924775AF9F7C78E040007F010017BF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--BE924775AF9F7C78E040007F010017BF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--BE924775AF9F7C78E040007F010017BF--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--BE924775AF9F7C78E040007F010017BF--> <TEXT><![CDATA[Actual Payment In]]></TEXT> +<!--BE924775AF9F7C78E040007F010017BF--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME> +<!--BE924775AF9F7C78E040007F010017BF--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--BE924775AF9F7C78E040007F010017BF--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--BE924775AF9F7C78E040007F010017BF--></AD_TEXTINTERFACES> + <!--BF1A576214F74016BB85037D201AB974--><AD_TEXTINTERFACES> <!--BF1A576214F74016BB85037D201AB974--> <AD_TEXTINTERFACES_ID><![CDATA[BF1A576214F74016BB85037D201AB974]]></AD_TEXTINTERFACES_ID> <!--BF1A576214F74016BB85037D201AB974--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -2772,17 +2805,6 @@ <!--DB2B268442884A5F8673F04A433EBC11--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--DB2B268442884A5F8673F04A433EBC11--></AD_TEXTINTERFACES> -<!--DB502BB7F55E41FC8BEAAB244DB25E5F--><AD_TEXTINTERFACES> -<!--DB502BB7F55E41FC8BEAAB244DB25E5F--> <AD_TEXTINTERFACES_ID><![CDATA[DB502BB7F55E41FC8BEAAB244DB25E5F]]></AD_TEXTINTERFACES_ID> -<!--DB502BB7F55E41FC8BEAAB244DB25E5F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--DB502BB7F55E41FC8BEAAB244DB25E5F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--DB502BB7F55E41FC8BEAAB244DB25E5F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--DB502BB7F55E41FC8BEAAB244DB25E5F--> <TEXT><![CDATA[Paying To]]></TEXT> -<!--DB502BB7F55E41FC8BEAAB244DB25E5F--> <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME> -<!--DB502BB7F55E41FC8BEAAB244DB25E5F--> <ISUSED><![CDATA[Y]]></ISUSED> -<!--DB502BB7F55E41FC8BEAAB244DB25E5F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> -<!--DB502BB7F55E41FC8BEAAB244DB25E5F--></AD_TEXTINTERFACES> - <!--DB98F20D5C2B4F3F9D5A01B27F9E4946--><AD_TEXTINTERFACES> <!--DB98F20D5C2B4F3F9D5A01B27F9E4946--> <AD_TEXTINTERFACES_ID><![CDATA[DB98F20D5C2B4F3F9D5A01B27F9E4946]]></AD_TEXTINTERFACES_ID> <!--DB98F20D5C2B4F3F9D5A01B27F9E4946--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 86fe6f8c5c29 -r cd923b317af4 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html Wed Apr 25 20:29:57 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html Sat Apr 28 02:10:22 2012 +0200 @@ -882,7 +882,7 @@ <!-- Line 1 --> <tr> - <td class="TitleCell"><span name="lblP" id="lblPPayingTo" class="LabelText">Paying To</span><span name="lblR" id="lblRReceivingFrom" class="LabelText">Receiving From</span></td> + <td class="TitleCell"><span name="lblP" id="lblPPayingTo" class="LabelText">To Be Paid To</span><span name="lblR" id="lblRReceivingFrom" class="LabelText">Received From</span></td> <td class="TextBox_ContentCell" colspan="2"><input class="readonly dojoValidateValid TextBox_TwoCells_width" type="text" name="inpBusinessPartner" value="" id="paramBusinessPartner"></input> <input type="hidden" name="inpBusinessPartnerId" value="" id="paramBusinessPartnerId"></input></td> <td class="TitleCell"><span class="LabelText" name="lblR" id="lblRCustomerBalance">Customer Balance</span></td> @@ -904,7 +904,7 @@ <!-- Line 2 --> <tr> - <td class="TitleCell"><span class="LabelText">Amount</span></td> + <td class="TitleCell"><span name="lblP" id="lblPActualPaymentOut" class="LabelText">Actual Payment Out</span><span name="lblR" id="lblRActualPaymentIn" class="LabelText">Actual Payment In</span></td> <td class="TextBox_btn_ContentCell"> <table border="0" cellspacing="0" cellpadding="0" summary="" style="padding-top: 0px;"> <tr> diff -r 86fe6f8c5c29 -r cd923b317af4 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 Wed Apr 25 20:29:57 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Sat Apr 28 02:10:22 2012 +0200 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.16162]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.16243]]></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 86fe6f8c5c29 -r cd923b317af4 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 Wed Apr 25 20:29:57 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Apr 28 02:10:22 2012 +0200 @@ -7,7 +7,7 @@ <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.16162]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.16243]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 86fe6f8c5c29 -r cd923b317af4 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 Wed Apr 25 20:29:57 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Sat Apr 28 02:10:22 2012 +0200 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface Application]]></NAME> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.16162]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.16243]]></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 86fe6f8c5c29 -r cd923b317af4 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 Wed Apr 25 20:29:57 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Apr 28 02:10:22 2012 +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.16162]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.16243]]></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.16162]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.16243]]></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.16162]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.16243]]></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.16162]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.16243]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 86fe6f8c5c29 -r cd923b317af4 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml Wed Apr 25 20:29:57 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml Sat Apr 28 02:10:22 2012 +0200 @@ -45,7 +45,7 @@ <!--FF8081813157AED2013157BE93460020--> <DESCRIPTION><![CDATA[Maintains ui personalization records]]></DESCRIPTION> <!--FF8081813157AED2013157BE93460020--> <HELP><![CDATA[Openbravo allows the customization of grid and form views. Customize windows and form views are stored once saved in the Window Personalization window.]]></HELP> <!--FF8081813157AED2013157BE93460020--> <WINDOWTYPE><![CDATA[M]]></WINDOWTYPE> -<!--FF8081813157AED2013157BE93460020--> <ISSOTRX><![CDATA[N]]></ISSOTRX> +<!--FF8081813157AED2013157BE93460020--> <ISSOTRX><![CDATA[Y]]></ISSOTRX> <!--FF8081813157AED2013157BE93460020--> <PROCESSING><![CDATA[N]]></PROCESSING> <!--FF8081813157AED2013157BE93460020--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> <!--FF8081813157AED2013157BE93460020--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> diff -r 86fe6f8c5c29 -r cd923b317af4 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js Wed Apr 25 20:29:57 2012 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js Sat Apr 28 02:10:22 2012 +0200 @@ -148,7 +148,7 @@ this.valueMap = {}; this.valueMap[value] = ''; return ''; - } else if (!this.valueMap[value]) { + } else if (!this.valueMap[value] && OB.Utilities.isUUID(value)) { return ''; } } diff -r 86fe6f8c5c29 -r cd923b317af4 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js Wed Apr 25 20:29:57 2012 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js Sat Apr 28 02:10:22 2012 +0200 @@ -909,4 +909,18 @@ // is a reserved javascript word OB.Utilities.getValue = function (object, property) { return object[property]; +}; + +/* This function will return true if it receives a string parameter, and + * which complies with the OB UUID format (that is, its a + * hexadecimal number of length 32) + */ +OB.Utilities.isUUID = function(object) { + if(typeof object !=='string'){ + return false; + } + if(object.length!==32){ + return false; + } + return (/[A-Fa-f0-9]{32,32}/).test(object); }; \ No newline at end of file diff -r 86fe6f8c5c29 -r cd923b317af4 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js Wed Apr 25 20:29:57 2012 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js Sat Apr 28 02:10:22 2012 +0200 @@ -231,7 +231,7 @@ // to initialize an instance. // openView: function (viewName, params, state) { - + var recentObjProperties; params = params || {}; // only add closable views to the recent items, this prevents the workspace @@ -248,7 +248,7 @@ params.viewId = viewName; } //If recents receives null in params the tab is not added to the recent list - var recentObjProperties = null; + recentObjProperties = null; if (params.addToRecents === undefined || params.addToRecents === null || params.addToRecents === true) { // add and set a default icon recentObjProperties = isc.addProperties({ diff -r 86fe6f8c5c29 -r cd923b317af4 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Wed Apr 25 20:29:57 2012 +0200 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Sat Apr 28 02:10:22 2012 +0200 @@ -6,7 +6,7 @@ <!--D393BE6F22BB44B7B728259B34FC795A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--D393BE6F22BB44B7B728259B34FC795A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--D393BE6F22BB44B7B728259B34FC795A--> <NAME><![CDATA[HTML Widget]]></NAME> -<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.16162]]></VERSION> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.16243]]></VERSION> <!--D393BE6F22BB44B7B728259B34FC795A--> <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION> <!--D393BE6F22BB44B7B728259B34FC795A--> <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP> <!--D393BE6F22BB44B7B728259B34FC795A--> <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL> diff -r 86fe6f8c5c29 -r cd923b317af4 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml ------------------------------------------------------------------------------ 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
