details: https://code.openbravo.com/erp/devel/pi/rev/2ef14c346903 changeset: 28188:2ef14c346903 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Thu Nov 26 16:32:53 2015 +0100 summary: [pi-field-filt-sort] Creation of the Sequence Number fields
details: https://code.openbravo.com/erp/devel/pi/rev/a0ec9be4e5d5 changeset: 28189:a0ec9be4e5d5 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Fri Nov 27 14:33:25 2015 +0100 summary: [pi-field-filt-sort] adding the logic to choose the correct grid config details: https://code.openbravo.com/erp/devel/pi/rev/58d983958370 changeset: 28190:58d983958370 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Wed Dec 02 13:14:18 2015 +0100 summary: [pi-field-filt-sort] Merge with latest pi details: https://code.openbravo.com/erp/devel/pi/rev/cc4b6598c840 changeset: 28191:cc4b6598c840 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Wed Dec 02 16:24:59 2015 +0100 summary: [pi-field-filt-sort] Merge with latest pi details: https://code.openbravo.com/erp/devel/pi/rev/8734dc589780 changeset: 28192:8734dc589780 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Fri Dec 04 12:47:06 2015 +0100 summary: [pi-field-filt-sort] Fixing the logic to choose the correct tab configuration details: https://code.openbravo.com/erp/devel/pi/rev/72e627ceb0a2 changeset: 28193:72e627ceb0a2 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Dec 14 17:54:47 2015 +0100 summary: [pi-field-filt-sort] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/9f7684c8be89 changeset: 28194:9f7684c8be89 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Tue Dec 15 11:45:45 2015 +0100 summary: [pi-field-filt-sort] Adding the new columns to ad_colum Adding the allowfiltering and allowsorting columns to every column. details: https://code.openbravo.com/erp/devel/pi/rev/ef04dbece8cd changeset: 28195:ef04dbece8cd user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Tue Dec 15 11:52:30 2015 +0100 summary: [pi-field-filt-sort] The logic for handling the new column config. The logic which handles the new way of setting a field as sortable or filerable has been created. details: https://code.openbravo.com/erp/devel/pi/rev/fab4c8fcb7cf changeset: 28196:fab4c8fcb7cf user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Tue Dec 15 11:54:20 2015 +0100 summary: [pi-field-filt-sort] Some tests have been created. Some tests which check the correct behavior of the settings of the canSort and canFilter properties have been created. details: https://code.openbravo.com/erp/devel/pi/rev/1f6db29e5d83 changeset: 28197:1f6db29e5d83 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Tue Dec 15 17:32:16 2015 +0100 summary: [pi-field-filt-sort] Change of the two of boolean variables. Two new boolean variables have been created for controlling if the canSort and canFilter properties can be overwritten or not, have been created and set in the proper place. There were other boolean varibles but their name was not the best for the use they have. The place was not the correct neither. details: https://code.openbravo.com/erp/devel/pi/rev/347aa9886f86 changeset: 28198:347aa9886f86 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Fri Dec 18 11:27:05 2015 +0100 summary: [pi-field-filt-sort] Some tests have been refactored. The "CombinationsForSortingColumns" and "CombinationsForFilteringColumns" tests have been refactored for a better readability. details: https://code.openbravo.com/erp/devel/pi/rev/d7ed85d77288 changeset: 28199:d7ed85d77288 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Fri Dec 18 11:30:37 2015 +0100 summary: [pi-field-filt-sort] The class from which extends the test is changed. Now the test "ViewGenerationWithDifferentConfigLevel" extends from the OBBaseTest. details: https://code.openbravo.com/erp/devel/pi/rev/0295b99347f6 changeset: 28200:0295b99347f6 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Fri Dec 18 11:40:28 2015 +0100 summary: [pi-field-filt-sort] A warning message has been added. A warning message has been added. This chechs if there are grid configurations with the same sequence number and if there are, a warning message is shown. A callout has been implemented to handle this situation. details: https://code.openbravo.com/erp/devel/pi/rev/604a1d8de478 changeset: 28201:604a1d8de478 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Fri Dec 18 11:43:26 2015 +0100 summary: [pi-field-filt-sort] Some changes on seqNo The place where the field sequence number was shown in form view has been changed now it appears in first place. Also the comments in the database have benn changed, the default number was 100 first and now is 10 to coincide with the real first seq number. details: https://code.openbravo.com/erp/devel/pi/rev/f9a4192e3fec changeset: 28202:f9a4192e3fec user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Dec 21 10:22:21 2015 +0100 summary: [pi-field-filt-sort] Refactor of OBViewUtil A refactor has been done, now there exists a method to get the values of the "canSort" and "canFilter" properties. Before the refactor, there was a lot of repeated code because the way of getting the properties is almost the same. details: https://code.openbravo.com/erp/devel/pi/rev/146c310ab4c8 changeset: 28203:146c310ab4c8 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Fri Dec 18 15:03:01 2015 +0100 summary: [pi-field-filt-sort] Some test have been changed The Sequence number is mandatory so the tests done before, needed to set that value. The tests have been changet to grant the correct behaviour. details: https://code.openbravo.com/erp/devel/pi/rev/4d68f7993f3f changeset: 28204:4d68f7993f3f user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Dec 21 15:01:52 2015 +0100 summary: [pi-field-filt-sort] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/5bd0b3025e83 changeset: 28205:5bd0b3025e83 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Tue Dec 22 16:34:43 2015 +0100 summary: [pi-field-filt-sort] A default value has been added to seqno Default value has been added to seqno columns of the Obuiapp_gc_tab and Obuiapp_gc_system tables of the database. details: https://code.openbravo.com/erp/devel/pi/rev/eeb0c963b6e3 changeset: 28206:eeb0c963b6e3 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Wed Dec 23 17:15:26 2015 +0100 summary: [pi-field-filt-sort] The functionality of sorting and filtering is fixed. Now, the canSort and canFilter properties work fine. details: https://code.openbravo.com/erp/devel/pi/rev/4c3228501b20 changeset: 28207:4c3228501b20 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Thu Dec 24 10:30:25 2015 +0100 summary: [pi-field-filt-sort] Remove the column parameter which is not used There was a Column parameter but it was never used, so it has been deleted. details: https://code.openbravo.com/erp/devel/pi/rev/3355cd14cb23 changeset: 28208:3355cd14cb23 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Thu Dec 24 13:31:48 2015 +0100 summary: [pi-field-filt-sort] The javadoc in the correct position. Now the javadoc is placed in the correct position. details: https://code.openbravo.com/erp/devel/pi/rev/1a2008a5cdd5 changeset: 28209:1a2008a5cdd5 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Thu Dec 24 16:55:07 2015 +0100 summary: [pi-field-filt-sort] The callout also asociated to the "tab" field The callout is now also asociated to the tab field in the GC_tab window. details: https://code.openbravo.com/erp/devel/pi/rev/2a07a94020a1 changeset: 28210:2a07a94020a1 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Thu Dec 24 17:08:14 2015 +0100 summary: [pi-field-filt-sort] The default vaule of seqno set to 10 The default value of the seqno of the gc_tab has been changed to 10. details: https://code.openbravo.com/erp/devel/pi/rev/ef1cd0170eac changeset: 28211:ef1cd0170eac user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Dec 28 09:33:46 2015 +0100 summary: [pi-field-filt-sort] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/8df59fd5002b changeset: 28212:8df59fd5002b user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Dec 28 10:42:28 2015 +0100 summary: [pi-field-filt-sort] Corrected the Help of the seqno details: https://code.openbravo.com/erp/devel/pi/rev/3e1af5af11a1 changeset: 28213:3e1af5af11a1 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Dec 28 11:04:05 2015 +0100 summary: [pi-field-filt-sort] Camel case in allow sortin and allow filtering columns details: https://code.openbravo.com/erp/devel/pi/rev/90f4772de3f4 changeset: 28214:90f4772de3f4 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Dec 28 11:17:09 2015 +0100 summary: [pi-field-filt-sort] Change the OBViewUtil As far as the column names of the allow sorting and allow filtering have changed in the ad_column table, it is necessary to change the way that the method isAllowSorting and isAllowFiltering is used in the OBViewUtil class. details: https://code.openbravo.com/erp/devel/pi/rev/f89e8fa83463 changeset: 28215:f89e8fa83463 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Dec 28 15:05:17 2015 +0100 summary: [pi-field-filt-sort] The sequence number in the last place. The sequence number field is placed in the last place. details: https://code.openbravo.com/erp/devel/pi/rev/68514590015e changeset: 28216:68514590015e user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Dec 28 16:10:29 2015 +0100 summary: [pi-field-filt-sort] Fix the tests As far as the column name for allow filtering and allow sorting has been changed, the way of using the methods isAllowSorting and isAllowFiltering in the tests has changed too. details: https://code.openbravo.com/erp/devel/pi/rev/5a229211ef97 changeset: 28217:5a229211ef97 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Tue Dec 29 10:32:43 2015 +0100 summary: [pi-field-filt-sort] Creating constants Some constants have been added in the OBViewUtil class, to be able to use them in every methods. details: https://code.openbravo.com/erp/devel/pi/rev/39e73899e00f changeset: 28218:39e73899e00f user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Tue Dec 29 11:13:05 2015 +0100 summary: [pi-field-filt-sort] The constructor changed to receive field. Now the inner class GridConfigSettings receives the field and handles it in the constructor. details: https://code.openbravo.com/erp/devel/pi/rev/04cc57350af8 changeset: 28219:04cc57350af8 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Tue Dec 29 14:16:27 2015 +0100 summary: [pi-field-filt-sort] Put the column configuration in the constructor. details: https://code.openbravo.com/erp/devel/pi/rev/208ce934fa9b changeset: 28220:208ce934fa9b user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Tue Dec 29 21:23:39 2015 +0100 summary: [pi-field-filt-sort] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/4976e7ef1650 changeset: 28221:4976e7ef1650 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Wed Dec 30 12:26:09 2015 +0100 summary: [pi-field-filt-sort] canSort and canFilter set when there is not field canSort and canFilter properties where not set if there was no field, this has been fixed and now, if there are not fields, these properties are set as true, because the expected behavior for the tabs is to be filterable and sortable if there are no configurations. details: https://code.openbravo.com/erp/devel/pi/rev/ec1d815ecbe2 changeset: 28222:ec1d815ecbe2 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Wed Dec 30 13:25:11 2015 +0100 summary: [pi-field-filt-sort] Some tests have been added Some tests have been added for testing the correct behavior of the new sequence number functionality. details: https://code.openbravo.com/erp/devel/pi/rev/9f922fc7a5b0 changeset: 28223:9f922fc7a5b0 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Thu Dec 31 12:00:13 2015 +0100 summary: [pi-field-filt-sort] NumberFormatException added NumberFormatException added if the seqNo is blank in the GridConfigurationSequenceNumbercallout. details: https://code.openbravo.com/erp/devel/pi/rev/99948ba77d5a changeset: 28224:99948ba77d5a user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Thu Dec 31 12:23:50 2015 +0100 summary: [pi-field-filt-sort] Removing duplicate code from callout Remove duplicated code from GridConfigurationSequenceNumberCallout, a new method which creates the warning message has bee created. details: https://code.openbravo.com/erp/devel/pi/rev/e0e31036c250 changeset: 28225:e0e31036c250 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Thu Dec 31 14:36:46 2015 +0100 summary: [pi-field-filt-sort] Add a check to sort/filter columns A boolean check has been added to ad_column table to the allowfilering and allosorting columns. details: https://code.openbravo.com/erp/devel/pi/rev/b3952628e6b0 changeset: 28226:b3952628e6b0 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Thu Dec 31 14:38:10 2015 +0100 summary: [pi-field-filt-sort] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/b9c8d40b52de changeset: 28227:b9c8d40b52de user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Jan 04 09:26:55 2016 +0100 summary: [pi-field-filt-sort] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/1ac8436f34c1 changeset: 28228:1ac8436f34c1 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Jan 04 14:48:02 2016 +0100 summary: [pi-field-filt-sort] GCTab list is now sorted in memory GcTab is now sorted in memory to choose the correct GCtab. details: https://code.openbravo.com/erp/devel/pi/rev/bcbdaedd57ea changeset: 28229:bcbdaedd57ea user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Jan 04 17:28:58 2016 +0100 summary: [pi-field-filt-sort] Update of the copyright year. details: https://code.openbravo.com/erp/devel/pi/rev/dce99487b5e6 changeset: 28230:dce99487b5e6 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Tue Jan 05 13:26:54 2016 +0100 summary: [pi-field-filt-sort] The sequence number should not be in grid. The sequence number should not be in grid view so, it has been removed. details: https://code.openbravo.com/erp/devel/pi/rev/3096a25be1f9 changeset: 28231:3096a25be1f9 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Tue Jan 05 13:30:51 2016 +0100 summary: [pi-field-filt-sort] Merge with pi details: https://code.openbravo.com/erp/devel/pi/rev/8a2fa827d21c changeset: 28232:8a2fa827d21c user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Thu Jan 07 12:18:12 2016 +0100 summary: [pi-field-filt-sort] onCreateDefault added. [pi-field-filt-sort] onCreateDefault added to allowsorting and allowfiltering columns. details: https://code.openbravo.com/erp/devel/pi/rev/bb28676481b2 changeset: 28233:bb28676481b2 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Thu Jan 07 18:29:09 2016 +0100 summary: [pi-field-filt-sort] Prevent getting two canFilter properties in the view. The removeAttributeFromString method of UIDefinition.java has been modified to delete not only the repeated canSort properties but the repeated canFilter properties. details: https://code.openbravo.com/erp/devel/pi/rev/6b7a1fd4dc7c changeset: 28234:6b7a1fd4dc7c user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Fri Jan 08 09:16:57 2016 +0100 summary: [pi-field-filt-sort] Update the year of the copyright and a comment The year of the copyright of the UIDefinition.java has been updated. A comment of the removeAttributeFromString method has been updated too. details: https://code.openbravo.com/erp/devel/pi/rev/b6bcddfa55ee changeset: 28235:b6bcddfa55ee user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Jan 11 12:48:13 2016 +0100 summary: [pi-field-filt-sort] Two test removed and one added There were two tests but with the new one those are not needed. details: https://code.openbravo.com/erp/devel/pi/rev/aa4f1370e51a changeset: 28236:aa4f1370e51a user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Jan 11 13:45:02 2016 +0100 summary: [pi-field-filt-sort] The javadoc is correctly placed details: https://code.openbravo.com/erp/devel/pi/rev/934bb0d77b97 changeset: 28237:934bb0d77b97 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Jan 11 13:59:34 2016 +0100 summary: [pi-field-filt-sort] The catch of the try catch block properly placed It is now just after parsing. details: https://code.openbravo.com/erp/devel/pi/rev/dd19fe732bb6 changeset: 28238:dd19fe732bb6 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Jan 11 14:02:01 2016 +0100 summary: [pi-field-filt-sort] The ugly blanks removed. details: https://code.openbravo.com/erp/devel/pi/rev/4bc0a824b5e4 changeset: 28239:4bc0a824b5e4 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Jan 11 14:24:30 2016 +0100 summary: [pi-field-filt-sort] An if has been removed and an elseif added In the GridConfigurationSequenceNumberCallout.java an else if has been added instead of the previously if. details: https://code.openbravo.com/erp/devel/pi/rev/b24984aa98ba changeset: 28240:b24984aa98ba user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Jan 11 14:32:06 2016 +0100 summary: [pi-field-filt-sort] One class per line in AllAntTaskTests details: https://code.openbravo.com/erp/devel/pi/rev/b310ae90527b changeset: 28241:b310ae90527b user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Jan 11 15:08:31 2016 +0100 summary: [pi-field-filt-sort] Boolean condition changed In OBViewUtil.java in the filteringPropertyValue and sortingPropertyValue methods, the boolean conditions have been changed because in that point it is not possible to get a null value. details: https://code.openbravo.com/erp/devel/pi/rev/997ad7b5cd2b changeset: 28242:997ad7b5cd2b user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Jan 11 16:36:18 2016 +0100 summary: [pi-field-filt-sort] Change the name of inner class CustomComparator The name of the class has been changed because previously was meaningless. details: https://code.openbravo.com/erp/devel/pi/rev/703347e65ff2 changeset: 28243:703347e65ff2 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Jan 11 16:47:44 2016 +0100 summary: [pi-field-filt-sort] The javadoc of SortingFilteringGridConfiguration added. The javadoc of SortingFilteringGridConfiguration has been added and a misspelling of another javadoc has been fixed. details: https://code.openbravo.com/erp/devel/pi/rev/3895bb344923 changeset: 28244:3895bb344923 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Jan 11 17:00:54 2016 +0100 summary: [pi-field-filt-sort] Change the name of mySeq Change the name of the mySeq variable for longSeqNumber in the GridConfigurationSequenceNumberCallout. details: https://code.openbravo.com/erp/devel/pi/rev/48c88fec4001 changeset: 28245:48c88fec4001 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Jan 11 17:24:25 2016 +0100 summary: [pi-field-filt-sort] The active field in the last place The active field of GCTab and GCSystem is now in the last place in the form view. details: https://code.openbravo.com/erp/devel/pi/rev/522bc3aa50d2 changeset: 28246:522bc3aa50d2 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Mon Jan 11 18:05:45 2016 +0100 summary: [pi-field-filt-sort] The allowfiltering and allowsorting in the same line details: https://code.openbravo.com/erp/devel/pi/rev/6b997f19ba33 changeset: 28247:6b997f19ba33 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Wed Jan 13 12:13:34 2016 +0100 summary: [pi-field-filt-sort] Change the name of a variable Change the name of a variable in the GridConfigurationSequenceNumberCallout.java. details: https://code.openbravo.com/erp/devel/pi/rev/ec88663e5acf changeset: 28248:ec88663e5acf user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Wed Jan 13 13:18:00 2016 +0100 summary: [pi-field-filt-sort] Merge with latest pi details: https://code.openbravo.com/erp/devel/pi/rev/afa165be3e59 changeset: 28249:afa165be3e59 user: Naroa Iriarte <naroa.iriarte <at> openbravo.com> date: Wed Jan 13 15:33:23 2016 +0100 summary: Fixed issue 31468: Implemented sorting and filtering defaults Merge with the pi-field-filt-sort project. diffstat: .hgignore | 2 - .hgsigs | 2 + .hgtags | 2 + legal/CPL-1.0.txt | 213 - legal/Licensing.txt | 8 +- lib/runtime/jdt-compiler-3.1.1.jar | 0 lib/runtime/jdt-compiler-4.4.2.jar | 0 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 | 642 + 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/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/utility/FIN_Utility.java | 77 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js | 12 +- 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 | 669 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml | 60 +- 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/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/report/ReportingUtils.java | 2 - modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-form.js.ftl | 21 +- 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/OBViewUtil.java | 169 +- 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 | 4 +- 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/grid/ob-view-grid.js | 4 +- 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 | 5 +- 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/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 | 55 +- 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/utilities/ob-keyboard-manager.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js | 2 +- 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/reference/UIDefinition.java | 7 +- 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.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.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_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.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/DefaultJsonDataService.java | 7 +- 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/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 23 +- 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 | 2 +- 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_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/C_GLITEM_ACCT.xml | 30 + src-db/database/model/functions/C_COMMISSION_PROCESS.xml | 13 +- src-db/database/model/functions/M_INOUT_POST.xml | 33 +- src-db/database/model/functions/M_RESERVATION_POST.xml | 13 +- src-db/database/model/tables/AD_COLUMN.xml | 10 + src-db/database/model/triggers/C_INVOICELINE_BEFORE_TRG.xml | 2 +- src-db/database/model/triggers/C_ORDERLINE_TRG.xml | 2 +- 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/M_RESERVATION_TRG.xml | 4 +- src-db/database/sourcedata/AD_COLUMN.xml | 19510 +++- src-db/database/sourcedata/AD_ELEMENT.xml | 42 + src-db/database/sourcedata/AD_FIELD.xml | 62 +- src-db/database/sourcedata/AD_MESSAGE.xml | 12 + src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_TABLE.xml | 2 + src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 22 +- src-test/src/org/openbravo/test/AllAntTaskTests.java | 10 +- src-test/src/org/openbravo/test/AllTests.java | 6 +- 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 | 287 +- src-util/modulescript/build/classes/org/openbravo/modulescript/UniqueValidCombinationData.class | 0 src-util/modulescript/src/org/openbravo/modulescript/UniqueValidCombination_data.xsql | 8 +- src/org/openbravo/base/exception/OBException.java | 4 +- src/org/openbravo/base/secureApp/LoginUtils.java | 3 +- src/org/openbravo/common/actionhandler/ManageReservationActionHandler.java | 21 +- src/org/openbravo/dal/core/TriggerHandler.java | 10 +- src/org/openbravo/erpCommon/ReportsUtility.java | 12 +- 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_forms/AcctServer.java | 82 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 245 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 244 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 182 +- 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_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/ReportProjectProfitability_data.xsql | 22 +- 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/TabAttachments.java | 19 +- src/org/openbravo/erpCommon/info/ImageInfoBLOB.java | 7 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 4 +- src/org/openbravo/erpCommon/security/Login.html | 8 +- src/org/openbravo/erpCommon/utility/CashVATUtil.java | 32 +- src/org/openbravo/erpCommon/utility/OBDateUtils.java | 19 +- src/org/openbravo/event/ProductCharacteristicValueEventHandler.java | 41 +- src/org/openbravo/service/importprocess/ImportEntryArchiveManager.java | 5 +- src/org/openbravo/service/importprocess/ImportEntryManager.java | 18 +- src/org/openbravo/service/rest/DalWebService.java | 7 +- src/org/openbravo/service/system/SystemService.java | 38 +- 207 files changed, 170511 insertions(+), 35314 deletions(-) diffs (truncated from 331298 to 300 lines): diff -r 2d31b78e38c9 -r afa165be3e59 .hgignore --- a/.hgignore Thu Nov 26 11:09:59 2015 +0100 +++ b/.hgignore Wed Jan 13 15:33:23 2016 +0100 @@ -44,5 +44,3 @@ sources scripts - -modules/org.bpmc diff -r 2d31b78e38c9 -r afa165be3e59 .hgsigs --- a/.hgsigs Thu Nov 26 11:09:59 2015 +0100 +++ b/.hgsigs Wed Jan 13 15:33:23 2016 +0100 @@ -181,4 +181,6 @@ 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 2d31b78e38c9 -r afa165be3e59 .hgtags --- a/.hgtags Thu Nov 26 11:09:59 2015 +0100 +++ b/.hgtags Wed Jan 13 15:33:23 2016 +0100 @@ -192,4 +192,6 @@ 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 2d31b78e38c9 -r afa165be3e59 legal/CPL-1.0.txt --- a/legal/CPL-1.0.txt Thu Nov 26 11:09:59 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. diff -r 2d31b78e38c9 -r afa165be3e59 legal/Licensing.txt --- a/legal/Licensing.txt Thu Nov 26 11:09:59 2015 +0100 +++ b/legal/Licensing.txt Wed Jan 13 15:33:23 2016 +0100 @@ -3,7 +3,7 @@ This license file applies to the Openbravo ERP software (the "Openbravo Software"), except as described below. -This product is Copyright 2001-2015 Openbravo S.L.U. For other detailed notice, +This product is Copyright 2001-2016 Openbravo S.L.U. For other detailed notice, see the "NOTICE" file with this distribution. This product is free software; you can redistribute it and/or modify @@ -56,9 +56,9 @@ Under Tigra Calculator license (license available at http://www.softcomplex.com/) Copyright © 2003-2004 Softcomplex Inc. -# jdt-compiler-3.1.1.jar -Common Public License 1.0 (license available at -http://www.eclipse.org/legal/cpl-v10.html) or in the file CPL-1.0.txt in this folder +# jdt-compiler-4.4.2.jar +Eclipse Public License 1.0 (license available at +http://www.eclipse.org/legal/epl-v10.html) or in the file EPL-1.0.txt in this folder # Eclipse icons # wsdl4j-1.5.1.jar diff -r 2d31b78e38c9 -r afa165be3e59 lib/runtime/jdt-compiler-3.1.1.jar Binary file lib/runtime/jdt-compiler-3.1.1.jar has changed diff -r 2d31b78e38c9 -r afa165be3e59 lib/runtime/jdt-compiler-4.4.2.jar Binary file lib/runtime/jdt-compiler-4.4.2.jar has changed diff -r 2d31b78e38c9 -r afa165be3e59 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 Thu Nov 26 11:09:59 2015 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml Wed Jan 13 15:33:23 2016 +0100 @@ -204,7 +204,8 @@ WHERE ps.fin_payment_schedule_id = psd.fin_payment_schedule_order AND ps.c_order_id = p_record_id AND psd.fin_payment_detail_id = pd.fin_payment_detail_id - AND pd.fin_payment_id = p.fin_payment_id; + AND pd.fin_payment_id = p.fin_payment_id + AND p.status <> 'RPAP'; IF (v_count <> 0) THEN RAISE_APPLICATION_ERROR(-20000, '@APRM_OrderWithPayments@'||v_DocumentNo); END IF; diff -r 2d31b78e38c9 -r afa165be3e59 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Thu Nov 26 11:09:59 2015 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml Wed Jan 13 15:33:23 2016 +0100 @@ -34,6 +34,8 @@ <!--0000F22EA60241B4A2FF5D45C83F8F66--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> <!--0000F22EA60241B4A2FF5D45C83F8F66--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--0000F22EA60241B4A2FF5D45C83F8F66--> <ENTITY_ALIAS><![CDATA[bp]]></ENTITY_ALIAS> +<!--0000F22EA60241B4A2FF5D45C83F8F66--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> +<!--0000F22EA60241B4A2FF5D45C83F8F66--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> <!--0000F22EA60241B4A2FF5D45C83F8F66--></AD_COLUMN> <!--02EF18D28F1B4C43ADF91B3E73C2BF12--><AD_COLUMN> ------------------------------------------------------------------------------ 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=267308311&iu=/4140 _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
