Commit Graph

1547 Commits

Author SHA1 Message Date
Carlos Ruiz 9d8b8e11b7 IDEMPIERE-2072 get number of non business days between 2 dates / forgot the IsActive condition 2014-07-23 12:58:33 -05:00
Carlos Ruiz 7bb8143f15 IDEMPIERE-2072 get number of non business days between 2 dates / based on patch from Nicolas Micoud (nmicoud) 2014-07-23 12:45:10 -05:00
Carlos Ruiz 10ce8aa22e IDEMPIERE-2073 AD_Val_Rule_ID is missing from AD_UserDef_Field 2014-07-23 11:10:24 -05:00
Nicolas Micoud ad302c7ded IDEMPIERE-2073 AD_Val_Rule_ID is missing from AD_UserDef_Field 2014-07-23 10:42:26 -05:00
hieplq d67c4db60a IDEMPIERE-2083 can't complete a internal inventory when date account > date account all receipt 2014-07-23 11:12:33 +07:00
Carlos Ruiz 33120387c2 IDEMPIERE-2083 can't complete a internal inventory when date account > date account all receipt / IDEMPIERE-1770 / thanks to Hiep (hieplq) 2014-07-22 16:53:25 -05:00
Carlos Ruiz dd784a0dad hg merge release-2.0 (merge release2 into development) 2014-07-16 18:53:36 -05:00
hieplq 85ed9b016f IDEMPIERE-1788:Value preference for info window process parameters 2014-07-16 18:53:06 -05:00
hieplq bb3e0460d3 IDEMPIERE-2052:make export csv function can export multi detail tab 2014-07-12 01:19:12 +07:00
jan thielemann 6790fa1570 IDEMPIERE-1985 Provide error message in unsuccessful processes / fix NPE 2014-07-16 12:33:12 -05:00
Carlos Ruiz 562f579eb6 IDEMPIERE-1970:Improve t_selection logic for info window / regenerate serialVersionUID 2014-07-16 11:55:18 -05:00
hieplq d76ac082e2 IDEMPIERE-1970:Improve t_selection logic for info window 2014-07-16 11:27:45 -05:00
Nicolas Micoud a948d74076 IDEMPIERE-1828 Improvement of monitoring of emails 2014-07-16 09:58:38 -05:00
Nicolas Micoud 83108c0070 IDEMPIERE-2062 Add methods for MRefList for getting translation with specific language (and not ctx) 2014-07-16 09:36:00 -05:00
Nicolas Micoud bcc4bdbc54 IDEMPIERE-2062 Add methods for MRefList for getting translation with specific language (and not ctx) 2014-07-16 09:26:15 -05:00
Carlos Ruiz 4142a422d7 hg merge release-2.0 (merge release2 into development) 2014-07-15 15:55:47 -05:00
Heng Sin Low 97e5b51a4c 1004128 IDEMPIERE-775 Documents without C_DocType_ID cannot be distributed directly. Implement suggestion from Carlos - special handling of the 7 tables in the Doc.getC_DocType_ID method. 2014-07-14 14:00:00 +08:00
Carlos Ruiz 402fa7e782 IDEMPIERE-1547 value of M_Warehouse>C_Location>IsValid is wrong when export 2014-07-11 21:19:44 -05:00
hieplq 32c7dcf9c4 IDEMPIERE-2038:Error when add new access in Role window 2014-07-03 15:28:06 +07:00
Carlos Ruiz c3f9e44ca0 IDEMPIERE-2003 Capturing wrong numbers with numeric keypad when decimal separator is not dot 2014-07-11 20:11:30 -05:00
Heng Sin Low b08aebfab8 IDEMPIERE-2042 Don't reserved stock if c_orderline.qtyordered is -ve. 2014-07-04 18:55:17 +08:00
Heng Sin Low a1685042c5 IDEMPIERE-2057 1003719 Modify "Update Costing" process to create a cost adjustment document. 2014-07-02 10:23:54 +08:00
Elaine Tan 1be17505b8 IDEMPIERE-2029 Performance gadgets portlet is not sized correctly on login 2014-07-15 14:27:38 -05:00
Heng Sin Low 36a7c16fa3 IDEMPIERE-2056 1004114 various problems w/inactivating products. Don't raise field not editable error if user are not making any changes to it. 2014-07-15 14:22:12 -05:00
Carlos Ruiz 15596ee282 IDEMPIERE-2028 Find not requerying if not changed / restore one line deleted by mistake 2014-06-30 13:10:29 -05:00
Carlos Ruiz 1ec538db0b IDEMPIERE-2028 Find not requerying if not changed 2014-06-30 12:07:47 -05:00
Nicolas Micoud 9d959afca7 IDEMPIERE-775 Documents without C_DocType_ID cannot be distributed directly 2014-07-16 15:07:01 -05:00
hieplq 520d4802e5 IDEMPIERE-2026:when role have limit access to a user, can't select any bpartner have no contact 2014-06-29 13:10:58 +07:00
Nicolas Micoud 02c221db86 IDEMPIERE-2013 Impossible to empty EMail field on User window 2014-06-25 09:12:54 -05:00
Carlos Ruiz 7747fdac06 IDEMPIERE-2014 Read-only tab/role allows user to edit AlwaysUpdateable fields 2014-06-23 13:41:11 -05:00
Elaine Tan bf38381e0e IDEMPIERE-1998 Should not auto add created by to the recipient list when the scheduler recipient list is empty 2014-06-13 10:50:08 +08:00
Carlos Ruiz 4c92c76c46 IDEMPIERE-1996 InventoryLine inherits bad default 2014-06-11 09:56:01 -05:00
Carlos Ruiz 023a9a19ac hg merge release-2.0 (merge release2 into development) 2014-07-11 21:27:33 -05:00
Carlos Ruiz d32549cf9d IDEMPIERE-1918 Tree node : add a method to change the description / regenerate serialVersionUID 2014-07-11 20:05:56 -05:00
Nicolas Micoud 65830799d3 IDEMPIERE-1918 Tree node : add a method to change the description 2014-07-11 20:04:40 -05:00
jan thielemann e19be23bc5 IDEMPIERE-1985 Provide error message in unsuccessful processes 2014-07-11 20:01:44 -05:00
Carlos Ruiz 0becee9edb IDEMPIERE-1968:valid check box in info window can manual editable / peer review 2014-07-11 19:57:23 -05:00
hieplq ea3bbe1418 IDEMPIERE-1968:valid check box in info window can manual editable 2014-06-04 00:19:25 +07:00
Carlos Ruiz b8fe2a93e6 IDEMPIERE-1901 Deprecate parent composite primary keys - leave management via table index 2014-07-11 17:57:13 -05:00
Carlos Ruiz e879b18def IDEMPIERE-2011 get a date according to saturday/sunday and non business days / based on patch from Nicolas Micoud (nmicoud) 2014-07-09 14:40:16 -05:00
Heng Sin Low 68b8172603 Merge release-2.0 into development 2014-07-04 20:08:00 +08:00
hieplq 97ecb0cdbf IDEMPIERE-1696:can't add password to report file by miss lib bouncycastle 2014-07-03 23:18:47 +07:00
Carlos Ruiz fab10a699a IDEMPIERE-2010 Param requery of MBPartnerLocation.getLocation is useless / based on patch from nmicoud 2014-07-02 14:11:26 -05:00
Carlos Ruiz 75ee91ce39 Regenerate serialVersionUID for modified classes from IDEMPIERE-1979 / IDEMPIERE-1973 / IDEMPIERE-1972 2014-07-02 12:36:43 -05:00
hieplq e27b957666 IDEMPIERE-1972:extend - Info window - process - by display logic field 2014-06-11 14:23:01 +07:00
hieplq 80c39dce09 IDEMPIERE-1973:Info Window - parameters - field Mandatory Logic missing 2014-06-11 10:50:58 +07:00
Carlos Ruiz 1effd5918b IDEMPIERE-1697 Ability to filter available column for print format / peer review 2014-07-02 10:18:30 -05:00
Nicolas Micoud f4369874db IDEMPIERE-1697 Ability to filter available column for print format 2014-07-02 10:16:49 -05:00
Carlos Ruiz b6b04612ad hg merge release-2.0 (merge release2 into development) 2014-07-01 21:15:22 -05:00
Deepak Pansheriya 5b5c119a57 IDEMPIERE-1770 refactoring code as per carlos' review comments 2014-06-28 16:14:04 +05:30
Deepak Pansheriya 29f0a5810e IDEMPIERE-1770 Allowing manual entry from Attributes tab on shipment/MR line 2014-07-01 21:07:07 -05:00
Carlos Ruiz c20843f6d0 hg merge release-2.0 (merge release2 into development) 2014-06-20 18:45:06 -05:00
Carlos Ruiz 26c5691677 Merged in tbayen/idempiere (pull request #86)
IDEMPIERE-1698 Let the user choose a different JasperReports class
2014-06-20 18:36:51 -05:00
Deepak Pansheriya 97dabc75b5 IDEMPIERE-1999 Adding support for over shipment. 2014-06-19 22:50:37 +08:00
Thomas Bayen 11519fb5f9 IDEMPIERE-1698 cleaner api through changed package for ReportStarter 2014-06-18 16:23:15 +02:00
hieplq c6b0e769d0 IDEMPIERE-1878:Printformat name in login language 2014-05-28 00:29:49 +07:00
hieplq b44121fac6 IDEMPIERE-1878:Printformat name in login language 2014-05-27 22:39:53 +07:00
tsvikruha ae2f5b0da0 IDEMPIERE-1792 Fixed Hiep default logic patch 2014-06-04 11:52:40 -05:00
hieplq 79bdd00235 IDEMPIERE-1792:Info Window - Default Logic missing 2014-05-30 15:03:08 +07:00
Carlos Ruiz 5d4a48021b IDEMPIERE-1334 Run one or more processes from Info Window / peer review 2014-05-29 18:44:25 -05:00
hieplq c656bd52ad IDEMPIERE-1334:Run one or more processes from Info Window
fix comment of carlos
2014-05-29 16:35:05 -05:00
Carlos Ruiz 3d53cf43db IDEMPIERE-236 bring hardcoded MSysConfig keys and order 2014-05-29 16:31:14 -05:00
Carlos Ruiz 60d2583f21 IDEMPIERE-1334 Run one or more processes from Info Window / peer review - work in progress 2014-05-28 14:49:27 -05:00
hieplq 45b0724542 IDEMPIERE-1334:Run one or more processes from Info Window 2014-05-26 23:27:34 +07:00
Carlos Ruiz dcc35ca737 hg merge release-2.0 (merge release2 into development) 2014-05-28 12:13:16 -05:00
Carlos Ruiz 8efef1cb7d IDEMPIERE-1967 Bank transfer process should allow for document number to be optional / based on patch from Carlos Augusto Sanchez (caaugustoss) 2014-05-27 10:25:58 -05:00
Carlos Ruiz a183558071 hg merge release-2.0 (merge release2 into development) 2014-05-21 15:33:17 -05:00
Elaine Tan 269a20ae82 IDEMPIERE-1958 Incorrect table start position in Table Element report layout code 2014-05-19 17:58:47 +08:00
Heng Sin Low b8c2ed4b2b 1003754 Landed cost issue -- related to IDEMPIERE-1285. Fix rounding issue with current product cost for average costing. 2014-05-19 14:40:07 +08:00
Heng Sin Low 86207e9729 1003754 Landed cost issue -- related to IDEMPIERE-1285. Fix landed cost allocation to product not working. 2014-05-19 14:39:38 +08:00
Heng Sin Low dc50ef3418 Ticket #1004012 IDEMPIERE-1954 Implement MaxQueryRecords for AD_InfoWindow. 2014-05-16 16:07:49 +08:00
Carlos Ruiz 4169252fc9 IDEMPIERE-1899 EMail : Implement default mail text and allow images within message / based on patch and idea from Nicolas Micoud (nmicoud) 2014-05-21 08:17:43 -05:00
Carlos Ruiz 4d8dc152e3 IDEMPIERE-1773 Asking for input from within a process / integrated patch from Jan Thielemann, thanks! 2014-05-16 10:46:26 -05:00
Heng Sin Low cfa8050b0b 1003754 Landed cost issue -- related to IDEMPIERE-1285. Fix rounding issue. Fix wrong posting when estimated landed cost is more than actual landed cost. 2014-05-12 16:15:15 +08:00
Elaine Tan 8cbea90a1b IDEMPIERE-1944 Reverse Issue with GL Journal and GL Journal Batch 2014-05-09 16:46:54 +08:00
Heng Sin Low 06ce3aae94 1003754 Landed cost issue -- related to IDEMPIERE-1285. Fix landed cost posting. 2014-05-05 15:29:23 +08:00
Carlos Ruiz 10da987cff IDEMPIERE-1898 When save a new record, row select is change to latest record / IDEMPIERE-1412 Creating a new record on window access moves to wrong position 2014-05-07 22:00:50 -05:00
Carlos Ruiz 6007d9f661 IDEMPIERE-1763 Reporting engine fixes / fix the fixed width problem for null values - backward compatible with existing formats 2014-05-07 20:46:33 -05:00
Carlos Ruiz 9a1a4eb2ee IDEMPIERE-1894 Missing SeqNoGrid when generating Fields in a Tab (TabCreateFields.java) / based on patch from Jan Thielemann 2014-05-07 18:47:38 -05:00
Nicolas Micoud 778d8a1307 IDEMPIERE-1843 Tabs and Fields not translated in Help 2014-05-07 18:29:13 -05:00
Carlos Ruiz 9f24e8a85b IDEMPIERE-1927 MAccount.get creating deadlocks because it doesn't have trx 2014-05-02 16:19:10 -05:00
Carlos Ruiz 448b84f284 IDEMPIERE-1925 Log SEVERE when creating a record in a window with a field based on Created or Updated / IDEMPIERE-709 2014-05-02 10:14:59 -05:00
Heng Sin Low c232e04e04 1003856 IDEMPIERE-1951 Run report as a background job. Fix bug discover during testing. 2014-04-24 22:44:16 +08:00
Carlos Ruiz c73000c38b 1003856 IDEMPIERE-1951 Integrate commit from hengsin -> Run report as a background job. Peer review implementation from Elaine. 2014-05-14 14:44:06 -05:00
Carlos Ruiz e247dac3a8 hg merge release-2.0 (merge release2 into development) 2014-05-14 12:41:43 -05:00
Heng Sin Low bc2d581399 1003862 Barcode type UPC A is needed for print formats going to Amazon. Added UPCA support using barcode4j. Use barcode4j instead of barbecue as I can't get decent output from barbecue, barbecue have the underline bug and barbecue is a dead project. Should completely drop the use of barbecue in future. 2014-05-14 12:25:10 -05:00
Elaine Tan 1e2cf53d61 IDEMPIERE-1904 Incorrect document status when void a document with completed document status 2014-04-18 12:51:08 +08:00
Carlos Ruiz af43f27785 IDEMPIERE-1912 Document Action Access bug / thanks to hieplq 2014-04-23 18:18:58 -05:00
hieplq 908050c3bd IDEMPIERE-1649:Reference of User1_id, User2_id in new table is create incorrect 2014-05-08 09:54:40 -05:00
Carlos Ruiz 854076ee2c hg merge release-2.0 (merge release2 into development) 2014-05-07 22:04:48 -05:00
Carlos Ruiz bfcf026a76 hg merge release-2.0 (merge release2 into development) 2014-04-29 21:29:54 -05:00
Carlos Ruiz e7a19cb6b0 hg merge release-2.0 (merge release2 into development) 2014-04-23 18:20:20 -05:00
hieplq 049cc9ebf0 IDEMPIERE-1696:can't add password to report file by miss lib bouncycastle. 2014-03-30 19:27:53 +07:00
Carlos Ruiz 1dd6fecce4 hg merge release-2.0 (merge release2 into development) 2014-04-16 17:58:44 -05:00
Carlos Ruiz 33753cb358 IDEMPIERE-1715 Implement Document Action for Production / integrate and peer review patch from Heng Sin 2014-04-16 17:58:33 -05:00
Heng Sin Low a4f0254bc4 IDEMPIERE-1902 Minor bug in MWorkflow.runDocumentActionWorkflow 2014-04-16 17:16:03 -05:00
Juan David Arboleda d3b618511b IDEMPIERE-1888 Easy Import allows to import any BP Location regardless of the BP master record 2014-04-16 17:03:17 -05:00
Carlos Ruiz 7c3dd909e7 IDEMPIERE-1907 DB helpers for multi-row and multi-column queries / committing into r2 as is harmless to add unused new helpers, but worthy for plugins and extensions 2014-04-16 13:29:34 -05:00
hieplq 50bfd9089c IDEMPIERE-1251:some character in html report is break when encode of os is win-1252 2014-04-16 15:28:03 +07:00
Carlos Ruiz ae3f1fbecf IDEMPIERE-1461 Zoom Condition doesn't work on empty fields / fix reported issue from hieplq, also fixes IDEMPIERE-1862 2014-04-16 10:23:56 -05:00
Carlos Ruiz 3f0f694709 IDEMPIERE-1905 Add feedback to time-consuming processes 2014-04-16 09:17:02 -05:00
Carlos Ruiz e7730780ba IDEMPIERE-1877 Product Info Window Implementation broke the usage of barcode reader 2014-04-11 12:10:56 -05:00
Carlos Ruiz 1c3b7c4179 IDEMPIERE-1884 phantom shipment record create when create wrong Drop Shipment 2014-04-09 12:40:21 -05:00
Carlos Ruiz 2a980dfc58 hg merge release-2.0 (merge release2 into development) 2014-04-07 15:30:40 -05:00
Carlos Ruiz 772ec43368 IDEMPIERE-1572 Last Run and Saved parameter for process / based on patch from Deepak Pansheriya 2014-04-04 10:19:40 -05:00
Dirk Niemeyer 93bc5f0909 IDEMPIERE-1875 Bad SQL produces ORA-Error 2014-04-03 16:44:10 -05:00
Carlos Ruiz 156bde8b07 hg merge release-2.0 (merge release2 into development) 2014-04-02 22:24:15 -05:00
Carlos Ruiz aba6e6ca48 1003869 Form to captured process parameter for scheduler. IDEMPIERE-1486 / Fixed captured value for null fields - fix default @#Date# being saved with time 2014-04-02 20:02:36 -05:00
Carlos Ruiz c3effef177 IDEMPIERE-1216 Add missing translation tables / fix oracle migration script / peer review java patch from Nicolas Micoud (nmicoud) 2014-04-02 15:56:21 -05:00
Thomas Bayen 036f065d70 IDEMPIERE-1686 GenerateModel does not take commandline arguments 2014-04-02 10:22:20 -05:00
Carlos Ruiz d75a1cb722 hg merge release-2.0 (merge release2 into development) 2014-03-26 21:26:40 -05:00
Carlos Ruiz c372315ce8 IDEMPIERE-294 Maintenance / minor patch required for plugin org.evenos.broadcaster 2014-03-26 11:51:16 -05:00
Heng Sin Low b392cc090c IDEMPIERE-1135 Report wizard not clearing order items. Revert 9442:c5593c3165ff as it is not consistent with how the printformat sorttab work and break packin of printformatitem ( Ticket #1003444 ). 2014-03-20 11:37:00 +08:00
Carlos Ruiz 115211d74c IDEMPIERE-1850 CRITICAL / Allocation Date Issue / integrate patch suggested by Michal Zilincar 2014-03-26 10:10:19 -05:00
Carlos Ruiz 8b7260453b hg merge release-2.0 (merge release2 into development) 2014-03-19 21:53:55 -05:00
hieplq 94610a51ac IDEMPIERE-1619:Link on third tab pointing to field on first tab instead of second 2014-03-19 21:49:27 -05:00
Nicolas Micoud 840abd46ee IDEMPIERE-1891 Cannot access Process message is hardcoded 2014-04-20 14:54:52 -05:00
Carlos Ruiz fc8a941055 IDEMPIERE-1903 Error save new user if "Password Policies" enabled 2014-04-16 21:53:57 -05:00
Carlos Ruiz 508a0dcb9b IDEMPIERE-1835 CSV Exporter is exporting fields that are not displayed to the user / based on patch from Juan Arboleda (jarboleda) 2014-03-19 20:52:52 -05:00
Carlos Ruiz 0543cd8685 IDEMPIERE-1829 Impossible to send reset password email in the user language / based on patch from Nicolas Micoud (nmicoud) 2014-03-19 20:42:06 -05:00
Juan David Arboleda 6e8fbabdfa IDEMPIERE-1548 Error import location when no region 2014-03-19 20:16:56 -05:00
Carlos Ruiz 37463c57d4 IDEMPIERE-811 Direct inserts not filling _UU columns / initial client setup 2014-03-19 13:30:51 -05:00
Carlos Ruiz f821b5fbed IDEMPIERE-1831 Missing AD_Preference_UU in some places+Patch / based on patch from Jan Thielemann 2014-03-19 12:55:26 -05:00
Carlos Ruiz b90759bae2 IDEMPIERE-1649 Reference of User1_id, User2_id in new table is create incorrect / based on patch from Hiep 2014-03-13 11:02:16 -05:00
Elaine Tan db3a14f6da IDEMPIERE-1814 Payment check no and stock check number do not match when using Payment Selection and Payment Print/Export 2014-03-13 12:24:15 +08:00
Carlos Ruiz ee3e5644ca IDEMPIERE-1717 Maintenance mode 2014-04-02 10:53:37 -05:00
Carlos Ruiz 4f44c80e25 IDEMPIERE-1410 Non-advanced users can assign themselves advanced roles 2014-04-02 09:27:18 -05:00
Carlos Ruiz bc9b8049bc hg merge release-2.0 (merge release2 into development) 2014-03-12 23:07:54 -05:00
Nicolas Micoud 8e0d71a6ad IDEMPIERE-1762 Ability to set a validation rule on fields for Payments 2014-03-20 10:28:19 -05:00
Carlos Ruiz 5583a606c2 hg merge release-2.0 (merge release2 into development) 2014-03-07 22:20:51 -05:00
Carlos Ruiz cac1e2d290 IDEMPIERE-1778 Remove final of M classes / integrate patch from Nicolas Micoud (nmicoud) 2014-03-06 19:44:55 -05:00
Carlos Ruiz 26e7dfdc64 hg merge release-2.0 (merge release2 into development) 2014-03-05 12:14:58 -05:00
Carlos Ruiz 772fca9f09 IDEMPIERE-1620 Improve ITaxProvider / integrate patch from Murilo Habermann Torquato (muriloht) 2014-03-05 08:43:17 -05:00
Heng Sin Low e0a5c43285 IDEMPIERE-1766 Add support to print different text for summary line ( "Grand Total" instead of "total" ). 2014-02-24 10:27:38 -05:00
Carlos Ruiz 6fb6825665 hg merge release-2.0 (merge release2 into development) 2014-02-19 10:14:38 -05:00
Heng Sin Low 5080fb0eed IDEMPIERE-1173 1003754 Landed cost issue -- related to IDEMPIERE-1285. Fixed issues with one landed cost invoice line match against multiple receipt line. Handle incompatibility between average invoice and average po costing method. 2014-03-05 14:45:20 +08:00
Elaine Tan aab81ae1c7 IDEMPIERE-1761 Report tree cache issue 2014-02-18 17:23:04 +08:00
Heng Sin Low ce45dcf0f3 IDEMPIERE-1530 Allow Material Receipt Line with Quantity Receipt more then Purchase Order Line's Quantity Ordered. Fixed update of QtyOrder ( PO Qty pending MR ). 2014-02-18 15:34:53 +08:00
Heng Sin Low 7d32b0de0f IDEMPIERE-1750 Restore backward compatibility for M_ProductionPlan. 2014-02-13 22:05:15 +08:00
Elaine Tan 300ae850ac IDEMPIERE-2063 Ticket #1004146: cannot remove reserve quantity off order 2014-07-16 17:49:03 +08:00
Carlos Ruiz 367ca9794e IDEMPIERE-1730 Counter Document can not create at Order and Invoice / integrate patch from Hagiwara Hideaki 2014-03-12 21:03:05 -05:00
Carlos Ruiz 9a3b47b3a0 IDEMPIERE-1679 Remove MGoal.getUserGoals: No Records found message from log 2014-03-12 16:07:48 -05:00
Carlos Ruiz f3321a3eba IDEMPIERE-1536 Error running a report with SQL columns / thanks to Antonio Cañaveral for suggested patch 2014-03-12 15:59:58 -05:00
Carlos Ruiz ea3620f953 IDEMPIERE-604 Fix implementation hiding SQL errors from user - all SQL errors are being shown as "timeout error" 2014-03-12 15:14:28 -05:00
hieplq 1afe37e25b IDEMPIERE-1670:log-in with ldap account fail 2014-03-07 20:59:32 +07:00
Carlos Ruiz d8f3f0d6b7 Fix IDEMPIERE-1707 A single default country for all tenant 2014-03-12 09:54:14 -05:00
Carlos Ruiz 2ce72c6e56 hg merge release-2.0 (merge release2 into development) 2014-02-15 11:39:41 -05:00
Carlos Ruiz 9cecab37f3 hg merge release-1.0c (merge release1 into release2) 2014-02-15 11:39:39 -05:00
Carlos Ruiz 51b70dfa33 hg merge release-2.0 (merge release2 into development) 2014-02-07 16:08:03 -05:00
Carlos Ruiz ca0455b9db hg merge release-1.0c (merge release1 into release2) 2014-02-07 16:08:01 -05:00