details: https://code.openbravo.com/erp/devel/main/rev/2d71f02d8f3b changeset: 18525:2d71f02d8f3b user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Nov 12 10:38:27 2012 +0100 summary: CI: merge back from main
details: https://code.openbravo.com/erp/devel/main/rev/2aebd20a2cf7 changeset: 18526:2aebd20a2cf7 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Mon Nov 05 13:13:27 2012 +0100 summary: Fixes issue 21795: Product selector on asset, should not restrict to products that belong to a sales price list. details: https://code.openbravo.com/erp/devel/main/rev/531ae77d6e5d changeset: 18527:531ae77d6e5d user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue Nov 06 17:54:19 2012 +0100 summary: Fixes issue 21895: Create Invoice From PO should show a warning message. details: https://code.openbravo.com/erp/devel/main/rev/76d2cbdf6d39 changeset: 18528:76d2cbdf6d39 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Thu Nov 08 13:36:24 2012 +0100 summary: Fixes issue 21722: Is impossible to create 2 invoices from one shipment. details: https://code.openbravo.com/erp/devel/main/rev/acd485beec84 changeset: 18529:acd485beec84 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Fri Oct 26 13:01:57 2012 +0200 summary: Fixes issue 21820: Wrong calculation of a journal entry under some circumstancies details: https://code.openbravo.com/erp/devel/main/rev/e2134d58e0af changeset: 18530:e2134d58e0af user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Mon Nov 12 15:47:01 2012 +0100 summary: Fixes Issue 0022267: 'Column' not shown by default in Fields. Column field not displayed by default when creating manually a field. Only when something is typed in property field, it was displayed. details: https://code.openbravo.com/erp/devel/main/rev/13c3d71a21b2 changeset: 18531:13c3d71a21b2 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Thu Nov 08 11:14:58 2012 +0100 summary: 0022131: AD_Tab_Access for inactive tabs is causing javascript errors If we mark as inactive a tab that is included in the tab_access for a particular role causes the following error when accessing to the window that includes the tab: "Cannot read property 'viewForm' of null". Added not null validation before accessing objects of view. details: https://code.openbravo.com/erp/devel/main/rev/1dfa6006195d changeset: 18532:1dfa6006195d user: Adrián Romero <adrianromero <at> openbravo.com> date: Mon Nov 12 16:53:08 2012 +0100 summary: Fixes issue 0022273: Default priceInform value in Format.xml configuration file is not correct details: https://code.openbravo.com/erp/devel/main/rev/2039706454cf changeset: 18533:2039706454cf user: Naiara Garcia <naiara.garcia <at> openbravo.com> date: Mon Nov 12 15:12:34 2012 +0100 summary: 22264: Some default accounts of General Ledger are mandatory but were set to inactive details: https://code.openbravo.com/erp/devel/main/rev/a72b44e625e7 changeset: 18534:a72b44e625e7 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Mon Nov 12 19:34:06 2012 +0100 summary: Fixed issue 22275 details: https://code.openbravo.com/erp/devel/main/rev/428e2ed70542 changeset: 18535:428e2ed70542 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Wed Nov 07 10:05:49 2012 +0100 summary: Fixes Issue 22190: Unnecessary code in ReportGeneralLedgerJournal details: https://code.openbravo.com/erp/devel/main/rev/64eab57b5609 changeset: 18536:64eab57b5609 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Wed Oct 31 16:44:30 2012 +0100 summary: Fixes Issue 22177: Empty option is available on Accounting Schema combo box details: https://code.openbravo.com/erp/devel/main/rev/9d488c89c09e changeset: 18537:9d488c89c09e user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Wed Nov 07 15:33:57 2012 +0100 summary: Fixes Issue 22106: NPE in purchase invoice while adding payment details: https://code.openbravo.com/erp/devel/main/rev/a08511286b67 changeset: 18538:a08511286b67 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Thu Nov 08 12:29:22 2012 +0100 summary: Fixes Issue 22004: Wrong Amortization Percent details: https://code.openbravo.com/erp/devel/main/rev/5df4320d0a69 changeset: 18539:5df4320d0a69 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Fri Nov 09 12:48:06 2012 +0100 summary: Fixes Issue 22248: Generate invoice from Receipt shows error message with uuid details: https://code.openbravo.com/erp/devel/main/rev/21ed594bb3ce changeset: 18540:21ed594bb3ce user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Nov 12 09:42:30 2012 +0100 summary: Fixes Issue 21968: Create lines from shows draft invoice in good shipment window details: https://code.openbravo.com/erp/devel/main/rev/dd819f51b6ba changeset: 18541:dd819f51b6ba user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Fri Nov 09 14:55:59 2012 +0100 summary: Fixes Issue 21971: Purchase invoice appears in create lines from popup in goods shipment details: https://code.openbravo.com/erp/devel/main/rev/d88989e6c96e changeset: 18542:d88989e6c96e user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Wed Oct 31 13:06:17 2012 +0100 summary: Fixes Issue 22029: Account Tree window should only shown Account Tree details: https://code.openbravo.com/erp/devel/main/rev/ba1589a113f8 changeset: 18543:ba1589a113f8 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Wed Nov 07 16:26:27 2012 +0100 summary: Fixed issue 22221 Status value is showed with ** in Payment Details tab details: https://code.openbravo.com/erp/devel/main/rev/5e630e9025c7 changeset: 18544:5e630e9025c7 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Fri Nov 09 14:30:48 2012 +0100 summary: Fixes Issue 21977: Copy accounts from Product Category is not working properly details: https://code.openbravo.com/erp/devel/main/rev/49a5033ab971 changeset: 18545:49a5033ab971 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Nov 12 10:42:47 2012 +0100 summary: Fixes Issue 22260: Book button in the Sales Order should go first details: https://code.openbravo.com/erp/devel/main/rev/ddaa51b1b0e1 changeset: 18546:ddaa51b1b0e1 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue Nov 13 10:20:19 2012 +0100 summary: Fixes issue 22233: Performance problems in Payment Monitor background process. details: https://code.openbravo.com/erp/devel/main/rev/988b9a459b02 changeset: 18547:988b9a459b02 user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Tue Nov 13 15:01:21 2012 +0100 summary: Fixed 22286. Remove unused user_objects view from prescript-postgresql That view is no longer used as the last user the old delete client code has been rewritten some time ago. As that view is creating problem when upgrading from pgsql8.4 -> pgsql9.1 it is removed in this commit. details: https://code.openbravo.com/erp/devel/main/rev/e7c3d311418a changeset: 18548:e7c3d311418a user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Tue Oct 16 17:24:07 2012 +0200 summary: Fixes Issue 19043:Inserting lines more than once is possible in goods receipt details: https://code.openbravo.com/erp/devel/main/rev/a7d41be10b1b changeset: 18549:a7d41be10b1b user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Tue Oct 16 13:13:02 2012 +0200 summary: Fixes Issue 21933 : Cascade on delete options for m_inoutline_id in m_matchpo details: https://code.openbravo.com/erp/devel/main/rev/299f8fb74b3e changeset: 18550:299f8fb74b3e user: Jon Alegría <jon.alegria <at> openbravo.com> date: Wed Nov 14 13:52:22 2012 +0100 summary: Fixes issue 0022276: The costing migration process fails: ERROR index 0 size 0 details: https://code.openbravo.com/erp/devel/main/rev/05e9f0a59f54 changeset: 18551:05e9f0a59f54 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Nov 14 13:41:33 2012 +0100 summary: Fixes Issue 22301. details: https://code.openbravo.com/erp/devel/main/rev/e46d705d6365 changeset: 18552:e46d705d6365 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Wed Nov 14 13:09:06 2012 +0100 summary: Fixes Issue 22269: Tab names not translated when opened through linked items details: https://code.openbravo.com/erp/devel/main/rev/ead23f919c59 changeset: 18553:ead23f919c59 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Wed Nov 14 14:36:31 2012 +0100 summary: Fixes Issue 0022119: Implemented convertToClassicString in TimeUIDefinition. Implemented defined method convertToClassicString and refactored code to reuse time normalization logic. details: https://code.openbravo.com/erp/devel/main/rev/049bdfcedbd2 changeset: 18554:049bdfcedbd2 user: Jon Alegría <jon.alegria <at> openbravo.com> date: Wed Nov 14 14:56:51 2012 +0100 summary: Fixes issue 0022242: Incorrect message shown when changing the attribute set of a product with stock details: https://code.openbravo.com/erp/devel/main/rev/425ad0065671 changeset: 18555:425ad0065671 user: David Miguelez <david.miguelez <at> openbravo.com> date: Wed Nov 14 16:23:41 2012 +0100 summary: Fixes Issue 0022299. Changed the definition of the conn variable so it uses the same connection for all the transactions made. details: https://code.openbravo.com/erp/devel/main/rev/5fe92c72d948 changeset: 18556:5fe92c72d948 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Wed Oct 17 11:54:56 2012 +0200 summary: Fixes Issue 21966 : Quantity validation in Create Lines Process in Goods Receipt details: https://code.openbravo.com/erp/devel/main/rev/0aacf87829e4 changeset: 18557:0aacf87829e4 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Wed Nov 14 11:10:46 2012 +0100 summary: Fixed 22291 Hide in grid warehouse rule in warehouse and storage bins window details: https://code.openbravo.com/erp/devel/main/rev/32e41720eaa1 changeset: 18558:32e41720eaa1 user: Jon Alegría <jon.alegria <at> openbravo.com> date: Wed Nov 14 17:14:07 2012 +0100 summary: Fixes issue 0022241: Changing the UOM for a product with stock should be forbidden details: https://code.openbravo.com/erp/devel/main/rev/ee6d1fc1ea73 changeset: 18559:ee6d1fc1ea73 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Nov 14 16:59:38 2012 +0100 summary: Fixes issue 21921: Import Stock is not working properly. details: https://code.openbravo.com/erp/devel/main/rev/bcfa910662a2 changeset: 18560:bcfa910662a2 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Wed Nov 14 12:05:51 2012 +0100 summary: Fixes Issue 22133: Error while creating payment using business partner's credit details: https://code.openbravo.com/erp/devel/main/rev/ae4bf9ced9d3 changeset: 18561:ae4bf9ced9d3 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu Nov 15 11:15:07 2012 +0100 summary: Fixed bug 22311 Update InitializeGeneralLedgerOrganization to work properly Update InitializeGeneralLedgerOrganization to work properly when there are two or more ad_org_acctschema with same organization and same creation date details: https://code.openbravo.com/erp/devel/main/rev/f3a08810b2a9 changeset: 18562:f3a08810b2a9 user: David Miguelez <david.miguelez <at> openbravo.com> date: Thu Nov 15 12:13:23 2012 +0100 summary: Related to Issue 0021802. Added Supplier Reference to Payment Proposal. details: https://code.openbravo.com/erp/devel/main/rev/2c39d6a6c546 changeset: 18563:2c39d6a6c546 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Fri Nov 16 09:36:31 2012 +0100 summary: Fixes Issue 0021888: Issues in Payment Plan P&E Windows. In Modify Payment plan P&E window, the payment method field's dropdown did not show any records. Added logic to cache drop down values (rowEditorEnter method) if not a modify payment plan P&E window. details: https://code.openbravo.com/erp/devel/main/rev/1d2a50bfaebe changeset: 18564:1d2a50bfaebe user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Nov 16 13:45:50 2012 +0000 summary: documentation details: https://code.openbravo.com/erp/devel/main/rev/23d7cb966162 changeset: 18565:23d7cb966162 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Fri Nov 16 15:06:16 2012 +0100 summary: Fixes issue 22206: Adds validation in Commission window to org in order it to be transaction allowed. details: https://code.openbravo.com/erp/devel/main/rev/2785dcc9cf21 changeset: 18566:2785dcc9cf21 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Mon Nov 19 12:21:21 2012 +0100 summary: Fixes Issue 0022271: Sorting issue in selector popup. In the selector pop-up sorting by descending was not working. The last order by operator was removed when deleting additional comma. details: https://code.openbravo.com/erp/devel/main/rev/506b45ab88e4 changeset: 18567:506b45ab88e4 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Sun Oct 28 18:50:13 2012 +0100 summary: Fixes Issue 0022007 : Handling null values in filter by identifiers. Added a new method replaceValueWithJoins to handle cases where joins are formed but the property path is used to compare with values. For eg., instead of join_4.description, e.product.attributeSetValue.description is used in the where clause which results in exception when nullobjects are sub referenced. details: https://code.openbravo.com/erp/devel/main/rev/751258826d60 changeset: 18568:751258826d60 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Thu Nov 15 09:44:09 2012 +0100 summary: Fixes issue 21886: Restrictions in M_PRODUCT_PO can not be enforced. details: https://code.openbravo.com/erp/devel/main/rev/142819e9e1e3 changeset: 18569:142819e9e1e3 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Nov 19 13:49:27 2012 +0100 summary: Fixes issue 21955: Naming exceptions works with unique constraints There was a bug that prevented exisint unique constraints from being removed. After fixing this bug, the update.database task no longer fails after creating a unique constraint naming exception details: https://code.openbravo.com/erp/devel/main/rev/484381442489 changeset: 18570:484381442489 user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Mon Nov 19 10:15:30 2012 +0100 summary: fixes issue 21942: Be able to add/edit description in Lines tab in Return windows details: https://code.openbravo.com/erp/devel/main/rev/e15b8716607d changeset: 18571:e15b8716607d user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Mon Nov 19 16:18:00 2012 +0100 summary: Fixes Issue 0021882: Business partner selector fails with display logic When removing whole words through keyboard and typing new text, the cursor position was before the first letter in selectors where display logic was present. So did a refreshDisplayValue to resolve the same. details: https://code.openbravo.com/erp/devel/main/rev/e2a425c9139b changeset: 18572:e2a425c9139b user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Nov 19 16:47:32 2012 +0100 summary: Fixes bug 21967: Time fields value not changed when updated from the child view The conversion from UTC to local time was not being done when a child view was updated and its parent view refreshed details: https://code.openbravo.com/erp/devel/main/rev/f34a7b1836ab changeset: 18573:f34a7b1836ab user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue Nov 20 11:13:15 2012 +0100 summary: Fixes issue 22349, backout of changeset ee6d1fc1ea73 related to issue 21921. details: https://code.openbravo.com/erp/devel/main/rev/058f482a9f01 changeset: 18574:058f482a9f01 user: David Baz Fayos <david.baz <at> openbravo.com> date: Tue Nov 20 12:48:26 2012 +0100 summary: Related to issue 21776: Reverted previous changeset details: https://code.openbravo.com/erp/devel/main/rev/120e4b62fcd6 changeset: 18575:120e4b62fcd6 user: David Baz Fayos <david.baz <at> openbravo.com> date: Tue Nov 20 13:32:36 2012 +0100 summary: Fixed issue 21776: Prevent 'Backspace' key propagation (as a browser 'go back' shortcut) in all cases details: https://code.openbravo.com/erp/devel/main/rev/f7d9ab97c2e0 changeset: 18576:f7d9ab97c2e0 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Nov 20 14:46:21 2012 +0100 summary: Merge back from main details: https://code.openbravo.com/erp/devel/main/rev/776d5accc58d changeset: 18577:776d5accc58d user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Tue Nov 20 16:54:42 2012 +0100 summary: Related to Issue 22347 : Backout changeset e15b8716607d. Backout Changes in changeset e15b8716607d. details: https://code.openbravo.com/erp/devel/main/rev/c3c5e61b0164 changeset: 18578:c3c5e61b0164 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Nov 21 05:45:31 2012 +0100 summary: CI: update AD_MODULE to version 18577 diffstat: .hgsigs | 1 + .hgtags | 1 + config/Format.xml.template | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_PAYMENT_PROP_PICK_EDIT.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml | 35 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 28 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java | 132 +++-- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java | 27 +- 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/org/openbravo/client/application/event/AcctSchemaEventHandler.java | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 62 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 44 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-keyboard-manager.js | 47 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/TimeUIDefinition.java | 54 +- 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.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java | 36 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java | 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 +- src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/excludeFilter.xml | 1 - src-db/database/model/functions/A_ASSET_POST.xml | 6 +- src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml | 2 +- src-db/database/model/functions/M_PRODUCT_CATEGORY_ACCT_COPY.xml | 9 + src-db/database/model/prescript-PostgreSql.sql | 40 - src-db/database/model/tables/C_ACCTSCHEMA_DEFAULT.xml | 6 +- src-db/database/model/tables/C_CASHBOOK_ACCT.xml | 4 +- src-db/database/model/tables/M_MATCHPO.xml | 2 +- src-db/database/model/tables/M_PRODUCT_PO.xml | 6 +- src-db/database/model/triggers/M_INOUTLINE_TRG.xml | 13 + src-db/database/model/triggers/M_PRODUCT_TRG.xml | 10 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 22 + src-db/database/sourcedata/AD_COLUMN.xml | 7 +- src-db/database/sourcedata/AD_FIELD.xml | 204 +++++----- src-db/database/sourcedata/AD_FORM.xml | 2 +- src-db/database/sourcedata/AD_MESSAGE.xml | 44 ++ src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_PROCESS.xml | 2 +- src-db/database/sourcedata/AD_TAB.xml | 44 +- src-db/database/sourcedata/AD_VAL_RULE.xml | 11 + src-db/database/sourcedata/AD_WINDOW.xml | 10 +- src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 2 +- src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeGeneralLedgerOrganizationData.class | 0 src-util/modulescript/src/org/openbravo/modulescript/InitializeGeneralLedgerOrganization_data.xsql | 2 +- src/org/openbravo/costing/CostingMigrationProcess.java | 1 + src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java | 72 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 108 ++++- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.html | 34 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql | 62 ++- src/org/openbravo/erpCommon/ad_forms/Fact.java | 3 + src/org/openbravo/erpCommon/ad_forms/FactLine.java | 33 +- src/org/openbravo/erpCommon/ad_process/ExpenseAPInvoice.java | 3 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 36 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.xml | 1 - src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal_data.xsql | 32 +- web/js/utils.js | 15 + 97 files changed, 965 insertions(+), 535 deletions(-) diffs (truncated from 4486 to 300 lines): diff -r b0eb45e159c6 -r c3c5e61b0164 .hgsigs --- a/.hgsigs Mon Nov 12 10:35:30 2012 +0100 +++ b/.hgsigs Wed Nov 21 05:45:31 2012 +0100 @@ -87,3 +87,4 @@ 12914c7ff338d71cdb942a1222174e6afa8771b2 0 iEYEABECAAYFAlCO6PcACgkQCX/oGf+2qkMl/wCfRObV0QOmE8SyyLxPPehcVX51Ho8AmwaEYe6MQiQDKgTY6rm/XMlBvBRa aee16f41346874b9e355af6007df8df57b7f0266 0 iEYEABECAAYFAlBut3kACgkQCX/oGf+2qkPE8gCaAyk5dQSNyoOSpzPeOEtOLBhrF0MAn3XWPPVJ1Pb7vCei3oE3aQ8Ctj9o 99f8eda49e53a4782416f5b18442945c4b5e63b5 0 iEYEABECAAYFAlCRrN8ACgkQCX/oGf+2qkOAJQCdGW7u6kmDrbDAerqPP8WEjveCCA8AoKnuoxJ0oG4YoECyXIAAFwQPVR+/ +d9dc1dcdb1f7da6ca0e0fcff57ac4f6c2f5e938c 0 iEYEABECAAYFAlCj2v8ACgkQCX/oGf+2qkPEsgCeOLWp7v5gU6Ip90kOBdOF+mejRHsAoObtRXJVe+gNq2nUa7Xu1EbVxsag diff -r b0eb45e159c6 -r c3c5e61b0164 .hgtags --- a/.hgtags Mon Nov 12 10:35:30 2012 +0100 +++ b/.hgtags Wed Nov 21 05:45:31 2012 +0100 @@ -98,3 +98,4 @@ dd22f6b9902296a7d3f48b871fc8436ef20fdfdc 3.0MP15.2 1cd80d4b32bbafca742ca1406fee082f97f5f254 3.0MP16 84deb08844286485e5f948cdf06cec2ea727eddf 3.0MP16.1 +f731024ec763373bd02a0825d0f42e1ddb15eb32 3.0MP17 diff -r b0eb45e159c6 -r c3c5e61b0164 config/Format.xml.template --- a/config/Format.xml.template Mon Nov 12 10:35:30 2012 +0100 +++ b/config/Format.xml.template Wed Nov 21 05:45:31 2012 +0100 @@ -31,7 +31,7 @@ <Number name="euroExcel" decimal="." grouping="," formatOutput="#,##0.##" formatInternal="#0.00" /> <Number name="priceInform" - decimal="." grouping="," formatOutput="#,##0.##" formatInternal="#0.00" /> + decimal="." grouping="," formatOutput="#,##0.00" formatInternal="#0.00" /> <Number name="priceRelation" decimal="." grouping="," formatOutput="#,##0.00" formatInternal="#0.00" /> <Number name="priceEdition" diff -r b0eb45e159c6 -r c3c5e61b0164 modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_PAYMENT_PROP_PICK_EDIT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_PAYMENT_PROP_PICK_EDIT.xml Mon Nov 12 10:35:30 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_PAYMENT_PROP_PICK_EDIT.xml Wed Nov 21 05:45:31 2012 +0100 @@ -1,4 +1,4 @@ <?xml version="1.0"?> <database name="VIEW APRM_PAYMENT_PROP_PICK_EDIT"> - <view name="APRM_PAYMENT_PROP_PICK_EDIT"><![CDATA[SELECT psd.fin_payment_scheduledetail_id AS aprm_payment_prop_pick_edit_id, psd.ad_client_id, psd.ad_org_id, psd.isactive, psd.created, psd.updated, psd.createdby, psd.updatedby, psd.fin_payment_scheduledetail_id, ppd.fin_payment_proposal_id, o.documentno AS order_documentno, i.documentno AS invoice_documentno, COALESCE(i.fin_paymentmethod_id, o.fin_paymentmethod_id) AS fin_paymentmethod_id, COALESCE(i.c_bpartner_id, o.c_bpartner_id) AS c_bpartner_id, COALESCE(psi.duedate, pso.duedate) AS duedate, COALESCE(psi.expecteddate, pso.expecteddate) AS expecteddate, i.grandtotal AS invoiced, COALESCE(psi.amount, pso.amount) AS expected, psd.amount AS outstanding, COALESCE(ppd.amount, 0) AS payment, COALESCE(psd.amount - ppd.amount, psd.amount) AS difference, CASE WHEN ppd.writeoffamt <> 0 THEN 'Y' ELSE 'N' END AS writeoff, CASE WHEN ppd.fin_payment_scheduledetail_id IS NULL THEN 'N' ELSE 'Y' END AS ob_selected, COALESCE(psi.fin_payment_priority_id, pso.fin_payment_priority_id) AS fin_payment_priority_id, COALESCE(i.c_currency_id, o.c_currency_id) AS c_currency_id, COALESCE(i.issotrx, o.issotrx) AS issotrx FROM fin_payment_scheduledetail psd LEFT JOIN fin_payment_prop_detail ppd ON psd.fin_payment_scheduledetail_id = ppd.fin_payment_scheduledetail_id LEFT JOIN fin_payment_schedule psi ON psd.fin_payment_schedule_invoice = psi.fin_payment_schedule_id LEFT JOIN fin_payment_schedule pso ON psd.fin_payment_schedule_order = pso.fin_payment_schedule_id LEFT JOIN c_invoice i ON psi.c_invoice_id = i.c_invoice_id LEFT JOIN c_order o ON pso.c_order_id = o.c_order_id WHERE psd.fin_payment_detail_id IS NULL]]></view> + <view name="APRM_PAYMENT_PROP_PICK_EDIT"><![CDATA[SELECT psd.fin_payment_scheduledetail_id AS aprm_payment_prop_pick_edit_id, psd.ad_client_id, psd.ad_org_id, psd.isactive, psd.created, psd.updated, psd.createdby, psd.updatedby, psd.fin_payment_scheduledetail_id, ppd.fin_payment_proposal_id, o.documentno AS order_documentno, i.documentno AS invoice_documentno, i.poreference AS supplier_reference, COALESCE(i.fin_paymentmethod_id, o.fin_paymentmethod_id) AS fin_paymentmethod_id, COALESCE(i.c_bpartner_id, o.c_bpartner_id) AS c_bpartner_id, COALESCE(psi.duedate, pso.duedate) AS duedate, COALESCE(psi.expecteddate, pso.expecteddate) AS expecteddate, i.grandtotal AS invoiced, COALESCE(psi.amount, pso.amount) AS expected, psd.amount AS outstanding, COALESCE(ppd.amount, 0) AS payment, COALESCE(psd.amount - ppd.amount, psd.amount) AS difference, CASE WHEN ppd.writeoffamt <> 0 THEN 'Y' ELSE 'N' END AS writeoff, CASE WHEN ppd.fin_payment_scheduledetail_id IS NULL THEN 'N' ELSE 'Y' END AS ob_selected, COALESCE(psi.fin_payment_priority_id, pso.fin_payment_priority_id) AS fin_payment_priority_id, COALESCE(i.c_currency_id, o.c_currency_id) AS c_currency_id, COALESCE(i.issotrx, o.issotrx) AS issotrx FROM fin_payment_scheduledetail psd LEFT JOIN fin_payment_prop_detail ppd ON psd.fin_payment_scheduledetail_id = ppd.fin_payment_scheduledetail_id LEFT JOIN fin_payment_schedule psi ON psd.fin_payment_schedule_invoice = psi.fin_payment_schedule_id LEFT JOIN fin_payment_schedule pso ON psd.fin_payment_schedule_order = pso.fin_payment_schedule_id LEFT JOIN c_invoice i ON psi.c_invoice_id = i.c_invoice_id LEFT JOIN c_order o ON pso.c_order_id = o.c_order_id WHERE psd.fin_payment_detail_id IS NULL]]></view> </database> diff -r b0eb45e159c6 -r c3c5e61b0164 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Mon Nov 12 10:35:30 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Wed Nov 21 05:45:31 2012 +0100 @@ -2889,6 +2889,41 @@ <!--806198F4784445109D9067A0C868701C--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--806198F4784445109D9067A0C868701C--></AD_COLUMN> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--><AD_COLUMN> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <AD_COLUMN_ID><![CDATA[8071EA28ABEA4E1E919AD14F3EE5B033]]></AD_COLUMN_ID> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <NAME><![CDATA[Supplier Reference]]></NAME> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <DESCRIPTION><![CDATA[A reference or document order number as listed in business partner application.]]></DESCRIPTION> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <HELP><![CDATA[This can be used to input a reference for this specific transaction. For example, a Purchase Order number can be input on a Sales Order for easier reference.]]></HELP> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <COLUMNNAME><![CDATA[Supplier_Reference]]></COLUMNNAME> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <AD_TABLE_ID><![CDATA[DC814AB3BC84486CA5411131724BC95A]]></AD_TABLE_ID> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <FIELDLENGTH><![CDATA[30]]></FIELDLENGTH> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <ISKEY><![CDATA[N]]></ISKEY> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <SEQNO><![CDATA[270]]></SEQNO> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <AD_ELEMENT_ID><![CDATA[952]]></AD_ELEMENT_ID> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <POSITION><![CDATA[13]]></POSITION> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--8071EA28ABEA4E1E919AD14F3EE5B033--></AD_COLUMN> + <!--82EFB8E4043C19C9E040007F01003778--><AD_COLUMN> <!--82EFB8E4043C19C9E040007F01003778--> <AD_COLUMN_ID><![CDATA[82EFB8E4043C19C9E040007F01003778]]></AD_COLUMN_ID> <!--82EFB8E4043C19C9E040007F01003778--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r b0eb45e159c6 -r c3c5e61b0164 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Mon Nov 12 10:35:30 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml Wed Nov 21 05:45:31 2012 +0100 @@ -2261,6 +2261,34 @@ <!--324A4EA312D5489887BCD0B6F2C6A065--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--324A4EA312D5489887BCD0B6F2C6A065--></AD_FIELD> +<!--3287F4B82C964ADAA98CF144A21719E2--><AD_FIELD> +<!--3287F4B82C964ADAA98CF144A21719E2--> <AD_FIELD_ID><![CDATA[3287F4B82C964ADAA98CF144A21719E2]]></AD_FIELD_ID> +<!--3287F4B82C964ADAA98CF144A21719E2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--3287F4B82C964ADAA98CF144A21719E2--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--3287F4B82C964ADAA98CF144A21719E2--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--3287F4B82C964ADAA98CF144A21719E2--> <NAME><![CDATA[Supplier Reference]]></NAME> +<!--3287F4B82C964ADAA98CF144A21719E2--> <DESCRIPTION><![CDATA[A reference or document order number as listed in business partner application.]]></DESCRIPTION> +<!--3287F4B82C964ADAA98CF144A21719E2--> <HELP><![CDATA[This can be used to input a reference for this specific transaction. For example, a Purchase Order number can be input on a Sales Order for easier reference.]]></HELP> +<!--3287F4B82C964ADAA98CF144A21719E2--> <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED> +<!--3287F4B82C964ADAA98CF144A21719E2--> <AD_TAB_ID><![CDATA[81644A22CC4D4B879AA71C33C30E00A4]]></AD_TAB_ID> +<!--3287F4B82C964ADAA98CF144A21719E2--> <AD_COLUMN_ID><![CDATA[8071EA28ABEA4E1E919AD14F3EE5B033]]></AD_COLUMN_ID> +<!--3287F4B82C964ADAA98CF144A21719E2--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--3287F4B82C964ADAA98CF144A21719E2--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--3287F4B82C964ADAA98CF144A21719E2--> <DISPLAYLENGTH><![CDATA[30]]></DISPLAYLENGTH> +<!--3287F4B82C964ADAA98CF144A21719E2--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--3287F4B82C964ADAA98CF144A21719E2--> <SEQNO><![CDATA[25]]></SEQNO> +<!--3287F4B82C964ADAA98CF144A21719E2--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--3287F4B82C964ADAA98CF144A21719E2--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--3287F4B82C964ADAA98CF144A21719E2--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--3287F4B82C964ADAA98CF144A21719E2--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> +<!--3287F4B82C964ADAA98CF144A21719E2--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--3287F4B82C964ADAA98CF144A21719E2--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--3287F4B82C964ADAA98CF144A21719E2--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--3287F4B82C964ADAA98CF144A21719E2--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--3287F4B82C964ADAA98CF144A21719E2--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--3287F4B82C964ADAA98CF144A21719E2--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--3287F4B82C964ADAA98CF144A21719E2--></AD_FIELD> + <!--331964ADAD6F4182BCB88287F89DBFE5--><AD_FIELD> <!--331964ADAD6F4182BCB88287F89DBFE5--> <AD_FIELD_ID><![CDATA[331964ADAD6F4182BCB88287F89DBFE5]]></AD_FIELD_ID> <!--331964ADAD6F4182BCB88287F89DBFE5--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r b0eb45e159c6 -r c3c5e61b0164 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Nov 12 10:35:30 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Nov 21 05:45:31 2012 +0100 @@ -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.18511]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.18577]]></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 b0eb45e159c6 -r c3c5e61b0164 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 Mon Nov 12 10:35:30 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Nov 21 05:45:31 2012 +0100 @@ -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.18511]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.18577]]></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.18511]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.18577]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r b0eb45e159c6 -r c3c5e61b0164 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Mon Nov 12 10:35:30 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml Wed Nov 21 05:45:31 2012 +0100 @@ -298,7 +298,7 @@ <!--9380E9AFB1074FB98030E5549D7FF346--> <ISACTIVE><![CDATA[N]]></ISACTIVE> <!--9380E9AFB1074FB98030E5549D7FF346--> <NAME><![CDATA[Financial Account Defaults]]></NAME> <!--9380E9AFB1074FB98030E5549D7FF346--> <DESCRIPTION><![CDATA[Default accounts for the financial accounts in this accounting schema]]></DESCRIPTION> -<!--9380E9AFB1074FB98030E5549D7FF346--> <HELP><![CDATA[Default accounts for the financial accounts in this accounting schema]]></HELP> +<!--9380E9AFB1074FB98030E5549D7FF346--> <HELP><![CDATA[Default ledger accounts for the financial accounts.]]></HELP> <!--9380E9AFB1074FB98030E5549D7FF346--> <AD_TABLE_ID><![CDATA[6F98C7AB59D3410CB828DB25D638DE2C]]></AD_TABLE_ID> <!--9380E9AFB1074FB98030E5549D7FF346--> <AD_WINDOW_ID><![CDATA[125]]></AD_WINDOW_ID> <!--9380E9AFB1074FB98030E5549D7FF346--> <SEQNO><![CDATA[50]]></SEQNO> diff -r b0eb45e159c6 -r c3c5e61b0164 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java Mon Nov 12 10:35:30 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java Wed Nov 21 05:45:31 2012 +0100 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010-2011 Openbravo SLU + * All portions are Copyright (C) 2010-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): Enterprise Intelligence Systems (http://www.eintel.com.au). ************************************************************************* @@ -62,6 +62,7 @@ import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod; import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail; import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod; +import org.openbravo.model.pricing.pricelist.PriceList; import org.openbravo.service.db.CallStoredProcedure; import org.openbravo.xmlEngine.XmlDocument; @@ -170,6 +171,7 @@ String strOrgId = vars.getRequiredStringParameter("inpadOrgId"); String strDifferenceAction = ""; String strDifference = vars.getNumericParameter("inpDifference", "0"); + boolean isUseCredit = vars.getStringParameter("inpUseCredit").equals("Y"); BigDecimal refundAmount = BigDecimal.ZERO; if (!strDifference.equals("0")) { refundAmount = new BigDecimal(strDifference); @@ -182,69 +184,86 @@ "1")); BigDecimal convertedAmount = new BigDecimal(vars.getRequiredNumericParameter( "inpActualConverted", strPaymentAmount)); + BusinessPartner businessPartner = OBDal.getInstance().get(BusinessPartner.class, + strReceivedFromId); + PriceList priceList = isReceipt ? businessPartner.getPriceList() : businessPartner + .getPurchasePricelist(); OBError message = null; // FIXME: added to access the FIN_PaymentSchedule and FIN_PaymentScheduleDetail tables to be // removed when new security implementation is done OBContext.setAdminMode(); try { + if (isUseCredit + && !paymentCurrencyId + .equals((priceList != null) ? priceList.getCurrency().getId() : "")) { + String errorMsg = String.format( + Utility.parseTranslation(this, vars, vars.getLanguage(), "@APRM_CreditCurrency@"), + priceList != null ? priceList.getCurrency().getISOCode() : Utility.parseTranslation( + this, vars, vars.getLanguage(), "@APRM_CreditNoPricelistCurrency@")); + message = new OBError(); + message.setType("Error"); + message.setTitle("Error"); + message.setMessage(errorMsg); + } else { - List<FIN_PaymentScheduleDetail> selectedPaymentDetails = FIN_Utility.getOBObjectList( - FIN_PaymentScheduleDetail.class, strSelectedScheduledPaymentDetailIds); - HashMap<String, BigDecimal> selectedPaymentDetailAmounts = FIN_AddPayment - .getSelectedPaymentDetailsAndAmount(vars, selectedPaymentDetails); + List<FIN_PaymentScheduleDetail> selectedPaymentDetails = FIN_Utility.getOBObjectList( + FIN_PaymentScheduleDetail.class, strSelectedScheduledPaymentDetailIds); + HashMap<String, BigDecimal> selectedPaymentDetailAmounts = FIN_AddPayment + .getSelectedPaymentDetailsAndAmount(vars, selectedPaymentDetails); - final List<Object> parameters = new ArrayList<Object>(); - parameters.add(vars.getClient()); - parameters.add(strOrgId); - parameters.add((isReceipt ? "ARR" : "APP")); - // parameters.add(null); - String strDocTypeId = (String) CallStoredProcedure.getInstance().call("AD_GET_DOCTYPE", - parameters, null); + final List<Object> parameters = new ArrayList<Object>(); + parameters.add(vars.getClient()); + parameters.add(strOrgId); + parameters.add((isReceipt ? "ARR" : "APP")); + // parameters.add(null); + String strDocTypeId = (String) CallStoredProcedure.getInstance().call("AD_GET_DOCTYPE", + parameters, null); - if (strPaymentDocumentNo.startsWith("<")) { - // get DocumentNo - strPaymentDocumentNo = Utility.getDocumentNo(this, vars, "AddPaymentFromInvoice", - "FIN_Payment", strDocTypeId, strDocTypeId, false, true); - } + if (strPaymentDocumentNo.startsWith("<")) { + // get DocumentNo + strPaymentDocumentNo = Utility.getDocumentNo(this, vars, "AddPaymentFromInvoice", + "FIN_Payment", strDocTypeId, strDocTypeId, false, true); + } - FIN_Payment payment = FIN_AddPayment.savePayment(null, isReceipt, - dao.getObject(DocumentType.class, strDocTypeId), strPaymentDocumentNo, - dao.getObject(BusinessPartner.class, strReceivedFromId), - dao.getObject(FIN_PaymentMethod.class, strPaymentMethodId), - dao.getObject(FIN_FinancialAccount.class, strFinancialAccountId), strPaymentAmount, - FIN_Utility.getDate(strPaymentDate), dao.getObject(Organization.class, strOrgId), - strReferenceNo, selectedPaymentDetails, selectedPaymentDetailAmounts, - strDifferenceAction.equals("writeoff"), strDifferenceAction.equals("refund"), - dao.getObject(Currency.class, paymentCurrencyId), exchangeRate, convertedAmount); + FIN_Payment payment = FIN_AddPayment.savePayment(null, isReceipt, + dao.getObject(DocumentType.class, strDocTypeId), strPaymentDocumentNo, + dao.getObject(BusinessPartner.class, strReceivedFromId), + dao.getObject(FIN_PaymentMethod.class, strPaymentMethodId), + dao.getObject(FIN_FinancialAccount.class, strFinancialAccountId), strPaymentAmount, + FIN_Utility.getDate(strPaymentDate), dao.getObject(Organization.class, strOrgId), + strReferenceNo, selectedPaymentDetails, selectedPaymentDetailAmounts, + strDifferenceAction.equals("writeoff"), strDifferenceAction.equals("refund"), + dao.getObject(Currency.class, paymentCurrencyId), exchangeRate, convertedAmount); - if (strAction.equals("PRP") || strAction.equals("PPP") || strAction.equals("PRD") - || strAction.equals("PPW")) { + if (strAction.equals("PRP") || strAction.equals("PPP") || strAction.equals("PRD") + || strAction.equals("PPW")) { - message = FIN_AddPayment.processPayment(vars, this, - (strAction.equals("PRP") || strAction.equals("PPP")) ? "P" : "D", payment); - String strNewPaymentMessage = Utility.parseTranslation(this, vars, vars.getLanguage(), - "@PaymentCreated@" + " " + payment.getDocumentNo()) + "."; - message.setMessage(strNewPaymentMessage + " " + message.getMessage()); - if (strDifferenceAction.equals("refund")) { - Boolean newPayment = !payment.getFINPaymentDetailList().isEmpty(); - FIN_Payment refundPayment = FIN_AddPayment.createRefundPayment(this, vars, payment, - refundAmount.negate(), exchangeRate); - OBError auxMessage = FIN_AddPayment.processPayment(vars, this, - (strAction.equals("PRP") || strAction.equals("PPP")) ? "P" : "D", refundPayment); - if (newPayment) { - final String strNewRefundPaymentMessage = Utility - .parseTranslation(this, vars, vars.getLanguage(), "@APRM_RefundPayment@" + ": " - + refundPayment.getDocumentNo()) - + "."; - message.setMessage(strNewRefundPaymentMessage + " " + message.getMessage()); - if (payment.getGeneratedCredit().compareTo(BigDecimal.ZERO) != 0) { - payment - .setDescription(payment.getDescription() + strNewRefundPaymentMessage + "\n"); - OBDal.getInstance().save(payment); - OBDal.getInstance().flush(); ------------------------------------------------------------------------------ Monitor your physical, virtual and cloud infrastructure from a single web console. Get in-depth insight into apps, servers, databases, vmware, SAP, cloud infrastructure, etc. Download 30-day Free Trial. Pricing starts from $795 for 25 servers or applications! http://p.sf.net/sfu/zoho_dev2dev_nov _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
