details: https://code.openbravo.com/erp/devel/pi/rev/cbb05eb7f006 changeset: 28637:cbb05eb7f006 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Thu Nov 19 09:33:12 2015 +0100 summary: [ChangePassword] Added columns/fields to ad_client and ad_user. Added some logic to login in client and server
details: https://code.openbravo.com/erp/devel/pi/rev/0d4f091d1e54 changeset: 28638:0d4f091d1e54 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Mon Nov 23 18:24:08 2015 +0100 summary: [ChangePassword] Added more logic to client and server details: https://code.openbravo.com/erp/devel/pi/rev/632560abfb78 changeset: 28639:632560abfb78 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Wed Nov 25 10:35:15 2015 +0100 summary: [ChangePassword] Solved some problems importing libraries. details: https://code.openbravo.com/erp/devel/pi/rev/a2f2698c2672 changeset: 28640:a2f2698c2672 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Wed Nov 25 12:50:59 2015 +0100 summary: [ChangePassword] Changed query to validate password date details: https://code.openbravo.com/erp/devel/pi/rev/cf47b2178ea9 changeset: 28641:cf47b2178ea9 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Fri Nov 27 12:44:36 2015 +0100 summary: [ChangePassword] Added logic to client and server to update the password once validity date is reached details: https://code.openbravo.com/erp/devel/pi/rev/f7b7fe14459b changeset: 28642:f7b7fe14459b user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Thu Dec 10 12:08:33 2015 +0100 summary: [ChangePassword] Added trigger to update date once password is changed details: https://code.openbravo.com/erp/devel/pi/rev/ac519ab9312a changeset: 28643:ac519ab9312a user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Thu Dec 10 12:16:57 2015 +0100 summary: [ChangePassword] Deleted retail script. details: https://code.openbravo.com/erp/devel/pi/rev/6bce485227be changeset: 28644:6bce485227be user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Wed Dec 16 10:11:33 2015 +0100 summary: [ChangePassword] Added messages in AD. Solved some problems with OBDAL default restrictions details: https://code.openbravo.com/erp/devel/pi/rev/ff8998e5a827 changeset: 28645:ff8998e5a827 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Fri Dec 18 08:37:26 2015 +0100 summary: [ChangePassword] Fixed licenses of file. details: https://code.openbravo.com/erp/devel/pi/rev/d09dcfa52720 changeset: 28646:d09dcfa52720 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Fri Dec 18 08:44:45 2015 +0100 summary: [ChangePassword] Added license to trigger. details: https://code.openbravo.com/erp/devel/pi/rev/4a6512674a94 changeset: 28647:4a6512674a94 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Fri Dec 18 08:46:20 2015 +0100 summary: [ChangePassword] Updated date in trigger license. details: https://code.openbravo.com/erp/devel/pi/rev/072fe8f0529d changeset: 28648:072fe8f0529d user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Fri Dec 18 10:15:24 2015 +0100 summary: [ChangePassword] Updated date of licenses. details: https://code.openbravo.com/erp/devel/pi/rev/f4ffc58ee796 changeset: 28649:f4ffc58ee796 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Mon Dec 21 16:15:13 2015 +0100 summary: [ChangePassword] Updated fields, synchronize terminology to get elements details: https://code.openbravo.com/erp/devel/pi/rev/be05b136c217 changeset: 28650:be05b136c217 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Mon Dec 21 16:26:08 2015 +0100 summary: [ChangePassword] Merge with actual pi details: https://code.openbravo.com/erp/devel/pi/rev/a8105d7b8e40 changeset: 28651:a8105d7b8e40 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Wed Dec 23 10:52:18 2015 +0100 summary: [ChangePassword] Fixed some minor issues. Messages added. Refactor of some files details: https://code.openbravo.com/erp/devel/pi/rev/26d23375a92b changeset: 28652:26d23375a92b user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Wed Dec 23 10:55:13 2015 +0100 summary: [ChangePassword] Merge with pi. details: https://code.openbravo.com/erp/devel/pi/rev/7aa2ff0744bb changeset: 28653:7aa2ff0744bb user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Thu Dec 24 11:56:20 2015 +0100 summary: [ChangePassword] Renamed AD elements,added messages,renamed some variables, trigger updated details: https://code.openbravo.com/erp/devel/pi/rev/98f413d9c6ff changeset: 28654:98f413d9c6ff user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Mon Dec 28 16:19:59 2015 +0100 summary: [ChangePassword] Fixed bug when valid days of password equal to zero. details: https://code.openbravo.com/erp/devel/pi/rev/6456577534a0 changeset: 28655:6456577534a0 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Wed Dec 30 10:48:35 2015 +0100 summary: [ChangePassword] Modified message details: https://code.openbravo.com/erp/devel/pi/rev/b3a1f248e328 changeset: 28656:b3a1f248e328 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Thu Dec 31 13:11:16 2015 +0100 summary: [ChangePassword] Fixed problem with triggers. Last update password date column mandatory to avoid NPE details: https://code.openbravo.com/erp/devel/pi/rev/adce3187dfda changeset: 28657:adce3187dfda user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Thu Dec 31 13:18:09 2015 +0100 summary: [ChangePassword] Merge with Pi details: https://code.openbravo.com/erp/devel/pi/rev/f150acd21d7a changeset: 28658:f150acd21d7a user: Guillermo Gil <guillermo.gil <at> openbravo.com> date: Tue Jan 19 10:38:46 2016 +0100 summary: [ChangePassword] Fixed issue on WebServices There is no session if you are not logged in Openbravo. Use SeguridadData instead of OBCriteria. details: https://code.openbravo.com/erp/devel/pi/rev/3b390cdaaa2e changeset: 28659:3b390cdaaa2e user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Wed Jan 20 12:36:52 2016 +0100 summary: [ChangePassword] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/27a48364f2df changeset: 28660:27a48364f2df user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Wed Jan 20 13:38:41 2016 +0100 summary: [ChangePassword] Solved null value in users fields, added columns from last merge details: https://code.openbravo.com/erp/devel/pi/rev/55e212abb741 changeset: 28661:55e212abb741 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Thu Jan 21 10:17:24 2016 +0100 summary: [ChangePassword] Fixed trigger to work with oracle details: https://code.openbravo.com/erp/devel/pi/rev/788fed01e2a5 changeset: 28662:788fed01e2a5 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Thu Jan 21 10:56:25 2016 +0100 summary: [ChangePassword] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/251285f05aa7 changeset: 28663:251285f05aa7 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Fri Jan 22 09:15:57 2016 +0100 summary: [ChangePassword] Fixed trigger to work with oracle Deleted return new; details: https://code.openbravo.com/erp/devel/pi/rev/409b401e8f17 changeset: 28664:409b401e8f17 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Fri Jan 22 10:19:07 2016 +0100 summary: [ChangePassword] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/c69185a63058 changeset: 28665:c69185a63058 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Fri Jan 22 12:16:40 2016 +0100 summary: [ChangePassword] Fixed trigger to work with oracle Changed logic of trigger details: https://code.openbravo.com/erp/devel/pi/rev/d1a02b344ff9 changeset: 28666:d1a02b344ff9 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Fri Jan 22 12:22:19 2016 +0100 summary: [ChangePassword] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/99dee8bbab26 changeset: 28667:99dee8bbab26 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Thu Jan 28 10:58:07 2016 +0100 summary: [ChangePassword] Fixed code after code review. Username is not cleaned in case of invalid user/password. Added check in LoginHandler to avoid security problem when changing password. Deleted unused params in getUpdatePasswordDate method. Login param changed to username in getUpdatePasswordDate method. Deleted UserLock delay because has been already done (getUpdatePasswordDate and updatePassword methods). Updated javadoc in getUpdatePasswordDate method. Corrections in OBCriteria, using eq instead of like, using property of User PROPERTY_USERNAME. Refactor in Dates in getUpdatePasswordDate method. Deleted comments. Now gets the pasword value from password field instead of user field (Both have the same content when updating the password). Removed strange vars names like strUser and strPass. setAdminMode and restorePreviousMode moved to updatePassword method. Replaced vars.getLanguage() with language var where possible. Updated javadoc in updatePassword method. getUpdatePasswordDate method moved to DefaultAuthenticationManager and changed visibility to private. updatePassword method moved to LoginHandler and changed visibility to private. AuthenticationExpiryPasswordException is now a subclass of authentication exception. Strings compared with === in js(Login.html). Using single quotes '' for js strings. details: https://code.openbravo.com/erp/devel/pi/rev/8289713e0e69 changeset: 28668:8289713e0e69 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Thu Jan 28 12:40:57 2016 +0100 summary: [ChangePassword] Solved security problem, added check to change user password details: https://code.openbravo.com/erp/devel/pi/rev/f62d9ee30060 changeset: 28669:f62d9ee30060 user: Alberto Santos <alberto.santos <at> openbravo.com> date: Tue Feb 02 14:11:27 2016 +0100 summary: [Change Password] Code review applied: Rename property Lastupdatepassworddate to lastPasswordUpdate. Be consistent in naming: change expiry to expiration. Use 'userID' instead of username in getUpdatePasswordDate function. Check sameOldPassword in the rigth place. details: https://code.openbravo.com/erp/devel/pi/rev/75cb35d38d02 changeset: 28670:75cb35d38d02 user: Alberto Santos <alberto.santos <at> openbravo.com> date: Mon Feb 08 16:14:49 2016 +0100 summary: Correct the column updated in AD_USER_EXPIRYPASS_TRG and the message name. details: https://code.openbravo.com/erp/devel/pi/rev/60fde1b7c191 changeset: 28671:60fde1b7c191 user: Alberto Santos <alberto.santos <at> openbravo.com> date: Tue Feb 09 09:45:56 2016 +0100 summary: [Change Password] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/25d249e69d3f changeset: 28672:25d249e69d3f user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Fri Feb 12 11:41:37 2016 +0100 summary: [ChangePassword] Code review applied. Solved camel case in Days To Password Expiration column. Labels in Login.html are now translatable. Last Password Update column is now updated in case user didn't have a password and is set for the first time. Messages are now set correctly from the beginning and are not overwritten. Refactor code, now check for expiration date is made in the method, exception is thrown in the method also. AuthenticationExpirationPasswordException now log a single line. details: https://code.openbravo.com/erp/devel/pi/rev/d5385407e873 changeset: 28673:d5385407e873 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Fri Feb 12 13:44:48 2016 +0100 summary: [ChangePassword] Updated year of license in some files. Updated referenced data with new name of the column details: https://code.openbravo.com/erp/devel/pi/rev/5970284b4e82 changeset: 28674:5970284b4e82 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Mon Feb 15 12:11:46 2016 +0100 summary: [ChangePassword] Code review applied. Updated javadocs of methods. Added check to avoid security problem when updating password. details: https://code.openbravo.com/erp/devel/pi/rev/1cf700dfd92e changeset: 28675:1cf700dfd92e user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Mon Feb 15 12:28:37 2016 +0100 summary: [ChangePassword] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/0d920474c5da changeset: 28676:0d920474c5da user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Mon Feb 15 13:16:35 2016 +0100 summary: [ChangePassword] Added text interfaces from login.html details: https://code.openbravo.com/erp/devel/pi/rev/9dda34ecf279 changeset: 28677:9dda34ecf279 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Wed Feb 17 09:52:43 2016 +0100 summary: [ChangePassword] Applied code review.Fixed security problem. details: https://code.openbravo.com/erp/devel/pi/rev/efc711fa6288 changeset: 28678:efc711fa6288 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Wed Feb 17 09:56:42 2016 +0100 summary: [ChangePassword] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/060c7af3f4dd changeset: 28679:060c7af3f4dd user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Fri Feb 19 12:56:49 2016 +0100 summary: [ChangePassword] Applied code review. Renamed trigger to be consistent, used expiration instead of expiry. Used === to compare strings in Login.html. Renamed getUpdatePasswordDate method to checkIfPasswordExpired in DefaultAuthenticationManager class. Added throws in signature and javadoc for checkIfPasswordExpired and updatePassword methods. Removed static parameter from checkIfPasswordExpired and updatePassword methods. Removed extra brackets in expression in checkIfPasswordExpired method. Exception AuthenticationExpirationPasswordException fixed. Removed extra variables, error is now loaded in the subclass AuthenticationException. Removed empty line in checkIfPasswordExpired. Removed check to support 2.50. LoginUtils file keep unmodified. details: https://code.openbravo.com/erp/devel/pi/rev/e0aaaa3f6b1b changeset: 28680:e0aaaa3f6b1b user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Fri Feb 19 13:42:53 2016 +0100 summary: [ChangePassword] Renamed trigger to AD_USER_EXPIRATIONPASS_TRG details: https://code.openbravo.com/erp/devel/pi/rev/d31f552b21a4 changeset: 28681:d31f552b21a4 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Mon Feb 22 11:31:04 2016 +0100 summary: [ChangePassword] Applied code review. Now client messages are translated. Used === for javascript comparison details: https://code.openbravo.com/erp/devel/pi/rev/bd8ecbb28bd0 changeset: 28682:bd8ecbb28bd0 user: Jonathan Bueno <jonathan.bueno <at> openbravo.com> date: Mon Feb 22 15:30:30 2016 +0100 summary: [ChangePassword] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/f2e7ebc3ea7f changeset: 28683:f2e7ebc3ea7f user: Guillermo Gil <guillermo.gil <at> openbravo.com> date: Fri Feb 26 08:20:01 2016 +0100 summary: [ChangePassword] Merge ChangePassword development diffstat: .hgignore | 2 - .hgsigs | 6 + .hgtags | 6 + build.xml | 22 +- legal/CPL-1.0.txt | 213 - legal/Licensing.txt | 23 +- lib/runtime/barcode4j-fop-ext-0.20.5-complete.jar | 0 lib/runtime/barcode4j-fop-ext-complete.jar | 0 lib/runtime/commons-io-2.0.1.jar | 0 lib/runtime/commons-io-2.4.jar | 0 lib/runtime/fop-1.1.jar | 0 lib/runtime/fop.jar | 0 lib/runtime/jackson-annotations-2.1.4.jar | 0 lib/runtime/jackson-annotations-2.5.1.jar | 0 lib/runtime/jackson-core-2.1.4.jar | 0 lib/runtime/jackson-core-2.5.1.jar | 0 lib/runtime/jackson-databind-2.1.4.jar | 0 lib/runtime/jackson-databind-2.5.1.jar | 0 lib/runtime/jdt-compiler-3.1.1.jar | 0 lib/runtime/jdt-compiler-4.4.2.jar | 0 lib/runtime/postgresql-9.4-1201.jdbc4.jar | 0 lib/runtime/postgresql-9.4.1207.jre6.jar | 0 lib/runtime/xmlgraphics-commons-1.5.jar | 0 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml | 60 +- modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml | 3 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml | 718 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_EXTENSION_POINTS.xml | 10 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml | 84 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MENU.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 48 + 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_REF_LIST.xml | 14 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml | 5 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TREENODE.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentActionHandler.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentReloadLabelsActionHandler.java | 73 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionOnChangePaymentActionHandler.java | 11 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/GLItemTransactionActionHandler.java | 29 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentMethodMulticurrencyActionHandler.java | 24 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/UnMatchSelectedTransactionsActionHandler.java | 151 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 160 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java | 12 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_FinaccTransactionEventListener.java | 7 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddPaymentDefaultValuesHandler.java | 68 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/AddTransactionFilterExpression.java | 13 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java | 62 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java | 18 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/APRM_MatchingUtility.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 145 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 11 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js | 18 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-findTransaction.js | 2 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js | 53 +- 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.client.application/src-db/database/model/tables/OBUIAPP_GC_SYSTEM.xml | 7 +- modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_GC_TAB.xml | 7 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_CALLOUT.xml | 10 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml | 677 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml | 4 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 68 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 + modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml | 13 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/DatasourceEventObserver.java | 191 + modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderLineTestObserver.java | 83 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ADAlertDatasourceService.java | 210 + modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertManagementActionHandler.java | 119 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/CachedPreference.java | 141 + modules/org.openbravo.client.application/src/org/openbravo/client/application/ChildTabRecordCounterActionHandler.java | 97 - modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/PreferenceEventHandler.java | 28 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java | 9 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java | 3 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/report/ReportingUtils.java | 21 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-param-window-parameter.ftl | 2 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-pick-and-execute-view-tab.js.ftl | 22 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-form.js.ftl | 37 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/GridConfigurationSequenceNumberCallout.java | 79 + modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 18 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java | 18 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java | 14 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java | 453 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js | 88 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js | 40 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-combo.js | 19 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js | 18 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js | 21 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-yesno.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 30 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 44 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-messagebar.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 48 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 6 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/materialmgmt/ob-reservation.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js | 5 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-form.js | 16 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js | 29 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 188 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js | 17 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-utilities-number-test.js | 34 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-history-manager.js | 54 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-keyboard-manager.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 17 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/erase_icon.png | 0 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/form/upload_icon.png | 0 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.css | 2 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js | 5 +- 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_COLUMN.xml | 98 + 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/KernelServlet.java | 22 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 7 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl | 5 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_COLUMN.xml | 232 + 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/MyOpenbravoActionHandler.java | 2 +- modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java | 21 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-getting-started-widget.js | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_COLUMN.xml | 94 + modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java | 5 +- 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-db/database/sourcedata/AD_TEXTINTERFACES.xml | 11 + modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html | 8 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java | 33 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml | 2 + modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 35 +- 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_COLUMN.xml | 60 + modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml | 14 + modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java | 15 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/AccountTreeDatasourceService.java | 78 + modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceProperty.java | 28 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java | 27 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java | 3 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java | 98 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java | 15 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_COLUMN.xml | 22 + 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_COLUMN.xml | 20 + 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 | 7 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java | 4 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java | 46 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java | 16 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java | 8 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/UnpagedRequestCachedPreference.java | 93 - modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_COLUMN.xml | 174 + 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/SelectorComponent.java | 5 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 29 +- 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.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js | 5 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 1 + modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_COLUMN.xml | 26 + 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_PROCESS_REQUEST.xml | 886 +- referencedata/sampledata/F_B_International_Group/AD_ROLE.xml | 24 + referencedata/sampledata/F_B_International_Group/AD_SEQUENCE.xml | 82 +- referencedata/sampledata/F_B_International_Group/AD_USER.xml | 48 +- referencedata/sampledata/F_B_International_Group/AD_WINDOW_ACCESS.xml | 140 + referencedata/sampledata/F_B_International_Group/A_AMORTIZATION.xml | 66 +- referencedata/sampledata/F_B_International_Group/A_ASSET.xml | 22 +- referencedata/sampledata/F_B_International_Group/A_ASSET_ACCT.xml | 30 + referencedata/sampledata/F_B_International_Group/C_BPARTNER.xml | 114 +- referencedata/sampledata/F_B_International_Group/C_CONVERSION_RATE.xml | 36 + referencedata/sampledata/F_B_International_Group/C_INVOICE.xml | 4198 +- referencedata/sampledata/F_B_International_Group/C_INVOICELINE.xml | 8448 + referencedata/sampledata/F_B_International_Group/C_INVOICELINETAX.xml | 4104 + referencedata/sampledata/F_B_International_Group/C_INVOICETAX.xml | 1020 + referencedata/sampledata/F_B_International_Group/C_ORDER.xml | 2232 + referencedata/sampledata/F_B_International_Group/C_ORDERLINE.xml | 9108 + referencedata/sampledata/F_B_International_Group/C_ORDERLINETAX.xml | 3468 + referencedata/sampledata/F_B_International_Group/C_ORDERTAX.xml | 576 + referencedata/sampledata/F_B_International_Group/C_ORDER_DISCOUNT.xml | 180 + referencedata/sampledata/F_B_International_Group/FACT_ACCT.xml | 49700 +++++++- referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENT.xml | 44 + referencedata/sampledata/F_B_International_Group/FIN_BANKSTATEMENTLINE.xml | 1386 + referencedata/sampledata/F_B_International_Group/FIN_FINACC_TRANSACTION.xml | 1974 + referencedata/sampledata/F_B_International_Group/FIN_FINANCIAL_ACCOUNT.xml | 8 +- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT.xml | 2274 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_DETAIL.xml | 960 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROPOSAL.xml | 174 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_PROP_DETAIL.xml | 630 + referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULE.xml | 64292 +++++---- referencedata/sampledata/F_B_International_Group/FIN_PAYMENT_SCHEDULEDETAIL.xml | 1326 +- referencedata/sampledata/F_B_International_Group/FIN_RECONCILIATION.xml | 62 +- referencedata/sampledata/F_B_International_Group/GL_JOURNAL.xml | 108 + referencedata/sampledata/F_B_International_Group/GL_JOURNALBATCH.xml | 84 +- referencedata/sampledata/F_B_International_Group/GL_JOURNALLINE.xml | 1260 + referencedata/sampledata/F_B_International_Group/M_COSTING.xml | 1824 +- referencedata/sampledata/F_B_International_Group/M_INOUT.xml | 1530 + referencedata/sampledata/F_B_International_Group/M_INOUTLINE.xml | 4416 + referencedata/sampledata/F_B_International_Group/M_INVENTORY.xml | 20 +- referencedata/sampledata/F_B_International_Group/M_MATCHINV.xml | 1368 + referencedata/sampledata/F_B_International_Group/M_MATCHPO.xml | 2736 + referencedata/sampledata/F_B_International_Group/M_STORAGE_DETAIL.xml | 108 +- referencedata/sampledata/F_B_International_Group/M_STORAGE_PENDING.xml | 54 +- referencedata/sampledata/F_B_International_Group/M_TRANSACTION.xml | 5760 + referencedata/sampledata/F_B_International_Group/M_TRANSACTION_COST.xml | 3264 + referencedata/sampledata/F_B_International_Group/OBUIAPP_PROCESS_ACCESS.xml | 140 + referencedata/sampledata/QA_Testing/AD_SEQUENCE.xml | 2 +- referencedata/sampledata/QA_Testing/C_GLITEM_ACCT.xml | 30 + referencedata/sampledata/QA_Testing/C_ORDER.xml | 434 +- referencedata/sampledata/QA_Testing/C_ORDERLINE.xml | 1421 +- referencedata/sampledata/QA_Testing/C_ORDERLINETAX.xml | 743 +- referencedata/sampledata/QA_Testing/C_ORDERTAX.xml | 310 +- referencedata/sampledata/QA_Testing/M_COSTING.xml | 1320 + referencedata/sampledata/QA_Testing/M_INVENTORY.xml | 8 +- referencedata/sampledata/QA_Testing/M_PRICELIST.xml | 74 +- referencedata/sampledata/QA_Testing/M_PRICELIST_VERSION.xml | 73 +- referencedata/sampledata/QA_Testing/M_PRODUCT.xml | 515 +- referencedata/sampledata/QA_Testing/M_PRODUCTPRICE.xml | 380 +- referencedata/sampledata/QA_Testing/M_PRODUCT_CATEGORY_SERVICE.xml | 42 + referencedata/sampledata/QA_Testing/M_PRODUCT_SERVICE.xml | 81 + referencedata/sampledata/QA_Testing/M_SERVICEPRICERULE.xml | 48 + referencedata/sampledata/QA_Testing/M_SERVICEPRICERULE_RANGE.xml | 87 + referencedata/sampledata/QA_Testing/M_SERVICEPRICERULE_VERSION.xml | 45 + referencedata/sampledata/QA_Testing/M_TRANSACTION.xml | 834 +- referencedata/sampledata/QA_Testing/M_TRANSACTION_COST.xml | 952 + src-core/.classpath | 4 +- src-core/src/org/openbravo/base/AntExecutor.java | 7 +- src-core/src/org/openbravo/base/ConfigParameters.java | 30 +- src-core/src/org/openbravo/base/HttpBaseServlet.java | 91 +- src-core/src/org/openbravo/base/HttpBaseUtils.java | 5 +- src-core/src/org/openbravo/base/MultipartRequest.java | 28 +- src-core/src/org/openbravo/base/VariablesBase.java | 7 +- src-core/src/org/openbravo/base/filter/NumberFilter.java | 3 +- src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java | 6 +- src-core/src/org/openbravo/data/Sqlc.java | 10 +- src-core/src/org/openbravo/data/UtilSql.java | 5 +- src-core/src/org/openbravo/database/ConnectionProviderImpl.java | 16 +- src-core/src/org/openbravo/database/JNDIConnectionProvider.java | 1 + src-core/src/org/openbravo/database/RDBMSIndependent.java | 3 +- src-core/src/org/openbravo/uiTranslation/FieldLabelsData.java | 30 +- src-core/src/org/openbravo/uiTranslation/TranslationHandler.java | 3 +- src-core/src/org/openbravo/uiTranslation/TranslationUtils.java | 3 - src-core/src/org/openbravo/utils/FormatUtilities.java | 5 +- src-core/src/org/openbravo/utils/Replace.java | 5 +- src-core/src/org/openbravo/xmlEngine/XmlTemplate.java | 27 +- src-core/src/org/openbravo/xmlEngine/XmlVectorValue.java | 67 +- src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/functions/A_AMORTIZATION_PROCESS.xml | 20 +- src-db/database/model/functions/C_COMMISSION_PROCESS.xml | 13 +- src-db/database/model/functions/C_GET_SERVICE_AMOUNT.xml | 98 + src-db/database/model/functions/C_INVOICE_CREATE.xml | 19 +- src-db/database/model/functions/C_ORDER_POST1.xml | 21 +- src-db/database/model/functions/MRP_PURCHASEORDER.xml | 63 +- src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml | 2 +- src-db/database/model/functions/M_GET_STOCK_PARAM.xml | 3 +- src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml | 14 +- src-db/database/model/functions/M_INOUT_POST.xml | 244 +- src-db/database/model/functions/M_INVENTORY_LISTCREATE.xml | 4 +- src-db/database/model/functions/M_RESERVATION_POST.xml | 13 +- src-db/database/model/functions/M_RESERVE_STOCK_AUTO.xml | 3 +- src-db/database/model/functions/M_RESERVE_STOCK_MANUAL.xml | 4 +- src-db/database/model/tables/AD_CLIENT.xml | 4 + src-db/database/model/tables/AD_COLUMN.xml | 10 + src-db/database/model/tables/AD_USER.xml | 4 + src-db/database/model/tables/C_INVOICETAX_CASHVAT.xml | 5 + src-db/database/model/tables/C_ORDER.xml | 3 + src-db/database/model/tables/C_ORDERLINE.xml | 13 + src-db/database/model/tables/C_ORDERLINE_SERVICERELATION.xml | 76 + src-db/database/model/tables/M_CHARACTERISTIC.xml | 5 + src-db/database/model/tables/M_PRODUCT.xml | 62 + src-db/database/model/tables/M_PRODUCT_CATEGORY_SERVICE.xml | 68 + src-db/database/model/tables/M_PRODUCT_CH.xml | 5 + src-db/database/model/tables/M_PRODUCT_CH_CONF.xml | 4 + src-db/database/model/tables/M_PRODUCT_SERVICE.xml | 68 + src-db/database/model/tables/M_SERVICEPRICERULE.xml | 69 + src-db/database/model/tables/M_SERVICEPRICERULE_RANGE.xml | 82 + src-db/database/model/tables/M_SERVICEPRICERULE_VERSION.xml | 65 + src-db/database/model/triggers/AD_COLUMN_MOD_TRG.xml | 5 +- src-db/database/model/triggers/AD_USER_EXPIRATIONPASS_TRG.xml | 37 + src-db/database/model/triggers/C_INVOICELINE_BEFORE_TRG.xml | 2 +- src-db/database/model/triggers/C_INVOICELINE_TRG.xml | 38 +- src-db/database/model/triggers/C_ORDERLINE_TRG.xml | 48 +- src-db/database/model/triggers/C_ORDER_TRG2.xml | 4 +- src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml | 13 +- src-db/database/model/triggers/GL_JOURNAL_CHK_RESTRICT_TRG.xml | 6 +- src-db/database/model/triggers/M_CH_SUBSET_VALUE_TRG.xml | 5 +- src-db/database/model/triggers/M_CH_VALUE_TRG.xml | 5 +- src-db/database/model/triggers/M_PRODUCT_BEF_TRG.xml | 43 + src-db/database/model/triggers/M_PRODUCT_TRG.xml | 37 +- src-db/database/model/triggers/M_RESERVATION_TRG.xml | 4 +- src-db/database/model/triggers/M_SERVICEPRICERULE_RANGE_TRG.xml | 35 + src-db/database/model/triggers/M_SERVICEPRICERULE_TRG.xml | 40 + src-db/database/model/triggers/M_TRANSACTION_TRG.xml | 63 +- src-db/database/model/views/C_INVOICETAX_CASHVAT_V.xml | 2 +- src-db/database/model/views/M_PRODCHVIEW_V.xml | 4 + src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml | 2 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 88 + src-db/database/sourcedata/AD_COLUMN.xml | 24556 +++- src-db/database/sourcedata/AD_DATASET_TABLE.xml | 84 + src-db/database/sourcedata/AD_ELEMENT.xml | 569 + src-db/database/sourcedata/AD_FIELD.xml | 4403 +- src-db/database/sourcedata/AD_FIELDGROUP.xml | 20 + src-db/database/sourcedata/AD_MENU.xml | 13 + src-db/database/sourcedata/AD_MESSAGE.xml | 410 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_REFERENCE.xml | 85 + src-db/database/sourcedata/AD_REF_LIST.xml | 60 + src-db/database/sourcedata/AD_TAB.xml | 413 +- src-db/database/sourcedata/AD_TABLE.xml | 233 + src-db/database/sourcedata/AD_TABLE_NAVIGATION.xml | 26 + src-db/database/sourcedata/AD_TABLE_TREE.xml | 3 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 66 +- src-db/database/sourcedata/AD_TREENODE.xml | 11 + src-db/database/sourcedata/AD_VAL_RULE.xml | 24 +- src-db/database/sourcedata/AD_WINDOW.xml | 75 + src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 282 +- src-db/database/sourcedata/OBUIAPP_PROCESS.xml | 61 +- src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml | 36 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 16 + src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 21 + src-db/database/sourcedata/referencedData/AD_LANGUAGE.xml | 15 + src-db/database/sourcedata/referencedData/AD_USER.xml | 2 + src-test/src/org/openbravo/test/AllAntTaskTests.java | 26 +- src-test/src/org/openbravo/test/AllTests.java | 4 +- src-test/src/org/openbravo/test/base/OBBaseTest.java | 40 +- src-test/src/org/openbravo/test/base/TestLogAppender.java | 86 + src-test/src/org/openbravo/test/costing/TestCosting.java | 355 +- src-test/src/org/openbravo/test/dal/DalQueryTest.java | 12 +- src-test/src/org/openbravo/test/dal/DalTest.java | 12 +- src-test/src/org/openbravo/test/dal/DynamicEntityTest.java | 15 +- src-test/src/org/openbravo/test/reporting/JasperReportsCompilation.java | 69 + src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestUtils.java | 33 +- src-test/src/org/openbravo/test/services/ServicesTest.java | 301 + src-test/src/org/openbravo/test/services/ServicesTest2.java | 236 + src-test/src/org/openbravo/test/services/ServicesTest3.java | 228 + src-test/src/org/openbravo/test/services/data/ServiceTestData.java | 200 + src-test/src/org/openbravo/test/services/data/ServiceTestData1.java | 43 + src-test/src/org/openbravo/test/services/data/ServiceTestData10.java | 42 + src-test/src/org/openbravo/test/services/data/ServiceTestData11.java | 53 + src-test/src/org/openbravo/test/services/data/ServiceTestData2.java | 45 + src-test/src/org/openbravo/test/services/data/ServiceTestData3.java | 43 + src-test/src/org/openbravo/test/services/data/ServiceTestData4.java | 45 + src-test/src/org/openbravo/test/services/data/ServiceTestData5.java | 43 + src-test/src/org/openbravo/test/services/data/ServiceTestData6.java | 43 + src-test/src/org/openbravo/test/services/data/ServiceTestData7.java | 43 + src-test/src/org/openbravo/test/services/data/ServiceTestData8.java | 47 + src-test/src/org/openbravo/test/services/data/ServiceTestData9.java | 53 + src-test/src/org/openbravo/test/views/GCSequenceNumberTests.java | 194 + src-test/src/org/openbravo/test/views/SortingFilteringGridConfiguration.java | 275 + src-test/src/org/openbravo/test/views/ViewGenerationWithDifferentConfigLevelTest.java | 307 + src-util/modulescript/build/classes/org/openbravo/modulescript/PgJdbcDatesIssue.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/PgJdbcDatesIssueData.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/UniqueValidCombinationData.class | 0 src-util/modulescript/src/org/openbravo/modulescript/PgJdbcDatesIssue.java | 100 + src-util/modulescript/src/org/openbravo/modulescript/PgJdbcDatesIssue_data.xsql | 98 + src-util/modulescript/src/org/openbravo/modulescript/UniqueValidCombination_data.xsql | 8 +- src/org/openbravo/authentication/AuthenticationException.java | 12 +- src/org/openbravo/authentication/AuthenticationExpirationPasswordException.java | 43 + src/org/openbravo/authentication/basic/DefaultAuthenticationManager.java | 98 +- src/org/openbravo/base/exception/OBException.java | 34 +- src/org/openbravo/base/model/ModelProvider.java | 23 +- src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 3 +- src/org/openbravo/base/secureApp/LoginHandler.java | 137 +- src/org/openbravo/base/secureApp/LoginUtils.java | 29 + src/org/openbravo/base/structure/BaseOBObject.java | 8 +- src/org/openbravo/common/actionhandler/ManageReservationActionHandler.java | 15 +- src/org/openbravo/common/actionhandler/OrderCreatePOLines.java | 11 +- src/org/openbravo/common/actionhandler/RFCServiceReturnableActionHandler.java | 82 + src/org/openbravo/common/actionhandler/RMInOutPickEditLines.java | 20 +- src/org/openbravo/common/actionhandler/RelateProductCatToServiceProduct.java | 110 + src/org/openbravo/common/actionhandler/RelateProductsToServiceProduct.java | 109 + src/org/openbravo/common/actionhandler/SRMOPickEditLines.java | 9 +- src/org/openbravo/common/actionhandler/ServiceOrderLineRelate.java | 381 + src/org/openbravo/common/actionhandler/ServiceRelatedLinePriceActionHandler.java | 97 + src/org/openbravo/common/datasource/OrderLinePickEditTransformer.java | 145 + src/org/openbravo/common/datasource/ReturnToFromCustomerVendorHQLTransformer.java | 13 +- src/org/openbravo/costing/AverageAlgorithm.java | 29 +- src/org/openbravo/costing/AverageCostAdjustment.java | 13 +- src/org/openbravo/costing/CostAdjustmentProcess.java | 38 +- src/org/openbravo/costing/CostAdjustmentUtils.java | 221 +- src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java | 13 +- src/org/openbravo/costing/CostingMigrationProcess.java | 54 +- src/org/openbravo/costing/CostingRuleProcess.java | 271 +- src/org/openbravo/costing/CostingRuleProcessOnProcessHandler.java | 6 +- src/org/openbravo/costing/CostingServer.java | 141 +- src/org/openbravo/costing/CostingUtils.java | 138 +- src/org/openbravo/costing/InventoryAmountUpdateProcess.java | 7 +- src/org/openbravo/costing/LCCostMatchFromInvoiceHandler.java | 6 +- src/org/openbravo/costing/PriceDifferenceProcess.java | 9 +- src/org/openbravo/costing/StandardAlgorithm.java | 36 +- src/org/openbravo/costing/StandardCostAdjustment.java | 336 +- src/org/openbravo/dal/core/DalUtil.java | 3 + src/org/openbravo/dal/core/SessionHandler.java | 3 +- src/org/openbravo/dal/core/TriggerHandler.java | 10 +- src/org/openbravo/dal/service/OBDal.java | 11 +- src/org/openbravo/dal/xml/EntityXMLConverter.java | 33 +- src/org/openbravo/erpCommon/ReportsUtility.java | 12 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 4 +- src/org/openbravo/erpCommon/ad_actionButton/RMInsertOrphanLine.java | 5 + src/org/openbravo/erpCommon/ad_callouts/SE_GLItem_Transaction.java | 63 +- src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java | 4 + src/org/openbravo/erpCommon/ad_callouts/SE_Payment_BPartner.java | 53 +- src/org/openbravo/erpCommon/ad_callouts/SE_Payment_Transaction.java | 37 +- src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SL_ProductCh_Characteristic.java | 1 + src/org/openbravo/erpCommon/ad_forms/About.html | 3 + src/org/openbravo/erpCommon/ad_forms/About.java | 3 +- src/org/openbravo/erpCommon/ad_forms/About.xml | 3 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 83 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 277 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 274 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 184 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 10 +- src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql | 19 +- src/org/openbravo/erpCommon/ad_forms/DocLine_FINFinAccTransaction.java | 47 +- src/org/openbravo/erpCommon/ad_forms/DocLine_FINPayment.java | 64 +- src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java | 58 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html | 3 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java | 15 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.xml | 3 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.html | 2 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending.java | 2 +- src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending_data.xsql | 7 +- src/org/openbravo/erpCommon/ad_forms/Role.java | 3 +- src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html | 4 +- src/org/openbravo/erpCommon/ad_process/AcctServerProcess.java | 10 +- src/org/openbravo/erpCommon/ad_process/AcctServerProcess_data.xsql | 27 +- src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java | 18 +- src/org/openbravo/erpCommon/ad_reports/CustomerStatement.jrxml | 14 +- src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReports_data.xsql | 21 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml | 3 + src/org/openbravo/erpCommon/ad_reports/ReportPricelist.fo | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitability_data.xsql | 22 +- src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalyses.fo | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalanceExcel.jrxml | 5 + src/org/openbravo/erpCommon/ad_reports/ReportValuationStock.java | 20 +- src/org/openbravo/erpCommon/ad_reports/ReportValuationStock_data.xsql | 4 +- src/org/openbravo/erpCommon/ad_reports/productionSubReport.jrxml | 4 +- src/org/openbravo/erpCommon/businessUtility/EndYearCloseUtility.java | 62 +- src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 13 +- src/org/openbravo/erpCommon/businessUtility/PriceAdjustment.java | 5 +- src/org/openbravo/erpCommon/businessUtility/TabAttachments.java | 19 +- src/org/openbravo/erpCommon/info/Account.html | 6 +- src/org/openbravo/erpCommon/info/Account.java | 5 +- src/org/openbravo/erpCommon/info/AccountElementValue.html | 6 +- src/org/openbravo/erpCommon/info/AccountElementValue.java | 13 +- src/org/openbravo/erpCommon/info/AttributeSetInstance.html | 9 +- src/org/openbravo/erpCommon/info/BusinessPartner.html | 6 +- src/org/openbravo/erpCommon/info/BusinessPartner.java | 3 +- src/org/openbravo/erpCommon/info/DebtPayment.html | 6 +- src/org/openbravo/erpCommon/info/ImageInfo.html | 5 +- src/org/openbravo/erpCommon/info/ImageInfoBLOB.html | 5 +- src/org/openbravo/erpCommon/info/ImageInfoBLOB.java | 7 +- src/org/openbravo/erpCommon/info/Invoice.html | 6 +- src/org/openbravo/erpCommon/info/Invoice.java | 5 +- src/org/openbravo/erpCommon/info/InvoiceLine.html | 6 +- src/org/openbravo/erpCommon/info/InvoiceLine.java | 10 +- src/org/openbravo/erpCommon/info/Location.java | 5 +- src/org/openbravo/erpCommon/info/Location_F1.html | 11 +- src/org/openbravo/erpCommon/info/Location_FS.html | 1 + src/org/openbravo/erpCommon/info/Locator.html | 6 +- src/org/openbravo/erpCommon/info/Locator.java | 5 +- src/org/openbravo/erpCommon/info/Product.html | 6 +- src/org/openbravo/erpCommon/info/Product.java | 5 +- src/org/openbravo/erpCommon/info/ProductComplete.html | 6 +- src/org/openbravo/erpCommon/info/ProductComplete.java | 3 +- src/org/openbravo/erpCommon/info/ProductMultiple.java | 1 + src/org/openbravo/erpCommon/info/Project.html | 6 +- src/org/openbravo/erpCommon/info/Project.java | 5 +- src/org/openbravo/erpCommon/info/SalesOrder.html | 6 +- src/org/openbravo/erpCommon/info/SalesOrder.java | 5 +- src/org/openbravo/erpCommon/info/SalesOrderLine.html | 6 +- src/org/openbravo/erpCommon/info/SalesOrderLine.java | 5 +- src/org/openbravo/erpCommon/info/SearchUniqueKeyResponse.html | 5 +- src/org/openbravo/erpCommon/info/ServiceProductPricePrecisionFilterExpression.java | 49 + src/org/openbravo/erpCommon/info/ShipmentReceipt.html | 4 +- src/org/openbravo/erpCommon/info/ShipmentReceipt.java | 5 +- src/org/openbravo/erpCommon/info/ShipmentReceiptLine.html | 6 +- src/org/openbravo/erpCommon/info/ShipmentReceiptLine.java | 5 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 149 +- src/org/openbravo/erpCommon/obps/ModuleLicenseRestrictions.java | 95 + src/org/openbravo/erpCommon/security/Login.html | 66 +- src/org/openbravo/erpCommon/security/Login.java | 18 +- src/org/openbravo/erpCommon/security/Login.xml | 2 + src/org/openbravo/erpCommon/security/Login_F1.html | 2 +- src/org/openbravo/erpCommon/security/SessionActive.java | 21 +- src/org/openbravo/erpCommon/utility/CashVATUtil.java | 59 +- src/org/openbravo/erpCommon/utility/OBDateUtils.java | 19 +- src/org/openbravo/erpCommon/utility/WindowTree.java | 8 +- src/org/openbravo/erpCommon/utility/reporting/ReportManager.java | 13 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 3 +- src/org/openbravo/erpReports/RptMA_CCP_Group.fo | 4 +- src/org/openbravo/erpReports/RptMA_CCP_Measures.fo | 4 +- src/org/openbravo/erpReports/RptM_Inout.fo | 4 +- src/org/openbravo/event/GLJournalLineEventHandler.java | 16 +- src/org/openbravo/event/ProductCharacteristicEventHandler.java | 140 +- src/org/openbravo/event/ProductCharacteristicValueEventHandler.java | 42 +- src/org/openbravo/event/ServiceOrderLineEventHandler.java | 212 + src/org/openbravo/event/ServicePriceRuleRangeEventHandler.java | 90 + src/org/openbravo/event/ServiceRelationEventHandler.java | 180 + src/org/openbravo/financial/FinancialUtils.java | 4 - src/org/openbravo/materialmgmt/ServicePriceUtils.java | 464 + src/org/openbravo/materialmgmt/actionhandler/AddProductsToChValue.java | 94 +- src/org/openbravo/materialmgmt/actionhandler/ManageVariants.java | 5 +- src/org/openbravo/role/inheritance/InheritedAccessEnabledEventHandler.java | 2 +- src/org/openbravo/role/inheritance/RecalculatePermissionsHandler.java | 2 +- src/org/openbravo/role/inheritance/RoleInheritanceEventHandler.java | 6 +- src/org/openbravo/role/inheritance/RoleInheritanceManager.java | 5 +- src/org/openbravo/role/inheritance/access/AccessTypeInjector.java | 2 +- src/org/openbravo/role/inheritance/access/FieldAccessInjector.java | 2 +- src/org/openbravo/role/inheritance/access/TabAccessInjector.java | 2 +- src/org/openbravo/service/db/DataImportService.java | 14 +- src/org/openbravo/service/db/DbUtility.java | 4 + src/org/openbravo/service/importprocess/ImportEntryArchiveManager.java | 13 +- src/org/openbravo/service/importprocess/ImportEntryManager.java | 41 +- src/org/openbravo/service/importprocess/ImportEntryPostProcessor.java | 33 + src/org/openbravo/service/importprocess/ImportEntryProcessor.java | 28 +- src/org/openbravo/service/importprocess/ImportProcessUtils.java | 25 +- src/org/openbravo/service/rest/DalWebService.java | 9 +- src/org/openbravo/service/system/SystemService.java | 48 +- web/js/productServices.js | 188 + web/js/utils.js | 4 +- 563 files changed, 198693 insertions(+), 38908 deletions(-) diffs (truncated from 378699 to 300 lines): diff -r cb4dec610d4b -r f2e7ebc3ea7f .hgignore --- a/.hgignore Wed Nov 11 12:22:58 2015 +0100 +++ b/.hgignore Fri Feb 26 08:20:01 2016 +0100 @@ -44,5 +44,3 @@ sources scripts - -modules/org.bpmc diff -r cb4dec610d4b -r f2e7ebc3ea7f .hgsigs --- a/.hgsigs Wed Nov 11 12:22:58 2015 +0100 +++ b/.hgsigs Fri Feb 26 08:20:01 2016 +0100 @@ -176,5 +176,11 @@ 906c7a47100c5694d720f6a00a8d205538562334 0 iEYEABECAAYFAlW3GiEACgkQCX/oGf+2qkNk4gCfVlZA1GqR2LvJwBPBXoMn6RCRyFYAnA4aPF+fOZXRpAqKMRT55nvswuRI 6dfd2fade034c7225367366dc34dcf402b596555 0 iEYEABECAAYFAlXccLwACgkQCX/oGf+2qkPEMQCeM4MxdgXlCtbu0xqZNcX0IAEuGZgAnAjQlB4gOw0q84Q/gFyRL38jkahJ 9f4a209cc84b3b4e7f3176388f6d6071779ac3e2 0 iEYEABECAAYFAlX5YqQACgkQCX/oGf+2qkOLNwCgr9InQrxWVMHG2e7sabvZBm3KD6gAoPvoMDHktqqkv2Qqtbv3G1mqpTrM +f22b32ad49b1baca7b310bdf68d8d411e897f7bf 0 iEYEABECAAYFAlYtwHYACgkQCX/oGf+2qkOQ1QCgsBVLaaNfILpxAYrZfhBD+GDVVLEAnREcCa1Lvzf4mJ8eD8VWTx1g8kqk 73f7d3c67dc7d6063af1dac6e71db12b9081150a 0 iEYEABECAAYFAlXMHl0ACgkQCX/oGf+2qkNVuACfTfB6/RfeioYrYtsi81kAwADW0lgAoOJdXKScLwl6RHeXIFvMlrzlcT6w f8b98762376a89ec93a0a623c61fdab00975c3a9 0 iEYEABECAAYFAlXtQ4gACgkQCX/oGf+2qkMZUgCePOnen6iguLqaG+86NeCC8Hr0yzAAoKTnw/BIXyBm5Ski5JQT/0mF1zHK +9755d00af209f39887eba34a08922463fbcdac91 0 iEYEABECAAYFAlYt2zgACgkQCX/oGf+2qkN1KgCg6tzAQat0ZJJIWeFyr6yLRVCvh24AnjVyPbFPvbJ3/EOgUHtJWz5lWzeM +d20a396ffa245fd3cdbadc3196df3554018d2e20 0 iEYEABECAAYFAlY4SL4ACgkQCX/oGf+2qkOjJACfS1q37UfrWobml4IVCOKqGeV+CU0An3iRcDJJ+N3aJMuzjkZh8xYe0mRQ +089152094fe394f987fa18606cba401cc20283ec 0 iEYEABECAAYFAlZmVhkACgkQCX/oGf+2qkOFxgCaA0tF7KBDttIBpX4Iezn3GPqSqJQAoIO5TQRfs/Gpwo/lV48IaAIG94vJ +d2c765a228d83098cc5f253cdd364abdb4a4697e 0 iEYEABECAAYFAlZOorMACgkQCX/oGf+2qkMFfwCgocaX6vsWuoGtE55aoHgBD1/7OKoAoOv4J31+P+8BtkVHJyKLhxGVBoLo +cf00bd72641cd3d41f95c0610058f127dad7b91a 0 iEYEABECAAYFAlZv7k4ACgkQCX/oGf+2qkNDIgCeO9reaQhgk94B44p24tVR/E5NsccAoOoJYRH9w6b6sWOOQkRivfVjQwSv diff -r cb4dec610d4b -r f2e7ebc3ea7f .hgtags --- a/.hgtags Wed Nov 11 12:22:58 2015 +0100 +++ b/.hgtags Fri Feb 26 08:20:01 2016 +0100 @@ -187,5 +187,11 @@ 01405101d810eaafec106bab50ce31b41df52569 3.0PR15Q2.3 d26c43a861dec9147a6a60d8aca52359837e9591 3.0PR15Q2.4 f38025d616fa8a50a95d0dd3a3c38bcf6bbce053 3.0PR15Q2.5 +8b094ef73876cad67e35345c1add17266413af46 3.0PR15Q2.6 828faf1939944cd8d55d562494138f68305c5b50 3.0PR15Q3 e5863950c81de2bcf7dce57035094e96d544a9ae 3.0PR15Q3.1 +9320a67a9ef1cafb5076d06bdd6d716abc662c40 3.0PR15Q3.2 +bce57079bd436cec545edb6c12246170862f0416 3.0PR15Q3.3 +8dabadcfecebf5aced31ed98411517afcb10d792 3.0PR15Q3.4 +84cd25c33900a44c955c5a899e570281f02e0ccc 3.0PR15Q4 +f698a5f953c867f7f7fefe86d7cca3ff80324181 3.0PR15Q4.1 diff -r cb4dec610d4b -r f2e7ebc3ea7f build.xml --- a/build.xml Wed Nov 11 12:22:58 2015 +0100 +++ b/build.xml Fri Feb 26 08:20:01 2016 +0100 @@ -554,13 +554,29 @@ </target> <target name="generate.java.doc"> - <javadoc sourcepath="${base.src}:${base.src.test}:${build.AD}:${base.src.core}/src:${base.src.gen}:build/javasqlc/src/:build/javasqlc/srcAD" Windowtitle="${title}" access="protected" Header="${header}" Footer="${footer}" destdir="${build.docs}" linksource="no" maxmemory="1024M"> + <javadoc Windowtitle="${title}" access="protected" Header="${header}" Footer="${footer}" destdir="${build.docs}" maxmemory="1024M"> + <sourcepath> + <pathelement path="${base.src}" /> + <pathelement path="${base.src.test}/src" /> + <pathelement path="${build.AD}" /> + <pathelement path="${base.src.core}/src" /> + <pathelement path="${base.src.gen}" /> + <pathelement path="build/javasqlc/src" /> + <pathelement path="build/javasqlc/srcAD" /> + <dirset dir="${base.modules}"> + <include name="*/src" /> + <include name="*/src-test" /> + </dirset> + </sourcepath> <excludepackage name="org.openbravo.erpWindows.*"/> <classpath> <path refid="project.class.path"/> <pathelement path="lib/build/js.jar" /> + <fileset dir="${base.modules}"> + <include name="*/lib/test/*.jar" /> + </fileset> </classpath> - <link href="http://java.sun.com/javase/6/docs/api/"/> + <link href="http://docs.oracle.com/javase/6/docs/api/"/> </javadoc> </target> @@ -1088,7 +1104,7 @@ <pathelement path="${base.lib}/runtime/log4j-1.2.16.jar" /> <pathelement path="${base.lib}/runtime/commons-pool-1.5.6.jar" /> <pathelement path="${base.lib}/runtime/commons-dbcp-1.4.jar" /> - <pathelement path="${base.lib}/runtime/postgresql-9.4-1201.jdbc4.jar" /> + <pathelement path="${base.lib}/runtime/postgresql-9.4.1207.jre6.jar" /> <pathelement path="${base.lib}/runtime/ojdbc6.jar" /> <pathelement path="${base.lib}/runtime/commons-collectionsi-3.2.1.jar" /> <pathelement path="${base.lib}/runtime/ant-1.9.2.jar" /> diff -r cb4dec610d4b -r f2e7ebc3ea7f legal/CPL-1.0.txt --- a/legal/CPL-1.0.txt Wed Nov 11 12:22:58 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,213 +0,0 @@ -Common Public License Version 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC -LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM -CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - -a) in the case of the initial Contributor, the initial code and -documentation distributed under this Agreement, and - -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are -distributed by that particular Contributor. A Contribution 'originates' from a -Contributor if it was added to the Program by such Contributor itself or anyone -acting on such Contributor's behalf. Contributions do not include additions to -the Program which: (i) are separate modules of software distributed in -conjunction with the Program under their own license agreement, and (ii) are not -derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents " mean patent claims licensable by a Contributor which are -necessarily infringed by the use or sale of its Contribution alone or when -combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, -including all Contributors. - -2. GRANT OF RIGHTS - -a) Subject to the terms of this Agreement, each Contributor hereby grants -Recipient a non-exclusive, worldwide, royalty-free copyright license to -reproduce, prepare derivative works of, publicly display, publicly perform, -distribute and sublicense the Contribution of such Contributor, if any, and such -derivative works, in source code and object code form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants -Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed -Patents to make, use, sell, offer to sell, import and otherwise transfer the -Contribution of such Contributor, if any, in source code and object code form. -This patent license shall apply to the combination of the Contribution and the -Program if, at the time the Contribution is added by the Contributor, such -addition of the Contribution causes such combination to be covered by the -Licensed Patents. The patent license shall not apply to any other combinations -which include the Contribution. No hardware per se is licensed hereunder. - -c) Recipient understands that although each Contributor grants the licenses -to its Contributions set forth herein, no assurances are provided by any -Contributor that the Program does not infringe the patent or other intellectual -property rights of any other entity. Each Contributor disclaims any liability to -Recipient for claims brought by any other entity based on infringement of -intellectual property rights or otherwise. As a condition to exercising the -rights and licenses granted hereunder, each Recipient hereby assumes sole -responsibility to secure any other intellectual property rights needed, if any. -For example, if a third party patent license is required to allow Recipient to -distribute the Program, it is Recipient's responsibility to acquire that license -before distributing the Program. - -d) Each Contributor represents that to its knowledge it has sufficient -copyright rights in its Contribution, if any, to grant the copyright license set -forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under its -own license agreement, provided that: - -a) it complies with the terms and conditions of this Agreement; and - -b) its license agreement: - -i) effectively disclaims on behalf of all Contributors all warranties and -conditions, express and implied, including warranties or conditions of title and -non-infringement, and implied warranties or conditions of merchantability and -fitness for a particular purpose; - -ii) effectively excludes on behalf of all Contributors all liability for -damages, including direct, indirect, special, incidental and consequential -damages, such as lost profits; - -iii) states that any provisions which differ from this Agreement are offered -by that Contributor alone and not by any other party; and - -iv) states that source code for the Program is available from such -Contributor, and informs licensees how to obtain it in a reasonable manner on or -through a medium customarily used for software exchange. - -When the Program is made available in source code form: - -a) it must be made available under this Agreement; and - -b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within the -Program. - -Each Contributor must identify itself as the originator of its Contribution, if -any, in a manner that reasonably allows subsequent Recipients to identify the -originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with -respect to end users, business partners and the like. While this license is -intended to facilitate the commercial use of the Program, the Contributor who -includes the Program in a commercial product offering should do so in a manner -which does not create potential liability for other Contributors. Therefore, if -a Contributor includes the Program in a commercial product offering, such -Contributor ("Commercial Contributor") hereby agrees to defend and indemnify -every other Contributor ("Indemnified Contributor") against any losses, damages -and costs (collectively "Losses") arising from claims, lawsuits and other legal -actions brought by a third party against the Indemnified Contributor to the -extent caused by the acts or omissions of such Commercial Contributor in -connection with its distribution of the Program in a commercial product -offering. The obligations in this section do not apply to any claims or Losses -relating to any actual or alleged intellectual property infringement. In order -to qualify, an Indemnified Contributor must: a) promptly notify the Commercial -Contributor in writing of such claim, and b) allow the Commercial Contributor to -control, and cooperate with the Commercial Contributor in, the defense and any -related settlement negotiations. The Indemnified Contributor may participate in -any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product -offering, Product X. That Contributor is then a Commercial Contributor. If that -Commercial Contributor then makes performance claims, or offers warranties -related to Product X, those performance claims and warranties are such -Commercial Contributor's responsibility alone. Under this section, the -Commercial Contributor would have to defend claims against the other -Contributors related to those performance claims and warranties, and if a court -requires any other Contributor to pay any damages as a result, the Commercial -Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR -IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, -NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each -Recipient is solely responsible for determining the appropriateness of using and -distributing the Program and assumes all risks associated with its exercise of -rights under this Agreement, including but not limited to the risks and costs of -program errors, compliance with applicable laws, damage to or loss of data, -programs or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY -CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST -PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS -GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under applicable -law, it shall not affect the validity or enforceability of the remainder of the -terms of this Agreement, and without further action by the parties hereto, such -provision shall be reformed to the minimum extent necessary to make such -provision valid and enforceable. - -If Recipient institutes patent litigation against a Contributor with respect to -a patent applicable to software (including a cross-claim or counterclaim in a -lawsuit), then any patent licenses granted by that Contributor to such Recipient -under this Agreement shall terminate as of the date such litigation is filed. In -addition, if Recipient institutes patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that the Program -itself (excluding combinations of the Program with other software or hardware) -infringes such Recipient's patent(s), then such Recipient's rights granted under -Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to -comply with any of the material terms or conditions of this Agreement and does -not cure such failure in a reasonable period of time after becoming aware of -such noncompliance. If all Recipient's rights under this Agreement terminate, -Recipient agrees to cease use and distribution of the Program as soon as -reasonably practicable. However, Recipient's obligations under this Agreement -and any licenses granted by Recipient relating to the Program shall continue and -survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in -order to avoid inconsistency the Agreement is copyrighted and may only be -modified in the following manner. The Agreement Steward reserves the right to -publish new versions (including revisions) of this Agreement from time to time. -No one other than the Agreement Steward has the right to modify this Agreement. -IBM is the initial Agreement Steward. IBM may assign the responsibility to serve -as the Agreement Steward to a suitable separate entity. Each new version of the -Agreement will be given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the Agreement -under which it was received. In addition, after a new version of the Agreement -is published, Contributor may elect to distribute the Program (including its -Contributions) under the new version. Except as expressly stated in Sections -2(a) and 2(b) above, Recipient receives no rights or licenses to the -intellectual property of any Contributor under this Agreement, whether -expressly, by implication, estoppel or otherwise. All rights in the Program not -expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the -intellectual property laws of the United States of America. No party to this -Agreement will bring a legal action under this Agreement more than one year -after the cause of action arose. Each party waives its rights to a jury trial in -any resulting litigation. ------------------------------------------------------------------------------ Site24x7 APM Insight: Get Deep Visibility into Application Performance APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month Monitor end-to-end web transactions and take corrective actions now Troubleshoot faster and improve end-user experience. Signup Now! http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140 _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
