details: https://code.openbravo.com/erp/devel/main/rev/8fa884bc4856 changeset: 18018:8fa884bc4856 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri Sep 21 12:17:06 2012 +0200 summary: Fixes issue 21593: Performance issue opening the Add Payment window on Purchase Invoices
details: https://code.openbravo.com/erp/devel/main/rev/4457b10d26e6 changeset: 18019:4457b10d26e6 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri Sep 21 12:33:54 2012 +0200 summary: Fixes issue 21709: Tab title is updated when a record is saved in the grid view The fix of the issue 21352 caused the updateTabTitle function to be executed when the grid was still in edit mode, so the '*' in the tab title remained. Removing the code that caused this issue was not possible, because then the original issue was reproducible. Instead, an extra call to updateTabTitle is done when the records exists the edit mode. details: https://code.openbravo.com/erp/devel/main/rev/891837fb519c changeset: 18020:891837fb519c user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Fri Sep 21 08:33:38 2012 +0200 summary: fixes issue 21545: Generate Invoice from Receipt should inform about the price used details: https://code.openbravo.com/erp/devel/main/rev/88d8eb6ceadb changeset: 18021:88d8eb6ceadb user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Sep 24 09:49:08 2012 +0200 summary: Fixes issue 21723: Shorcuts work again while editing the grid If the arrow down, arrow up or enter key was pressed while editing the grid but without any actual changes done, its shortcuts were not being executed. This happened because this keys trigger a validation on the changed fields, and it was not being checked in they were not null. details: https://code.openbravo.com/erp/devel/main/rev/cf7cdf44ef28 changeset: 18022:cf7cdf44ef28 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Wed Sep 19 16:33:04 2012 +0200 summary: Fixed Issue 21423 : Default product category is not respected details: https://code.openbravo.com/erp/devel/main/rev/d3257883657b changeset: 18023:d3257883657b user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Sep 19 19:40:02 2012 +0200 summary: Fixes issue 19252, Fixes issue 19224: Changed labels. details: https://code.openbravo.com/erp/devel/main/rev/26527db694a9 changeset: 18024:26527db694a9 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Fri Sep 21 14:36:30 2012 +0200 summary: Fixed bug 21710 AcctServerbackground leave reconciliations in not balance, when they are balanced details: https://code.openbravo.com/erp/devel/main/rev/4c4431d17dbd changeset: 18025:4c4431d17dbd user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Sep 24 13:00:34 2012 +0200 summary: Fixes issue 21687: Alerts are not executed when the system is being rebuilt If the system is being rebuilt, there is no point in executing the alerts, so now if the system is being rebuilt using the ERP, the alerts will not be executed. details: https://code.openbravo.com/erp/devel/main/rev/e7db31838950 changeset: 18026:e7db31838950 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Sep 24 16:32:34 2012 +0200 summary: fixes issue 21729: int-dbconsistency fails int-dbcons details: https://code.openbravo.com/erp/devel/main/rev/325afce7f3a6 changeset: 18027:325afce7f3a6 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Mon Sep 24 17:47:45 2012 +0200 summary: Fixes issue 21694: Not possible to complete an invoice if a rol has not access to Financial Account window details: https://code.openbravo.com/erp/devel/main/rev/4ac90ad8e2dc changeset: 18028:4ac90ad8e2dc user: David Baz Fayos <david.baz <at> openbravo.com> date: Mon Sep 24 18:34:51 2012 +0200 summary: Fixed issue 21718: Focus is set after go back to 'Alert Management' tab details: https://code.openbravo.com/erp/devel/main/rev/681ece97a159 changeset: 18029:681ece97a159 user: David Baz Fayos <david.baz <at> openbravo.com> date: Mon Sep 24 19:06:02 2012 +0200 summary: Fixed issue 21717: 'Attach file' popup form now gets the focus when is drawn details: https://code.openbravo.com/erp/devel/main/rev/6e892b588e49 changeset: 18030:6e892b588e49 user: David Baz Fayos <david.baz <at> openbravo.com> date: Mon Sep 24 19:26:43 2012 +0200 summary: Fixed issue 21720: Now first focused item is properly set in 'About' popup details: https://code.openbravo.com/erp/devel/main/rev/06932c2df6ca changeset: 18031:06932c2df6ca user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Tue Sep 25 08:26:44 2012 +0200 summary: Fixed bug 21665: Bank Account Format redesign The Financial Account window and Business Partner | Bank tab have the same structure Show * checkboxes hidden and deprecated. We use a list instead that can be easily extended by modularity. Added retrocompatibility for modules that use the checkboxes logic Included oncreatedefault clauses to ensure old clients are properly migrated Extracted IBAN validator to a db function Included IBAN validation in Financial Account details: https://code.openbravo.com/erp/devel/main/rev/f80e308e3177 changeset: 18032:f80e308e3177 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Mon Sep 24 13:48:56 2012 +0200 summary: Related to bug 21665: Exported sampledata before including the new changes details: https://code.openbravo.com/erp/devel/main/rev/e4335bcdfc62 changeset: 18033:e4335bcdfc62 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Mon Sep 24 14:03:19 2012 +0200 summary: Fixed issue 21665: Sampledata includes new changes related to banks details: https://code.openbravo.com/erp/devel/main/rev/84a0b15c82c5 changeset: 18034:84a0b15c82c5 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Tue Sep 25 08:29:41 2012 +0200 summary: Fixed bug 21665: fixed dbcons due to manual merge details: https://code.openbravo.com/erp/devel/main/rev/41ed8d602a12 changeset: 18035:41ed8d602a12 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Fri Sep 21 10:51:10 2012 +0200 summary: Fixes issue 21693: Invoices Tax Report shows incorrect data. details: https://code.openbravo.com/erp/devel/main/rev/29e0d401e2b2 changeset: 18036:29e0d401e2b2 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Tue Sep 25 11:13:08 2012 +0200 summary: Fixed bug 21665: related to API change fixed C_PROJECT_WON process details: https://code.openbravo.com/erp/devel/main/rev/bd01edf33b85 changeset: 18037:bd01edf33b85 user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Sep 24 17:48:49 2012 +0200 summary: Fixes issue 21068: Calls Invoicetax_rounding procedure for fixing tax amount. Contribution from fleroux. details: https://code.openbravo.com/erp/devel/main/rev/7adc453d56d6 changeset: 18038:7adc453d56d6 user: David Baz Fayos <david.baz <at> openbravo.com> date: Tue Sep 25 13:27:24 2012 +0200 summary: Fixed issue 21745: Added proper [KS] for show audit popup details: https://code.openbravo.com/erp/devel/main/rev/841d81806331 changeset: 18039:841d81806331 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Tue Sep 25 12:42:44 2012 +0200 summary: Fixes issue 19699: Account Combination window - swap AcctSchema & alias details: https://code.openbravo.com/erp/devel/main/rev/e3b100f7652d changeset: 18040:e3b100f7652d user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Tue Sep 25 13:51:29 2012 +0200 summary: Fixes issue 21736: OBSecurity Exception caused by a field definition details: https://code.openbravo.com/erp/devel/main/rev/48b1f1c225ec changeset: 18041:48b1f1c225ec user: David Baz Fayos <david.baz <at> openbravo.com> date: Tue Sep 25 16:56:41 2012 +0200 summary: Fixed issue 18938: Added Ctrl+Space+Arrow [KS] to navigate between tabs details: https://code.openbravo.com/erp/devel/main/rev/ea86dc41970f changeset: 18042:ea86dc41970f user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Sep 25 19:06:20 2012 +0200 summary: Related to Issue 21644: Solves same Issue in Shipment/Receipts. details: https://code.openbravo.com/erp/devel/main/rev/55d85c2bb554 changeset: 18043:55d85c2bb554 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue Sep 25 13:22:53 2012 +0200 summary: Fixes issue 21719: Error when reactivating Warehouse Order. details: https://code.openbravo.com/erp/devel/main/rev/229ae8415623 changeset: 18044:229ae8415623 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue Sep 25 13:25:39 2012 +0200 summary: Fixes issue 19480: There are fields to hide in Session Preferences window. details: https://code.openbravo.com/erp/devel/main/rev/c7a170e05b3f changeset: 18045:c7a170e05b3f user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu Sep 20 17:54:18 2012 +0200 summary: Fixes Issue 0017411: Incorrect behaviour of links in query/list widgets. In query/list widgets, when links are attached the Entity was used as reference to navigate to the record. Now modified it to use the Tab attached irrespective of the Entity. details: https://code.openbravo.com/erp/devel/main/rev/f8feb3f59b04 changeset: 18046:f8feb3f59b04 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Sep 26 09:56:30 2012 +0200 summary: Fixed bug 21475: Deactivate two Movement Types: Work Order + Work Order - details: https://code.openbravo.com/erp/devel/main/rev/1b88460f1657 changeset: 18047:1b88460f1657 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Sep 26 10:36:01 2012 +0200 summary: Fixed bug 19743: Accounting Schema fields and tab hidden as advanced feature Hidden Fields: + Accounting Schema | Account Schema Tables.Accounting Template + Accounting Schema | Account Schema Tables.SQL description Hidden Tab: + Accounting Schema | Process details: https://code.openbravo.com/erp/devel/main/rev/fd9a9c556093 changeset: 18048:fd9a9c556093 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed Sep 26 10:47:44 2012 +0200 summary: Fixes issue 21716: REST Webservice works with organization '*' The EntityResolver.getOrgIds has been modified, because prior to the fix if it was called with the organization '0', it returned '0' instead of the natural true. And now, if it is called for an organization other than EntityResolver.organization, it returns a recomputed natural true (orgNaturalTree is the natural the of EntityResolver.organization). details: https://code.openbravo.com/erp/devel/main/rev/cce05b691662 changeset: 18049:cce05b691662 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed Sep 26 12:55:20 2012 +0200 summary: Related to issue 21716: Reverted fix because it breaks install.source details: https://code.openbravo.com/erp/devel/main/rev/22cb1b467fde changeset: 18050:22cb1b467fde user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed Sep 26 14:15:54 2012 +0200 summary: Fixes issue 21764: Only the proper records are shown after completing an order The problem was caused by the fix of the issue 21437. Some logic was added to ensure that the recently created records were shown after completing a process, even if the do not comply with the filters. The problem was that this was done on a tab level, without taking into account that their parent record might not be the same. This has been fixed, and only the child records of the current parent record are shown. details: https://code.openbravo.com/erp/devel/main/rev/74734fd26fcf changeset: 18051:74734fd26fcf user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Sep 26 17:09:24 2012 +0200 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/8a0aed9bd90d changeset: 18052:8a0aed9bd90d user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed Sep 26 17:26:55 2012 +0200 summary: Related to issue 21422: Code refactored so isAccessible is a MenuOption method details: https://code.openbravo.com/erp/devel/main/rev/7ce4dfeab79a changeset: 18053:7ce4dfeab79a user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Sep 26 10:18:22 2012 +0200 summary: Fixed issue 21623 Sample data (F&B client) monthly update details: https://code.openbravo.com/erp/devel/main/rev/540a94d0cfd2 changeset: 18054:540a94d0cfd2 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Sep 26 10:41:34 2012 +0200 summary: Fixed bug 21651 Changed the chart of accounts of F&B España details: https://code.openbravo.com/erp/devel/main/rev/f00a4d59bf8e changeset: 18055:f00a4d59bf8e user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Sep 26 10:50:52 2012 +0200 summary: Fixed bug 21564 Change Account Sign setup on Acc. Depreciation accounts details: https://code.openbravo.com/erp/devel/main/rev/5ccca2d6ab45 changeset: 18056:5ccca2d6ab45 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Sep 26 16:53:21 2012 +0200 summary: Related to Issue21623: Removes Matching Algorithm. details: https://code.openbravo.com/erp/devel/main/rev/07883e1d0fe4 changeset: 18057:07883e1d0fe4 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Wed Sep 26 13:56:23 2012 +0200 summary: Fixes issue 21638: hide Accounting Dimension menu entry details: https://code.openbravo.com/erp/devel/main/rev/8400af3c6115 changeset: 18058:8400af3c6115 user: David Baz Fayos <david.baz <at> openbravo.com> date: Wed Sep 26 21:04:54 2012 +0200 summary: Fixed issue 21699: Now 'ESC' while in grid filters moves the focus to the first grid row (if there is no anyone already selected) details: https://code.openbravo.com/erp/devel/main/rev/9d212ece87cb changeset: 18059:9d212ece87cb user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Wed Sep 26 14:22:55 2012 +0200 summary: Fixes issue 21716: REST Webservices can update records from '*' organization details: https://code.openbravo.com/erp/devel/main/rev/f11aaaf1781e changeset: 18060:f11aaaf1781e user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Sep 25 13:12:50 2012 +0200 summary: Fixes issue 21371: Allows to WriteOff the whole Payment and fixes an Issue when voiding a Payment with all amount writeoff. details: https://code.openbravo.com/erp/devel/main/rev/c2224e800e33 changeset: 18061:c2224e800e33 user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Sep 27 11:57:35 2012 +0200 summary: Fixes issue 21746: Modified the SQL query definition. details: https://code.openbravo.com/erp/devel/main/rev/4b455cfbbff4 changeset: 18062:4b455cfbbff4 user: David Miguelez <david.miguelez <at> openbravo.com> date: Tue Sep 25 17:49:31 2012 +0200 summary: Fixes issue 21742: FIN_orig_payment_schedule and FIN_orig_paym_scheddetail tables are deprecated. All foreign keys should be ON DELETE CASCADE. There should not be Link to Parent columns. details: https://code.openbravo.com/erp/devel/main/rev/ba500be63eda changeset: 18063:ba500be63eda user: David Baz Fayos <david.baz <at> openbravo.com> date: Thu Sep 27 15:25:56 2012 +0200 summary: Related to issue 19728: Do more JS code formatting details: https://code.openbravo.com/erp/devel/main/rev/715dc4281355 changeset: 18064:715dc4281355 user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Sep 27 17:46:22 2012 +0200 summary: Fixes Issue 21734: Error to unprocess a payment when description is very large details: https://code.openbravo.com/erp/devel/main/rev/ea59c08f2c51 changeset: 18065:ea59c08f2c51 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu Sep 27 19:13:09 2012 +0200 summary: Fixes issue 21780: Added missing not null check details: https://code.openbravo.com/erp/devel/main/rev/3b92f8d1358a changeset: 18066:3b92f8d1358a user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu Sep 27 19:37:28 2012 +0200 summary: Fixes issue 21741: Pick&Execute under some circumstances is not retrieving the selected record ID The root cause of this problem is that the context information was getting retrieved from the header tab, instead of the tab that was selected when the pick a nd execute window was selected. Another change has been done so that that same tab will be selected when the P&E window is closed, otherwise the record could not be refreshed, because the row ID saved in the window belong to the tab that was focused when the P&E window was opened. details: https://code.openbravo.com/erp/devel/main/rev/6d2f8cffd4b1 changeset: 18067:6d2f8cffd4b1 user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Sep 28 14:02:51 2012 +0200 summary: CI: update AD_MODULE to version 18066 diffstat: .hgsigs | 1 + .hgtags | 1 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 12 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html | 66 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 41 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 18 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js | 13 +- 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_PREFERENCE.xml | 6 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java | 86 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java | 35 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/BusinessPartnerBankAccountHandler.java | 87 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js | 10 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 16 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 24 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js | 4 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-keyboard-manager.js | 33 +- 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.querylist/web/org.openbravo.client.querylist/js/ob-querylist-widget.js | 3 +- 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/configScript.xml | 4 - 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 | 48511 +++++++++- referencedata/sampledata/QA_Testing.xml | 184 +- src-db/database/model/functions/C_CURRENCY_CONVERT_RATE.xml | 66 + src-db/database/model/functions/C_GET_IBAN_DISPLAYED_ACCOUNT.xml | 82 + src-db/database/model/functions/C_PROJECT_WON.xml | 4 +- src-db/database/model/functions/M_INOUT_CANCEL.xml | 1 + src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml | 3 + src-db/database/model/tables/C_BP_BANKACCOUNT.xml | 12 +- src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT.xml | 21 +- src-db/database/model/tables/FIN_ORIG_PAYMENT_SCHEDULE.xml | 14 +- src-db/database/model/tables/FIN_ORIG_PAYM_SCHEDDETAIL.xml | 8 +- src-db/database/model/triggers/C_BP_BANKACCOUNTIBAN_TRG.xml | 83 +- src-db/database/model/triggers/C_INVOICELINETAX_TRG.xml | 20 +- src-db/database/model/triggers/FIN_FINANCIAL_ACCOUNT_TRG2.xml | 34 +- src-db/database/sourcedata/AD_COLUMN.xml | 213 +- src-db/database/sourcedata/AD_ELEMENT.xml | 60 +- src-db/database/sourcedata/AD_FIELD.xml | 336 +- src-db/database/sourcedata/AD_FIELDGROUP.xml | 9 + src-db/database/sourcedata/AD_MENU.xml | 2 +- src-db/database/sourcedata/AD_MESSAGE.xml | 123 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_PROCESS.xml | 5 +- src-db/database/sourcedata/AD_REFERENCE.xml | 12 + src-db/database/sourcedata/AD_REF_LIST.xml | 52 +- src-db/database/sourcedata/AD_TAB.xml | 2 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 22 + src-test/org/openbravo/test/AllTests.java | 2 - src/org/openbravo/dal/xml/EntityResolver.java | 11 +- src/org/openbravo/erpCommon/ad_callouts/SL_TaxCategory_Org.java | 45 + src/org/openbravo/erpCommon/ad_forms/About.html | 2 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 3 +- src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html | 32 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoicePurchase.jrxml | 29 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoicePurchaseForeign.jrxml | 19 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceSale.jrxml | 21 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceSaleForeign.jrxml | 19 +- 102 files changed, 49637 insertions(+), 1091 deletions(-) diffs (truncated from 66586 to 300 lines): diff -r 38dcd1299a25 -r 6d2f8cffd4b1 .hgsigs --- a/.hgsigs Fri Sep 21 09:17:06 2012 +0200 +++ b/.hgsigs Fri Sep 28 14:02:51 2012 +0200 @@ -79,3 +79,4 @@ a934dbe3f5fad31293f1a5a2cc6f2ca630fd0f31 0 iEYEABECAAYFAlAGLkgACgkQCX/oGf+2qkOu/ACfYJXb8JwO69uZVxLM2u6BHOwQHj4AoJ08uNluEH3iB94pfMnCsD2URUX8 110a8fe1328f4a9e7e5ff1179ace3e529286cfce 0 iEYEABECAAYFAlBN5pQACgkQCX/oGf+2qkN9ZACZAZXSsoFWJoDLsoqPj9aGd6QiEjoAoP79Il22Awt4fupQo3hqZL+JOYd9 3ef42df4953f5813543c5d1cb2b323d13c8c0359 0 iEYEABECAAYFAlA/cv4ACgkQCX/oGf+2qkMT3gCgjbewzyw3X/1MOZjn6V5P3HqrQtoAoPdsUsBzwVelyg7jpbUhhzGW5Vbz +7643bde3a4855fc35ddf7269a221ba0e77863a75 0 iEYEABECAAYFAlBgQyAACgkQCX/oGf+2qkNE2ACfb7Xzd4dq5VTeUnFo9VSsPqoQHtsAn063Puz1dhXpBsvhgkpbDV7fXiR6 diff -r 38dcd1299a25 -r 6d2f8cffd4b1 .hgtags --- a/.hgtags Fri Sep 21 09:17:06 2012 +0200 +++ b/.hgtags Fri Sep 28 14:02:51 2012 +0200 @@ -90,3 +90,4 @@ 33314611486b1823d42d1059110369d7705ef13f 3.0MP13 0389ecbdda642f959d524d644f1a73a3bc27d57a 3.0MP13.1 35168ddf12d33e94aeb18d2c79c6d9255a26c742 3.0MP14 +bf2e6628cebd62b56796fe8433c35378d516e375 3.0MP15 diff -r 38dcd1299a25 -r 6d2f8cffd4b1 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Fri Sep 21 09:17:06 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Fri Sep 28 14:02:51 2012 +0200 @@ -7820,9 +7820,9 @@ <!--8420366B8591339CE040007F010023A9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--8420366B8591339CE040007F010023A9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--8420366B8591339CE040007F010023A9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--8420366B8591339CE040007F010023A9--> <NAME><![CDATA[Account No.]]></NAME> -<!--8420366B8591339CE040007F010023A9--> <DESCRIPTION><![CDATA[Account Number]]></DESCRIPTION> -<!--8420366B8591339CE040007F010023A9--> <HELP><![CDATA[The Account Number indicates the Number assigned to this account]]></HELP> +<!--8420366B8591339CE040007F010023A9--> <NAME><![CDATA[Displayed Account]]></NAME> +<!--8420366B8591339CE040007F010023A9--> <DESCRIPTION><![CDATA[Text that will identify this bank account]]></DESCRIPTION> +<!--8420366B8591339CE040007F010023A9--> <HELP><![CDATA[Text that will identify this bank account]]></HELP> <!--8420366B8591339CE040007F010023A9--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--8420366B8591339CE040007F010023A9--> <AD_TAB_ID><![CDATA[5B9941AC1F6A4529A76FCA7CDA0A7D7A]]></AD_TAB_ID> <!--8420366B8591339CE040007F010023A9--> <AD_COLUMN_ID><![CDATA[828EE0AE80515FA1E040007F010067C7]]></AD_COLUMN_ID> @@ -8341,9 +8341,9 @@ <!--8420366B85A3339CE040007F010023A9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--8420366B85A3339CE040007F010023A9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--8420366B85A3339CE040007F010023A9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--8420366B85A3339CE040007F010023A9--> <NAME><![CDATA[Swift code]]></NAME> -<!--8420366B85A3339CE040007F010023A9--> <DESCRIPTION><![CDATA[Swift Code (Society of Worldwide Interbank Financial Telecommunications)]]></DESCRIPTION> -<!--8420366B85A3339CE040007F010023A9--> <HELP><![CDATA[The SWIFT code is an identifier of a Bank]]></HELP> +<!--8420366B85A3339CE040007F010023A9--> <NAME><![CDATA[SWIFT Code]]></NAME> +<!--8420366B85A3339CE040007F010023A9--> <DESCRIPTION><![CDATA[SWIFT Code (Society of Worldwide Interbank Financial Telecommunications)]]></DESCRIPTION> +<!--8420366B85A3339CE040007F010023A9--> <HELP><![CDATA[The SWIFT Code is an identifier of a Bank]]></HELP> <!--8420366B85A3339CE040007F010023A9--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> <!--8420366B85A3339CE040007F010023A9--> <AD_TAB_ID><![CDATA[5B9941AC1F6A4529A76FCA7CDA0A7D7A]]></AD_TAB_ID> <!--8420366B85A3339CE040007F010023A9--> <AD_COLUMN_ID><![CDATA[828EE0AE804A5FA1E040007F010067C7]]></AD_COLUMN_ID> diff -r 38dcd1299a25 -r 6d2f8cffd4b1 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Sep 21 09:17:06 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Sep 28 14:02:51 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.17839]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.18066]]></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 38dcd1299a25 -r 6d2f8cffd4b1 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 Sep 21 09:17:06 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Sep 28 14:02:51 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.17839]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.18066]]></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.17839]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.18066]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 38dcd1299a25 -r 6d2f8cffd4b1 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html Fri Sep 21 09:17:06 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html Fri Sep 28 14:02:51 2012 +0200 @@ -56,17 +56,17 @@ function validate(action) { var frm = document.frmMain; if (action=='openprocess') { - if (isMulticurrencyTxn()) { - if (frm.inpActualConverted.value==null || frm.inpActualConverted.value=="") { - setWindowElementFocus(frm.inpActualConverted); - showJSMessage(7); - return false; - } else if (frm.inpExchangeRate.value==null || frm.inpExchangeRate.value=="") { - setWindowElementFocus(frm.inpExchangeRate); - showJSMessage(7); - return false; - } - } + if (isMulticurrencyTxn()) { + if (frm.inpActualConverted.value==null || frm.inpActualConverted.value=="") { + setWindowElementFocus(frm.inpActualConverted); + showJSMessage(7); + return false; + } else if (frm.inpExchangeRate.value==null || frm.inpExchangeRate.value=="") { + setWindowElementFocus(frm.inpExchangeRate); + showJSMessage(7); + return false; + } + } if (frm.inpDocNumber.value==null || frm.inpDocNumber.value=="") { setWindowElementFocus(frm.inpDocNumber); showJSMessage(7); @@ -150,7 +150,43 @@ document.getElementById('client_bottom').style.display = 'block'; } -function updateData(key, mark, drivenByGrid) { +function updateAll(drivenByGrid) { + var frm = document.frmMain; + var chk = frm.inpScheduledPaymentDetailId; + var recordAmount, i; + + frm.inpExpectedPayment.value = applyFormat('0'); + if (isGLItemEnabled) { + frm.inpExpectedPayment.value = frm.inpGLSumAmount.value || applyFormat('0'); + } + if (!chk) { + return; + } else if (!chk.length) { + if (!chk.checked) { + recordAmount = frm.elements["inpRecordAmt" + chk.value].value; + frm.inpExpectedPayment.value = add(frm.inpExpectedPayment.value, recordAmount); + } + updateData(chk.value, chk.checked, drivenByGrid); + } else { + var total = chk.length; + for (i = 0; i < total; i++) { + if (!chk[i].checked) { + recordAmount = frm.elements["inpRecordAmt" + chk[i].value].value; + frm.inpExpectedPayment.value = add(frm.inpExpectedPayment.value, recordAmount); + } + if (!drivenByGrid || drivenByGrid == false){ + updateData(chk[i].value, chk[i].checked, drivenByGrid,true); + } + else{ + updateData(chk[i].value, chk[i].checked, drivenByGrid,false); + } + } + updateTotal(); + } + return true; +} + +function updateData(key, mark, drivenByGrid,all) { if (mark==null) mark=false; updateReadOnly(key, mark); var paymentAmount = document.frmMain.elements['inpPaymentAmount'+key]; @@ -190,7 +226,9 @@ } } } - updateTotal(); + if(!all){ + updateTotal(); + } return true; } @@ -384,7 +422,7 @@ document.getElementById('paramStrAmountwriteoff').value = applyFormatJSToOBMasked(resp.awriteoff, resp.formatOutput); } else{ - document.getElementById('paramStrtypewriteoff').value = ''; + document.getElementById('paramStrtypewriteoff').value = ''; document.getElementById('paramStrAmountwriteoff').value = ''; } updateDifference(); diff -r 38dcd1299a25 -r 6d2f8cffd4b1 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 Sep 21 09:17:06 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java Fri Sep 28 14:02:51 2012 +0200 @@ -186,29 +186,30 @@ String invoiceDocCategory = ""; try { invoiceDocCategory = invoice.getDocumentType().getDocumentCategory(); + + /* + * Print a grid popup in case of credit payment + */ + // If the invoice grand total is ZERO or already has payments (due to + // payment method automation) or the business partner does not have a default financial + // account defined or invoice's payment method is not inside BP's financial + // account do not cancel credit + if (BigDecimal.ZERO.compareTo(invoice.getGrandTotalAmount()) != 0 + && isPaymentMethodConfigured(invoice) + && !isInvoiceWithPayments(invoice) + && (AcctServer.DOCTYPE_ARInvoice.equals(invoiceDocCategory) || AcctServer.DOCTYPE_APInvoice + .equals(invoiceDocCategory))) { + creditPayments = dao.getCustomerPaymentsWithCredit(invoice.getOrganization(), + invoice.getBusinessPartner(), invoice.isSalesTransaction()); + if (creditPayments != null && !creditPayments.isEmpty()) { + printPageCreditPaymentGrid(response, vars, strC_Invoice_ID, strdocaction, strTabId, + strC_Invoice_ID, strdocaction, strWindowId, strTabId, invoice.getInvoiceDate(), + strOrg); + } + } } finally { OBContext.restorePreviousMode(); } - /* - * Print a grid popup in case of credit payment - */ - // If the invoice grand total is ZERO or already has payments (due to - // payment method automation) or the business partner does not have a default financial - // account defined or invoice's payment method is not inside BP's financial - // account do not cancel credit - if (BigDecimal.ZERO.compareTo(invoice.getGrandTotalAmount()) != 0 - && isPaymentMethodConfigured(invoice) - && !isInvoiceWithPayments(invoice) - && (AcctServer.DOCTYPE_ARInvoice.equals(invoiceDocCategory) || AcctServer.DOCTYPE_APInvoice - .equals(invoiceDocCategory))) { - creditPayments = dao.getCustomerPaymentsWithCredit(invoice.getOrganization(), - invoice.getBusinessPartner(), invoice.isSalesTransaction()); - if (creditPayments != null && !creditPayments.isEmpty()) { - printPageCreditPaymentGrid(response, vars, strC_Invoice_ID, strdocaction, strTabId, - strC_Invoice_ID, strdocaction, strWindowId, strTabId, invoice.getInvoiceDate(), - strOrg); - } - } executePayments(response, vars, strWindowId, strTabId, strC_Invoice_ID, strOrg); } diff -r 38dcd1299a25 -r 6d2f8cffd4b1 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java Fri Sep 21 09:17:06 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java Fri Sep 28 14:02:51 2012 +0200 @@ -240,8 +240,7 @@ BigDecimal paymentDetailAmount = selectedPaymentScheduleDetailsAmounts .get(paymentScheduleDetail.getId()); // If detail to be added is zero amount, skip it - if (paymentDetailAmount.signum() == 0 - && paymentScheduleDetail.getWriteoffAmount().signum() == 0) { + if (paymentDetailAmount.signum() == 0 && !isWriteoff) { continue; } BigDecimal amountDifference = paymentScheduleDetail.getAmount().subtract( diff -r 38dcd1299a25 -r 6d2f8cffd4b1 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Fri Sep 21 09:17:06 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Fri Sep 28 14:02:51 2012 +0200 @@ -646,7 +646,7 @@ final String creditMsg = Utility.messageBD(new DalConnectionProvider(), "APRM_InvoiceDescUsedCredit", vars.getLanguage()); if (creditMsg != null) { - final StringBuffer newDesc = new StringBuffer(); + StringBuffer newDesc = new StringBuffer(); for (final String line : invDesc.split("\n")) { if (!line.startsWith(creditMsg.substring(0, creditMsg.lastIndexOf("%s")))) { newDesc.append(line); @@ -654,6 +654,10 @@ newDesc.append("\n"); } } + if (newDesc.length() > 255) { + newDesc = newDesc.delete(251, newDesc.length()); + newDesc = newDesc.append("...\n"); + } invoice.setDescription(newDesc.toString()); } } @@ -843,10 +847,12 @@ .getInvoicePaymentSchedule() .getFINPaymentScheduleDetailInvoicePaymentScheduleList()) { if (invScheDetail.getPaymentDetails() == null) { - outStandingAmt = outStandingAmt.add(invScheDetail.getAmount()); + outStandingAmt = outStandingAmt.add(invScheDetail.getAmount()).add( + invScheDetail.getWriteoffAmount()); removedPDS.add(invScheDetail); } else if (invScheDetail.equals(paymentScheduleDetail)) { - outStandingAmt = outStandingAmt.add(invScheDetail.getAmount()); + outStandingAmt = outStandingAmt.add(invScheDetail.getAmount()).add( + invScheDetail.getWriteoffAmount()); paymentScheduleDetail.setCanceled(true); } invoiceDocNos.add(paymentScheduleDetail.getInvoicePaymentSchedule() @@ -866,10 +872,12 @@ .getOrderPaymentSchedule() .getFINPaymentScheduleDetailOrderPaymentScheduleList()) { if (ordScheDetail.getPaymentDetails() == null) { - outStandingAmt = outStandingAmt.add(ordScheDetail.getAmount()); + outStandingAmt = outStandingAmt.add(ordScheDetail.getAmount()).add( + ordScheDetail.getWriteoffAmount()); removedPDS.add(ordScheDetail); } else if (ordScheDetail.equals(paymentScheduleDetail)) { - outStandingAmt = outStandingAmt.add(ordScheDetail.getAmount()); + outStandingAmt = outStandingAmt.add(ordScheDetail.getAmount()).add( + ordScheDetail.getWriteoffAmount()); paymentScheduleDetail.setCanceled(true); } } diff -r 38dcd1299a25 -r 6d2f8cffd4b1 modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js Fri Sep 21 09:17:06 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js Fri Sep 28 14:02:51 2012 +0200 @@ -364,13 +364,12 @@ document.getElementById('paramDifference').innerHTML = frm.inpDifference.value; ------------------------------------------------------------------------------ Got visibility? Most devs has no idea what their production app looks like. Find out how fast your code is with AppDynamics Lite. http://ad.doubleclick.net/clk;262219671;13503038;y? http://info.appdynamics.com/FreeJavaPerformanceDownload.html _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
