details: https://code.openbravo.com/erp/devel/pi/rev/1a5a60dd9688 changeset: 34019:1a5a60dd9688 user: Osmany Garcia Machado <osmany.machado <at> peoplewalking.com> date: Thu Mar 17 15:02:29 2016 -0600 summary: [Product Locked/Discontinued] Addig new field 'isLocked'
details: https://code.openbravo.com/erp/devel/pi/rev/968a428bb783 changeset: 34020:968a428bb783 user: Osmany Garcia Machado <osmany.machado <at> peoplewalking.com> date: Tue Mar 22 14:54:32 2016 -0600 summary: [Product Locked/Discontinued] Addig new field 'isDiscontinued' details: https://code.openbravo.com/erp/devel/pi/rev/ff123fc626e9 changeset: 34021:ff123fc626e9 user: Osmany Garcia Machado <osmany.machado <at> peoplewalking.com> date: Fri Apr 01 12:53:08 2016 -0600 summary: [Product Locked/Discontinued] Small fixes in AD details: https://code.openbravo.com/erp/devel/pi/rev/a2c62ac73b2b changeset: 34022:a2c62ac73b2b user: Osmany Garcia Machado <osmany.machado <at> peoplewalking.com> date: Mon Apr 04 10:28:09 2016 -0600 summary: [Product Locked/Discontinued] Small Fix in DB details: https://code.openbravo.com/erp/devel/pi/rev/1779e8b60d84 changeset: 34023:1779e8b60d84 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Apr 06 16:54:44 2016 +0200 summary: [Product Locked/Discontinued] Avoid Sales Order book if Product is Locked/Discontinued details: https://code.openbravo.com/erp/devel/pi/rev/8f55c55ea363 changeset: 34024:8f55c55ea363 user: Osmany Garcia Machado <osmany.machado <at> peoplewalking.com> date: Wed Apr 13 13:56:45 2016 -0600 summary: [Product Locked/Discontinued] Validation for field 'Is Discontinued' details: https://code.openbravo.com/erp/devel/pi/rev/8a7d41c61470 changeset: 34025:8a7d41c61470 user: Osmany Garcia Machado <osmany.machado <at> peoplewalking.com> date: Mon Apr 18 11:24:57 2016 -0600 summary: [Product Locked/Discontinued] Improvements to validation for field 'Is Discontinued' details: https://code.openbravo.com/erp/devel/pi/rev/313c1a4a44c2 changeset: 34026:313c1a4a44c2 user: Osmany Garcia Machado <osmany.machado <at> peoplewalking.com> date: Mon Apr 18 13:21:07 2016 -0600 summary: [Product Locked/Discontinued] Validation for field 'Is Locked' details: https://code.openbravo.com/erp/devel/pi/rev/a97563a323f1 changeset: 34027:a97563a323f1 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Apr 28 18:40:40 2016 +0200 summary: [Product Locked/Discontinued] Set Is Discontinued field as Central Maintenance = 'N' details: https://code.openbravo.com/erp/devel/pi/rev/3c8aed76442c changeset: 34028:3c8aed76442c user: Unai Martirena <unai.martirena <at> openbravo.com> date: Mon May 30 16:14:58 2016 +0200 summary: [Product Locked/Discontinued] Remove posterminal fieldgroups details: https://code.openbravo.com/erp/devel/pi/rev/1511de1e1ec2 changeset: 34029:1511de1e1ec2 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Fri Apr 13 12:27:39 2018 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/pi/rev/6e6f08dbfed5 changeset: 34030:6e6f08dbfed5 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Fri Apr 20 14:50:38 2018 +0200 summary: [Product Locked/Discontinued] Changes in the query to get stock. The query is performed in order to avoid taking unnecessary fields. details: https://code.openbravo.com/erp/devel/pi/rev/b0d48104a126 changeset: 34031:b0d48104a126 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Fri Apr 20 15:06:14 2018 +0200 summary: [Product Locked/Discontinued] Synchronize terminology applied details: https://code.openbravo.com/erp/devel/pi/rev/024b7586e8d1 changeset: 34032:024b7586e8d1 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Apr 23 09:54:15 2018 +0200 summary: [Product Locked/Discontinued] Fixed product discontinued query Query formated and an aggregate function used (MAX) to check a value of the m_product_uom_id column to avoid to set it in the group by. details: https://code.openbravo.com/erp/devel/pi/rev/8210f0357d2f changeset: 34033:8210f0357d2f user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Apr 23 11:29:03 2018 +0200 summary: [Product Locked/Discontinued] Help, descritpion and central maintenance added details: https://code.openbravo.com/erp/devel/pi/rev/b647357f9509 changeset: 34034:b647357f9509 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon Apr 23 11:40:30 2018 +0200 summary: [Product Locked/Discontinued] License updated details: https://code.openbravo.com/erp/devel/pi/rev/135021735bf6 changeset: 34035:135021735bf6 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue Apr 24 15:29:40 2018 +0200 summary: [Product Locked/Discontinued] Performed the query to search locked and discontinued products in c_order_post details: https://code.openbravo.com/erp/devel/pi/rev/e9fc1f5a6b21 changeset: 34036:e9fc1f5a6b21 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu May 03 10:27:11 2018 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/pi/rev/b4094c1cda99 changeset: 34037:b4094c1cda99 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Sat May 05 12:24:50 2018 +0200 summary: [Product Locked/Discontinued] New PLM-Status window to control the product lifecycle management This new status substitutes the locked and discontinued statuses. details: https://code.openbravo.com/erp/devel/pi/rev/b701931c0791 changeset: 34038:b701931c0791 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Sat May 05 12:33:39 2018 +0200 summary: [Product Locked/Discontinued] Modified 'PLM Status' name with 'PLM-Status' details: https://code.openbravo.com/erp/devel/pi/rev/2be55fbc5a80 changeset: 34039:2be55fbc5a80 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon May 14 13:16:01 2018 +0200 summary: [Product Locked/Discontinued] Moved the restrictsalesfrompos column to CORE and deleted the value column details: https://code.openbravo.com/erp/devel/pi/rev/75542b3bafad changeset: 34040:75542b3bafad user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue May 15 10:15:43 2018 +0200 summary: [Product Locked/Discontinued] New translation window for the PLM-Status. Also modified the c_order_post function to work with the new window. details: https://code.openbravo.com/erp/devel/pi/rev/f6f120954ac2 changeset: 34041:f6f120954ac2 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue May 15 10:19:56 2018 +0200 summary: [Product Locked/Discontinued] New source data for the m_product_status window details: https://code.openbravo.com/erp/devel/pi/rev/b1f5b8280ce9 changeset: 34042:b1f5b8280ce9 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue May 15 10:27:32 2018 +0200 summary: [Product Locked/Discontinued] Updated Foreign Keys names details: https://code.openbravo.com/erp/devel/pi/rev/8dacde9ff273 changeset: 34043:8dacde9ff273 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue May 15 14:27:57 2018 +0200 summary: [Product Locked/Discontinued] Updated the message shown in c_order post for locked and discontinued products details: https://code.openbravo.com/erp/devel/pi/rev/72859e6eb8fc changeset: 34044:72859e6eb8fc user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue May 15 16:20:58 2018 +0200 summary: [Product Locked/Discontinued] New message for locked products details: https://code.openbravo.com/erp/devel/pi/rev/7f67ae2bace7 changeset: 34045:7f67ae2bace7 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue May 15 18:54:36 2018 +0200 summary: [Product Locked/Discontinued] Constraints, event handlers and display logics added. Added a constraint, an event handler and display logic to avoid to create products with stocked to 'N' and with the PLM-Status set. details: https://code.openbravo.com/erp/devel/pi/rev/d2df9c9ce903 changeset: 34046:d2df9c9ce903 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue May 15 18:57:40 2018 +0200 summary: [Product Locked/Discontinued] New error message details: https://code.openbravo.com/erp/devel/pi/rev/266a68d8876f changeset: 34047:266a68d8876f user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed May 16 08:41:12 2018 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/pi/rev/28a9428bf3c8 changeset: 34048:28a9428bf3c8 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed May 16 11:02:39 2018 +0200 summary: [Product Locked/Discontinued] New index for the product status translation details: https://code.openbravo.com/erp/devel/pi/rev/ed494a1913ee changeset: 34049:ed494a1913ee user: Asier Martirena <asier.martirena <at> openbravo.com> date: Thu May 17 13:44:47 2018 +0200 summary: [Product Locked/Discontinued] JUnit automated tests details: https://code.openbravo.com/erp/devel/pi/rev/f049586cb5f6 changeset: 34050:f049586cb5f6 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon May 21 14:00:58 2018 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/pi/rev/42d93a46cb6e changeset: 34051:42d93a46cb6e user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon May 21 16:41:24 2018 +0200 summary: [Product Locked/Discontinued] Added product status tests to the AllAntTaskTests class details: https://code.openbravo.com/erp/devel/pi/rev/5b99d37720ea changeset: 34052:5b99d37720ea user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon May 21 19:31:19 2018 +0200 summary: [Product Locked/Discontinued] Added a message for a constraint error. Now is possible to remove a check that was being done in an event handler to manage it directly in the constraint. details: https://code.openbravo.com/erp/devel/pi/rev/1c4f98fdbc71 changeset: 34053:1c4f98fdbc71 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon May 21 19:43:27 2018 +0200 summary: [Product Locked/Discontinued] Removed wrongly created xml value details: https://code.openbravo.com/erp/devel/pi/rev/f11c2322e8bd changeset: 34054:f11c2322e8bd user: Asier Martirena <asier.martirena <at> openbravo.com> date: Mon May 21 20:57:07 2018 +0200 summary: [Product Locked/Discontinued] Formated correctly the ad_message details: https://code.openbravo.com/erp/devel/pi/rev/ee70e68908fc changeset: 34055:ee70e68908fc user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Tue May 22 11:17:47 2018 +0200 summary: [Product Locked/Discontinued] Code review improvements Rename Restrict Sales from POS field as Restrict Sale from POS Hide Organization field in PLM_Status window Reoder fields in PLM-Status window Don't need to check producttype in m_product_status_chk constraint, as isstocked = 'Y' implies producttype = 'I' Check Translation Tab flag in Translation tab Reoder fields in PLM-Status window Translation tab Add description and help to ProductStatus table Add help to ProductStatusTrl table Add window in ProductStatusTrl table Don't need to check producttype in PLM-Status field display logic, as isstocked = 'Y' implies producttype = 'I' Check Exclude Audit Info in M_Product_Status dataset Remove change in ProductEventHandler.java details: https://code.openbravo.com/erp/devel/pi/rev/dee8f219d462 changeset: 34056:dee8f219d462 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Tue May 22 11:20:31 2018 +0200 summary: [Product Locked/Discontinued] Revert change in M_INVENTORYSTATUS.xml details: https://code.openbravo.com/erp/devel/pi/rev/f763ce171e8a changeset: 34057:f763ce171e8a user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Tue May 22 12:51:30 2018 +0200 summary: [Product Locked/Discontinued] Remove audit info from M_PRODUCT_STATUS.xml details: https://code.openbravo.com/erp/devel/pi/rev/19408041cadb changeset: 34058:19408041cadb user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue May 22 17:04:54 2018 +0200 summary: [Product Locked/Discontinued] Fixed problem in c_order_post1. A query was not being correctly executed. details: https://code.openbravo.com/erp/devel/pi/rev/4d884f14b48e changeset: 34059:4d884f14b48e user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue May 22 17:10:05 2018 +0200 summary: [Product Locked/Discontinued] Fixed plm status tests details: https://code.openbravo.com/erp/devel/pi/rev/ddf5a38a4082 changeset: 34060:ddf5a38a4082 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Tue May 22 18:54:12 2018 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/pi/rev/0a490aef5c03 changeset: 34061:0a490aef5c03 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed May 23 09:15:03 2018 +0200 summary: [Product Locked/Discontinued] New selector fot the PLM-Status attribute details: https://code.openbravo.com/erp/devel/pi/rev/c2ebb767891a changeset: 34062:c2ebb767891a user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed May 23 09:25:58 2018 +0200 summary: [Product Locked/Discontinued] Changed NVARCHAR for VARCHAR in names and descriptions details: https://code.openbravo.com/erp/devel/pi/rev/6f18caaf52e2 changeset: 34063:6f18caaf52e2 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed May 23 09:50:51 2018 +0200 summary: [Product Locked/Discontinued] Introduced the PLM-Status menu into the correct folder details: https://code.openbravo.com/erp/devel/pi/rev/484b3de367bd changeset: 34064:484b3de367bd user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed May 23 10:39:01 2018 +0200 summary: Merged from PI details: https://code.openbravo.com/erp/devel/pi/rev/9d8eef8569d7 changeset: 34065:9d8eef8569d7 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Wed May 23 16:11:56 2018 +0200 summary: [Product Locked/Discontinued] New sequence number field in the m_product_status table details: https://code.openbravo.com/erp/devel/pi/rev/2b0241d993b2 changeset: 34066:2b0241d993b2 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Thu May 24 21:36:20 2018 +0200 summary: [Product Locked/Discontinued] Code review Avoid checking PLM Status in returns. Do not filter by m_attributesetinstance_id and m_product_uom_id when checking the stock. Fix seqno default value. Add default value to ad_module_id. Rename PLM-Status as PLM Status in window, field and messages. Reorder fields in PLM Status. Add description and help to PLM-Status reference. Move PLM Status window in menu from Product Management to Master Data Management | Product Setup. details: https://code.openbravo.com/erp/devel/pi/rev/db8b0152c908 changeset: 34067:db8b0152c908 user: Asier Martirena <asier.martirena <at> openbravo.com> date: Fri May 25 10:47:08 2018 +0200 summary: [Product Locked/Discontinued] Fixed messages and changed reference name details: https://code.openbravo.com/erp/devel/pi/rev/640263f9e63f changeset: 34068:640263f9e63f user: Asier Martirena <asier.martirena <at> openbravo.com> date: Fri May 25 11:46:38 2018 +0200 summary: Fixed issue 38356: [Product Locked/Discontinued] Merged to PI diffstat: .hgsigs | 3 + .hgtags | 3 + build.xml | 34 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 12 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml | 5 +- 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/ModifyPaymentPlanHook.java | 44 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java | 49 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanHookCaller.java | 45 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/Transactions.java | 22 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java | 24 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 72 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/MatchTransactionDao.java | 76 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java | 52 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java | 33 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/APRMApplicationInitializer.java | 88 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/APRMSQLFunctionRegister.java | 99 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java | 21 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 1 + modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- 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.base.weld/src-test/org/openbravo/base/weld/test/WeldBaseTest.java | 28 +- modules/org.openbravo.base.weld/src/META-INF/beans.xml | 4 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 4 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 33 - 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-test/org/openbravo/client/application/test/event/ObserverBaseTest.java | 2 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderLineTestObserver.java | 7 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderTestObserver.java | 7 + modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java | 10 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ComputeWindowActionHandler.java | 10 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java | 22 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java | 44 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java | 54 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationActionHandler.java | 16 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java | 42 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/BaseReportActionHandler.java | 21 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/CompiledReportManager.java | 157 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/JmxReportCache.java | 59 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/JmxReportCacheMBean.java | 50 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportCompiler.java | 168 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportFiller.java | 134 + modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java | 394 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java | 59 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js | 22 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js | 27 +- 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-test/org/openbravo/client/kernel/freemarker/test/GenerateComponentTest.java | 15 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java | 29 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java | 56 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelSQLFunctionRegister.java | 52 + 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.myob/src/org/openbravo/client/myob/WidgetProvider.java | 12 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 13 - 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.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 61 +- 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.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java | 19 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceProperty.java | 10 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java | 21 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java | 46 +- 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_MODEL_OBJECT_MAPPING.xml | 23 - 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/SelectorDefaultFilterActionHandler.java | 29 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 37 +- 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.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- 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 | 22 +- referencedata/sampledata/F_B_International_Group/AD_ORG.xml | 24 + referencedata/sampledata/F_B_International_Group/AD_PROCESS_ACCESS.xml | 560 --- referencedata/sampledata/F_B_International_Group/C_CONVERSION_RATE.xml | 4 +- referencedata/sampledata/QA_Testing/AD_ORG.xml | 8 + referencedata/sampledata/QA_Testing/AD_PROCESS_ACCESS.xml | 168 - referencedata/sampledata/QA_Testing/M_INOUT.xml | 32 + src-core/.settings/org.eclipse.jdt.core.prefs | 11 - src-core/build.xml | 4 +- src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java | 9 +- src-db/database/build-create.xml | 8 +- src-db/database/build.xml | 4 +- src-db/database/lib/dbsourcemanager.jar | Bin src-db/database/model/functions/AD_GET_ORG_LE_BU.xml | 100 +- src-db/database/model/functions/AD_GET_ORG_LE_BU_TREENODE.xml | 101 + src-db/database/model/functions/AD_ORG_GETCALENDAROWNER.xml | 60 +- src-db/database/model/functions/AD_ORG_GETCALENDAROWNERTN.xml | 77 + src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOW.xml | 42 +- src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOWTN.xml | 65 + src-db/database/model/functions/AD_ORG_READY.xml | 94 +- src-db/database/model/functions/A_ASSET_CREATE.xml | 35 +- src-db/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml | 6 +- src-db/database/model/functions/C_CASH_POST.xml | 78 +- src-db/database/model/functions/C_CONVERT_DOC_CURRENCY.xml | 10 +- src-db/database/model/functions/C_CREATE_PINVOICE_FROM_OUTS.xml | 7 +- src-db/database/model/functions/C_CURRENCY_CONVERT.xml | 3 +- src-db/database/model/functions/C_CURRENCY_CONVERT_PRECISION.xml | 3 +- src-db/database/model/functions/C_CURRENCY_CONVERT_RATE.xml | 3 +- src-db/database/model/functions/C_CURRENCY_RATE.xml | 3 +- src-db/database/model/functions/C_GETWITHHOLDING.xml | 15 +- src-db/database/model/functions/C_GET_CURRENCY_PRECISION.xml | 3 +- src-db/database/model/functions/C_GET_DEFAULT_PERIOD.xml | 11 +- src-db/database/model/functions/C_GET_NET_AMOUNT_FROM_GROSS.xml | 3 +- src-db/database/model/functions/C_GET_NET_PRICE_FROM_GROSS.xml | 3 +- src-db/database/model/functions/C_GET_TAX_AMT_FROM_NET.xml | 3 +- src-db/database/model/functions/C_INVOICE_CREATE.xml | 11 +- src-db/database/model/functions/C_INVOICE_CREATE0.xml | 3 +- src-db/database/model/functions/C_INVOICE_CREATERECEIPT.xml | 3 +- src-db/database/model/functions/C_INVOICE_POST.xml | 41 +- src-db/database/model/functions/C_ORDER_POST1.xml | 36 +- src-db/database/model/functions/C_PROJECT_WON.xml | 8 +- src-db/database/model/functions/C_TAXPAYMENT_POST.xml | 8 +- src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml | 3 +- src-db/database/model/functions/MRP_PURCHASEPLAN.xml | 5 +- src-db/database/model/functions/MRP_RUN_EXPLODE.xml | 5 +- src-db/database/model/functions/MRP_RUN_INITIALIZE.xml | 8 +- src-db/database/model/functions/M_GET_STOCK_PARAM.xml | 3 +- src-db/database/model/functions/M_INOUT_CREATE0.xml | 3 +- src-db/database/model/functions/M_INOUT_POST.xml | 1 - src-db/database/model/functions/M_MOVEMENT_POST.xml | 1 + src-db/database/model/functions/M_RESERVATION_POST.xml | 4 +- src-db/database/model/functions/M_RESERVATION_REALLOCATE.xml | 3 +- src-db/database/model/functions/M_RESERVE_STOCK_AUTO.xml | 3 +- src-db/database/model/functions/M_WAREHOUSE_DEFAULT_RULE_PARAM.xml | 3 +- src-db/database/model/tables/AD_HEARTBEAT_LOG.xml | 4 - src-db/database/model/tables/AD_MODULE.xml | 4 - src-db/database/model/tables/AD_MODULE_INSTALL.xml | 4 - src-db/database/model/tables/AD_ORG.xml | 35 + src-db/database/model/tables/AD_PROCESS_REQUEST.xml | 4 + src-db/database/model/tables/AD_SYSTEM_INFO.xml | 4 - src-db/database/model/tables/M_INOUT.xml | 2 +- src-db/database/model/tables/M_PRODUCT.xml | 8 + src-db/database/model/tables/M_PRODUCT_STATUS.xml | 98 + src-db/database/model/tables/M_PRODUCT_STATUS_TRL.xml | 74 + src-db/database/model/tables/M_WAREHOUSE.xml | 6 +- src-db/database/model/triggers/AD_CALLOUT_TRG.xml | 21 +- src-db/database/model/triggers/AD_MODULE_TRG.xml | 81 +- src-db/database/model/triggers/AD_MODULE_TRG2.xml | 3 +- src-db/database/model/triggers/C_ORDERLINE_TRG2.xml | 15 +- src-db/database/model/triggers/C_PERIOD_TRG.xml | 9 +- src-db/database/model/triggers/M_RESERVATION_TRG.xml | 3 +- src-db/database/sourcedata/AD_CALLOUT.xml | 20 - src-db/database/sourcedata/AD_COLUMN.xml | 1669 ++++++++- src-db/database/sourcedata/AD_DATASET_COLUMN.xml | 11 - src-db/database/sourcedata/AD_DATASET_TABLE.xml | 14 + src-db/database/sourcedata/AD_ELEMENT.xml | 234 +- src-db/database/sourcedata/AD_FIELD.xml | 944 +++++- src-db/database/sourcedata/AD_FIELDGROUP.xml | 10 + src-db/database/sourcedata/AD_MENU.xml | 14 + src-db/database/sourcedata/AD_MESSAGE.xml | 124 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 48 - src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 1700 ---------- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_PROCESS.xml | 93 - src-db/database/sourcedata/AD_REFERENCE.xml | 28 + src-db/database/sourcedata/AD_TAB.xml | 63 +- src-db/database/sourcedata/AD_TABLE.xml | 50 + src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 477 -- src-db/database/sourcedata/AD_TREENODE.xml | 11 + src-db/database/sourcedata/AD_VAL_RULE.xml | 4 +- src-db/database/sourcedata/AD_WINDOW.xml | 16 + src-db/database/sourcedata/M_PRODUCT_STATUS.xml | 93 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 37 +- src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 176 + src-test/src/org/openbravo/test/AllAntTaskTests.java | 20 +- src-test/src/org/openbravo/test/AllQuickAntTaskTests.java | 6 +- src-test/src/org/openbravo/test/AllTests.java | 6 +- src-test/src/org/openbravo/test/AllWebserviceTests.java | 4 +- src-test/src/org/openbravo/test/AntTaskTests.java | 6 +- src-test/src/org/openbravo/test/base/OBBaseTest.java | 86 +- src-test/src/org/openbravo/test/costing/TestCostingLandedCost.java | 308 +- src-test/src/org/openbravo/test/costing/TestCostingNoSourceAdjustments.java | 147 +- src-test/src/org/openbravo/test/costing/utils/TestCostingUtils.java | 336 +- src-test/src/org/openbravo/test/dal/DalComplexQueryRequisitionTest.java | 67 +- src-test/src/org/openbravo/test/dal/DalComplexQueryTestOrderLine.java | 22 +- src-test/src/org/openbravo/test/dal/DalQueryTest.java | 11 +- src-test/src/org/openbravo/test/dal/IssuesTest.java | 30 +- src-test/src/org/openbravo/test/datasource/DatasourceTestUtil.java | 2 +- src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoConstants.java | 57 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoCornerCaseOrgTest.java | 59 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoSetReadyTest.java | 109 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoTestSuite.java | 28 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistInfoUtility.java | 294 + src-test/src/org/openbravo/test/generalsetup/enterprise/organization/ADOrgPersistOrgInfoComplexOrgTreeTest.java | 142 + src-test/src/org/openbravo/test/inventoryStatus/InventoryStatusTest.java | 9 +- src-test/src/org/openbravo/test/productStatus/ProductStatusTest.java | 223 + src-test/src/org/openbravo/test/reporting/AllJrxmlCompilation.java | 60 +- src-test/src/org/openbravo/test/reporting/CompiledReportsCacheTest.java | 92 + src-test/src/org/openbravo/test/security/AccessLevelTest.java | 33 +- src-test/src/org/openbravo/test/security/PasswordStrengthCheckerTest.java | 78 + src-test/src/org/openbravo/test/selector/TestSelectorDefaultFilterActionHandler.java | 66 + src-test/src/org/openbravo/test/views/GCSequenceNumberTests.java | 17 +- src-test/src/org/openbravo/test/views/GridConfigurationTest.java | 57 + src-test/src/org/openbravo/test/views/SortingFilteringGridConfiguration.java | 23 +- src-test/src/org/openbravo/test/views/ViewGenerationWithDifferentConfigLevelTest.java | 24 +- src-util/buildvalidation/build.xml | 7 +- src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue.class | Bin src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DuplicatedClientWarehouseValueData.class | Bin src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/JdkVersionCheck.class | Bin src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue.java | 62 + src-util/buildvalidation/src/org/openbravo/buildvalidation/DuplicatedClientWarehouseValue_data.xsql | 49 + src-util/buildvalidation/src/org/openbravo/buildvalidation/JdkVersionCheck.java | 57 - src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateIsCompletelyInvoicedData.class | Bin src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePersistOrgInfo.class | Bin src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePersistOrgInfoData.class | Bin src-util/modulescript/src/org/openbravo/modulescript/UpdateIsCompletelyInvoiced_data.xsql | 4 +- src-util/modulescript/src/org/openbravo/modulescript/UpdatePersistOrgInfo.java | 61 + src-util/modulescript/src/org/openbravo/modulescript/UpdatePersistOrgInfo_data.xsql | 123 + src/build.xml | 50 +- src/index.jsp | 6 +- src/org/openbravo/authentication/AuthenticationManager.java | 11 + src/org/openbravo/authentication/ChangePasswordException.java | 41 + src/org/openbravo/authentication/basic/AutologonAuthenticationManager.java | 7 +- src/org/openbravo/base/secureApp/LoginHandler.java | 56 +- src/org/openbravo/base/secureApp/LoginUtils.java | 11 +- src/org/openbravo/base/secureApp/OrgTree_data.xsql | 32 - src/org/openbravo/base/session/SessionFactoryController.java | 21 +- src/org/openbravo/base/structure/BaseOBObject.java | 10 +- src/org/openbravo/common/actionhandler/CashflowForecastReportActionHandler.java | 11 +- src/org/openbravo/costing/AverageAlgorithm.java | 5 +- src/org/openbravo/costing/AverageCostAdjustment.java | 255 +- src/org/openbravo/costing/CostAdjustmentProcess.java | 50 +- src/org/openbravo/costing/CostAdjustmentUtils.java | 65 +- src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 44 +- src/org/openbravo/costing/CostingMigrationProcess.java | 9 +- src/org/openbravo/costing/CostingUtils.java | 30 +- src/org/openbravo/costing/PriceDifferenceByDateProcess.java | 3 +- src/org/openbravo/dal/core/DalLayerInitializer.java | 42 +- src/org/openbravo/dal/core/DalSessionFactoryController.java | 39 +- src/org/openbravo/dal/core/SQLFunctionRegister.java | 39 + src/org/openbravo/dal/service/OBDal.java | 81 +- src/org/openbravo/dal/service/OBQuery.java | 78 +- src/org/openbravo/erpCommon/ad_actionButton/CreateWorkEffort.java | 10 +- src/org/openbravo/erpCommon/ad_actionButton/RMInsertOrphanLine.java | 41 +- src/org/openbravo/erpCommon/ad_callouts/SE_Calendar_For_Org.java | 99 - src/org/openbravo/erpCommon/ad_callouts/SE_Locator_Activate.java | 27 +- src/org/openbravo/erpCommon/ad_callouts/SE_Years_For_Calendar.java | 100 - src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Locator.java | 94 - src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Locator_data.xsql | 65 - src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java | 36 +- src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Tax.java | 96 - src/org/openbravo/erpCommon/ad_callouts/SL_MovementAll_Locator.java | 97 - src/org/openbravo/erpCommon/ad_callouts/SL_Payment_Amounts.java | 214 - src/org/openbravo/erpCommon/ad_callouts/SL_Payment_Amounts_data.xsql | 53 - src/org/openbravo/erpCommon/ad_callouts/SL_Payment_DocType.java | 93 - src/org/openbravo/erpCommon/ad_callouts/SL_Payment_DocType_data.xsql | 49 - src/org/openbravo/erpCommon/ad_callouts/SL_Payment_No_Verify.java | 105 - src/org/openbravo/erpCommon/ad_callouts/SL_WorkRequirement_Sequence.java | 88 - src/org/openbravo/erpCommon/ad_callouts/SL_WorkRequirement_Sequence.xsql | 37 - src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 4 +- src/org/openbravo/erpCommon/ad_forms/Heartbeat.java | 5 +- src/org/openbravo/erpCommon/ad_forms/Heartbeat_data.xsql | 8 +- src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java | 12 +- src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java | 6 +- src/org/openbravo/erpCommon/ad_process/SystemInfo_data.xsql | 9 +- src/org/openbravo/erpCommon/ad_process/assets/AssetLinearDepreciationMethodProcess.java | 31 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.java | 14 +- src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitabilityJR.java | 48 +- src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceJR.java | 17 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalanceDetail_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily.java | 12 +- src/org/openbravo/erpCommon/businessUtility/Heartbeat_data.xsql | 33 - src/org/openbravo/erpCommon/businessUtility/Preferences.java | 52 +- src/org/openbravo/erpCommon/info/AttributeSetInstance.java | 38 +- src/org/openbravo/erpCommon/modules/ImportModule.java | 20 - src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java | 27 +- src/org/openbravo/erpCommon/security/Login.java | 71 +- src/org/openbravo/erpCommon/utility/DimensionDisplayUtility.java | 42 +- src/org/openbravo/erpCommon/utility/ReferencedLink.java | 9 +- src/org/openbravo/erpCommon/utility/SystemInfo.java | 25 +- src/org/openbravo/erpCommon/utility/SystemInfo_data.xsql | 12 +- src/org/openbravo/erpCommon/utility/Utility.java | 4 +- src/org/openbravo/erpCommon/utility/poc/EmailManager.java | 7 +- src/org/openbravo/erpCommon/utility/reporting/ReportManager.java | 2 +- src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR.jrxml | 2 +- src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml | 2 +- src/org/openbravo/erpReports/RptC_Remittance.java | 11 +- src/org/openbravo/erpReports/RptC_Settlement.fo | 39 - src/org/openbravo/erpReports/RptC_Settlement.java | 96 - src/org/openbravo/erpReports/RptC_Settlement.xml | 29 - src/org/openbravo/erpReports/RptC_SettlementHeader.fo | 81 - src/org/openbravo/erpReports/RptC_SettlementHeader.xml | 33 - src/org/openbravo/erpReports/RptC_SettlementLines.fo | 91 - src/org/openbravo/erpReports/RptC_SettlementLines.xml | 33 - src/org/openbravo/erpReports/RptC_Settlement_Header_data.xsql | 48 - src/org/openbravo/erpReports/RptC_Settlement_Lines_data.xsql | 47 - src/org/openbravo/erpReports/RptC_Settlement_data.xsql | 49 - src/org/openbravo/erpReports/RptM_Inout.fo | 42 - src/org/openbravo/erpReports/RptM_Inout.java | 97 - src/org/openbravo/erpReports/RptM_Inout.xml | 29 - src/org/openbravo/erpReports/RptM_InoutHeader.fo | 130 - src/org/openbravo/erpReports/RptM_InoutHeader.xml | 38 - src/org/openbravo/erpReports/RptM_InoutLines.fo | 141 - src/org/openbravo/erpReports/RptM_InoutLines.xml | 32 - src/org/openbravo/erpReports/RptM_Inout_Header_data.xsql | 47 - src/org/openbravo/erpReports/RptM_Inout_Lines_data.xsql | 47 - src/org/openbravo/erpReports/RptM_Inout_data.xsql | 62 - src/org/openbravo/erpReports/RptM_Movement.fo | 31 - src/org/openbravo/erpReports/RptM_Movement.java | 81 - src/org/openbravo/erpReports/RptM_Movement.xml | 28 - src/org/openbravo/erpReports/RptM_MovementLines.fo | 261 - src/org/openbravo/erpReports/RptM_MovementLines.xml | 43 - src/org/openbravo/erpReports/RptM_Movement_data.xsql | 79 - src/org/openbravo/erpReports/RptM_Requisition.java | 24 +- src/org/openbravo/erpReports/RptM_Requisition.jrxml | 3 +- src/org/openbravo/erpReports/RptPromissoryNote.fo | 66 - src/org/openbravo/erpReports/RptPromissoryNote.java | 218 - src/org/openbravo/erpReports/RptPromissoryNote.xml | 38 - src/org/openbravo/erpReports/RptPromissoryNoteAfter.fo | 61 - src/org/openbravo/erpReports/RptPromissoryNoteAfter.xml | 74 - src/org/openbravo/erpReports/RptPromissoryNoteAfter_data.xsql | 110 - src/org/openbravo/erpReports/RptPromissoryNoteError.fo | 23 - src/org/openbravo/erpReports/RptPromissoryNoteError.xml | 32 - src/org/openbravo/erpReports/RptPromissoryNoteError_data.xsql | 31 - src/org/openbravo/erpReports/RptPromissoryNoteHeader.fo | 86 - src/org/openbravo/erpReports/RptPromissoryNoteHeader.xml | 39 - src/org/openbravo/erpReports/RptPromissoryNoteHeader_data.xsql | 89 - src/org/openbravo/erpReports/RptPromissoryNoteTree_data.xsql | 37 - src/org/openbravo/erpReports/RptPromissoryNote_data.xsql | 56 - src/org/openbravo/financial/ResetAccounting.java | 196 +- src/org/openbravo/materialmgmt/InventoryCountProcess.java | 6 +- src/org/openbravo/materialmgmt/ManageVariantsDS.java | 15 +- src/org/openbravo/materialmgmt/ProductCharacteristicsDS.java | 14 +- src/org/openbravo/service/password/PasswordStrengthChecker.java | 117 + 361 files changed, 9174 insertions(+), 10113 deletions(-) diffs (truncated from 29981 to 300 lines): diff -r 83a89e5a2543 -r 640263f9e63f .hgsigs --- a/.hgsigs Fri Apr 06 09:47:12 2018 +0200 +++ b/.hgsigs Fri May 25 11:46:38 2018 +0200 @@ -228,3 +228,6 @@ f06ec509f2bf413f13d422e937ec12531fe1821a 0 iEYEABECAAYFAlqzgcwACgkQCX/oGf+2qkP/EACeJH+QthNIdldCdTvfnllHXTXDo24AnRVV1DveMhhNbgb50zu8ETDZ1WVT b90f619fc9f3f9ca6439969e99f742f9a9403f82 0 iEYEABECAAYFAlqMGfIACgkQCX/oGf+2qkPjiQCgyYNqJlbSOSoax5ydjqpJKun85RIAoM9s2iEyLfJ8CJyfUXFmz6FtvmqC c38ab6f55348fbb5963fd77b770f939a5c0eda23 0 iEYEABECAAYFAlq0lSgACgkQCX/oGf+2qkN3FwCgggZ7hoUQveeRYCuBBuHAi77v84gAn1RBjuscKhHjc7ouPvgiPgIVanBb +9bad88c00b5da708f3e9c1abacd25ea6e6cfd664 0 iEUEABECAAYFAlrXODoACgkQCX/oGf+2qkOblACg0WOwH27TgkH75iKw2Y9tNYxSL8oAl3j0FbjQF6F05ESzZC0l3Uv2Nfg= +dc2ef98dc38f7c32c888dcf1f1adb37c6afb4d14 0 iEYEABECAAYFAlrxbisACgkQCX/oGf+2qkMMCwCdFeF47f2MY7Pq3cdsyHon64EYekwAoPYllLnhYETGsUEqtiKSxvj9Mgxb +2121d856284cf0c4f26faef336bd2aa41ada151f 0 iEYEABECAAYFAlr8AykACgkQCX/oGf+2qkPKhQCfeQ+9S16IA3wZMgnoJjRRZRvG8SUAoIgKQPopjsjObnB6Qu1DyNgCByRt diff -r 83a89e5a2543 -r 640263f9e63f .hgtags --- a/.hgtags Fri Apr 06 09:47:12 2018 +0200 +++ b/.hgtags Fri May 25 11:46:38 2018 +0200 @@ -239,3 +239,6 @@ 7b0d4c95c2b308cd1b12dcfbe2a36c7f77fb49a4 3.0PR17Q4.2 46184d2680e43a9b29d3058a75dea7d15d47b4b4 3.0PR18Q1 03f6ac7d17926657b093b25f613a4cd3fb47ef65 3.0PR18Q1.1 +650aaadd6b6c5fda4f7ad957701face4fa4c3317 3.0PR18Q1.2 +307b23f7635f3e92dd8fc8e7d55d09b7c914384c 3.0PR18Q2 +63c5e173ffdca0828d75476e5a48e2fae42ad9e9 3.0PR18Q1.3 diff -r 83a89e5a2543 -r 640263f9e63f build.xml --- a/build.xml Fri Apr 06 09:47:12 2018 +0200 +++ b/build.xml Fri May 25 11:46:38 2018 +0200 @@ -96,8 +96,6 @@ <property name="buildValidation" value="true"/> <property name="modules" value=""/> - <available file=".hg" property="is.hg" /> - <condition property="xdoclint.missing" value="" else="-Xdoclint:-missing"> <equals arg1="${ant.java.version}" arg2="1.7"/> </condition> @@ -347,22 +345,23 @@ <taskdef resource="axis-tasks.properties" classpathref="project.class.path" /> - <target name="init" depends="code.rev"> + <target name="init"> <fail if="root.user" message="Don't run ant tasks with the root user" /> <fail if="no.java.home" message="The environment variable JAVA_HOME is not set." /> - </target> - - <target name="code.rev" depends="set.code.rev"> - <condition property="code.revision" value="${hg.id}" else="0"> - <isset property="hg.id" /> - </condition> - </target> - - <target name="set.code.rev" if="is.hg"> - <exec executable="hg" outputproperty="hg.id" failifexecutionfails="false"> - <arg value="id"/> - <arg value="-i"/> - </exec> + <fail message="Unsupported Java version ${ant.java.version}. Minimum required is 7 (1.7)."> + <condition> + <equals arg1="${ant.java.version}" arg2="1.6"/> + </condition> + </fail> + <antversion property="min.ant.version" atleast="1.9.2" /> + <antversion property="actual.ant.version" /> + <fail message="Unsupported ant version ${actual.ant.version}. Minimum required is 1.9.2."> + <condition> + <not> + <isset property="min.ant.version"/> + </not> + </condition> + </fail> </target> <target name="compile.complete" depends="init, core.lib, wad.lib, trl.lib"> @@ -821,7 +820,6 @@ <jvmarg line="${env.CATALINA_OPTS}" /> <jvmarg value="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" /> <jvmarg value="-Djava.util.logging.config.file=${env.CATALINA_BASE}/conf/logging.properties" /> - <jvmarg value="-Djava.endorsed.dirs=${env.CATALINA_HOME}/endorsed" /> <jvmarg value="-Dcatalina.base=${env.CATALINA_BASE}" /> <jvmarg value="-Dcatalina.home=${env.CATALINA_HOME}" /> <jvmarg value="-Djava.io.tmpdir=${env.CATALINA_BASE}/temp" /> @@ -951,8 +949,6 @@ replace="\1${core.rev}\3" byline="true"/> - <echo message="${hg.id}" file="${tmpdir}/config/instance.revision"/> - <delete includeEmptyDirs="true"> <fileset dir="${tmpdir}/modules" includes="**/*" defaultexcludes="no"/> </delete> diff -r 83a89e5a2543 -r 640263f9e63f modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Fri Apr 06 09:47:12 2018 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml Fri May 25 11:46:38 2018 +0200 @@ -657,7 +657,8 @@ v_ConvertedAmount := COALESCE(V_OutstandingAmount, 0) * v_creditmultiplier; end if; UPDATE C_BPARTNER - SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) + v_ConvertedAmount + SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) + v_ConvertedAmount, + UPDATED = now() WHERE C_BPARTNER_ID = v_BPartner_ID; -- Automatic creation of payment and financial transaction @@ -999,7 +1000,8 @@ v_ConvertedAmount := (COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0) * v_creditmultiplier); end if; UPDATE C_BPARTNER - SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_ConvertedAmount + SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_ConvertedAmount, + UPDATED = now() WHERE C_BPARTNER_ID = v_BPartner_ID; END IF; -- Automatic creation of financial transaction @@ -1070,8 +1072,6 @@ ELSIF (p_docaction = 'RE') THEN DECLARE - v_count NUMBER; - v_documentno VARCHAR2(40); v_PaymentPlanExpectedTotal NUMBER:= 0; BEGIN SELECT count(*), max(p.documentno) @@ -1148,7 +1148,8 @@ v_ConvertedAmount := ((v_PaymentPlanExpectedTotal - v_PaidAmount) * v_creditmultiplier); END IF; UPDATE C_BPARTNER - SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_convertedAmount + SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_convertedAmount, + UPDATED = now() WHERE C_BPARTNER_ID = v_BPartner_ID; -- Delete C_InvoiceTax_CashVAT records for this invoice @@ -1168,7 +1169,6 @@ ELSIF (p_docaction = 'RC') THEN DECLARE - v_count NUMBER; v_prepaymentamt NUMBER; BEGIN v_delete_paymentplan := TRUE; diff -r 83a89e5a2543 -r 640263f9e63f modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Fri Apr 06 09:47:12 2018 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Fri May 25 11:46:38 2018 +0200 @@ -16,7 +16,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) 2013-2015 Openbravo SLU +* All portions are Copyright (C) 2013-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -97,7 +97,6 @@ DECLARE v_payment_schedule_order VARCHAR2(32); - v_count NUMBER; v_pendingamount NUMBER; cur_invoicepayments RECORD; BEGIN diff -r 83a89e5a2543 -r 640263f9e63f modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Fri Apr 06 09:47:12 2018 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Fri May 25 11:46:38 2018 +0200 @@ -19,7 +19,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2011-2016 Openbravo SLU +* All portions are Copyright (C) 2011-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -106,6 +106,7 @@ WHEN OTHERS THEN DBMS_OUTPUT.PUT_LINE('aprm_ispaymentconfirmed exception'); RAISE; + RETURN NULL; END APRM_ISPAYMENTCONFIRMED ]]></body> </function> diff -r 83a89e5a2543 -r 640263f9e63f modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml Fri Apr 06 09:47:12 2018 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml Fri May 25 11:46:38 2018 +0200 @@ -22,7 +22,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) 2015 Openbravo SLU +* All portions are Copyright (C) 2015-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -43,6 +43,7 @@ WHEN OTHERS THEN DBMS_OUTPUT.PUT_LINE('aprm_seqnumberinvoicepaidstatus exception'); RAISE; + RETURN NULL; END APRM_SEQNOINVPAIDSTATUS ]]></body> </function> diff -r 83a89e5a2543 -r 640263f9e63f modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml Fri Apr 06 09:47:12 2018 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml Fri May 25 11:46:38 2018 +0200 @@ -16,7 +16,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) 2014-2017 Openbravo SLU +* All portions are Copyright (C) 2014-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -49,6 +49,7 @@ WHEN OTHERS THEN DBMS_OUTPUT.PUT_LINE('aprm_seqnumberpaymentstatus exception'); RAISE; + RETURN NULL; END APRM_SEQNUMBERPAYMENTSTATUS ]]></body> </function> diff -r 83a89e5a2543 -r 640263f9e63f modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml Fri Apr 06 09:47:12 2018 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml Fri May 25 11:46:38 2018 +0200 @@ -16,7 +16,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-2014 Openbravo SLU +* All portions are Copyright (C) 2010-2018 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -175,7 +175,8 @@ WHERE C_TAXPAYMENT_ID = p_record_id; -- Updating SO_CREDITUSED when PAYMENT OCCUR UPDATE C_BPARTNER - SET SO_CREDITUSED = SO_CREDITUSED - COALESCE(p_amount, 0) + SET SO_CREDITUSED = SO_CREDITUSED - COALESCE(p_amount, 0), + UPDATED = now() WHERE C_BPARTNER_ID = v_BPartner_ID; -- Automatic creation of financial transaction diff -r 83a89e5a2543 -r 640263f9e63f modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Apr 06 09:47:12 2018 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri May 25 11:46:38 2018 +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.33768]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.34012]]></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 83a89e5a2543 -r 640263f9e63f modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Apr 06 09:47:12 2018 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri May 25 11:46:38 2018 +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.33768]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.34012]]></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.33768]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.34012]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 83a89e5a2543 -r 640263f9e63f modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ModifyPaymentPlanHook.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ModifyPaymentPlanHook.java Fri May 25 11:46:38 2018 +0200 @@ -0,0 +1,44 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.0 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * The Original Code is Openbravo ERP. + * The Initial Developer of the Original Code is Openbravo SLU + * All portions are Copyright (C) 2018 Openbravo SLU + * All Rights Reserved. + * Contributor(s): + ************************************************************************* + */ +package org.openbravo.advpaymentmngt; + +import java.util.List; + +import org.openbravo.base.exception.OBException; +import org.openbravo.model.financialmgmt.payment.FIN_PaymentSchedule; ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
