Commit Graph

1721 Commits

Author SHA1 Message Date
hieplq aa9dc46a27 IDEMPIERE-1792:Info Window - Default Logic missing 2014-06-05 09:41:48 +07:00
Carlos Ruiz 498e2023fa IDEMPIERE-1992 HTML editor toolbar button disappear when swithching tabs / Thanks to Chử Trần Vương (VuongCT) 2014-07-02 13:15:34 -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
hieplq 0a2d49f857 IDEMPIERE-1979:auto requery with new value in parameter in info window after a action can make a Straggle 2014-06-11 10:43:47 +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
Nicolas Micoud 596670afd5 IDEMPIERE-1725 List of available print formats should be filtered with report view in report viewer 2014-07-02 08:39:06 -05:00
Carlos Ruiz b6b04612ad hg merge release-2.0 (merge release2 into development) 2014-07-01 21:15:22 -05:00
Carlos Ruiz 313f7293f6 IDEMPIERE-1899 EMail : Implement default mail text and allow images within message 2014-06-25 14:30:38 -05:00
hieplq a235318f03 IDEMPIERE-1899:EMail : Implement default mail text and allow images within message 2014-06-14 09:10:42 +07:00
hieplq 20776b2519 IDEMPIERE-2018:Error with DST on Calendar window 2014-06-24 13:32:08 +02:00
Heng Sin Low 023ce77c89 IDEMPIERE-2007 Detail Pane: Reduce vertical space use by paging control. Fixed problem with the # records message. 2014-06-22 22:24:34 +08: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 72b8f0e380 IDEMPIERE-2005 Improvement to collapsed page header mode. Minor visual tweak. 2014-06-20 11:40:24 +08:00
Heng Sin Low ec78079e40 IDEMPIERE-2007 Detail Pane: Reduce vertical space use by paging control. 2014-06-19 22:34:42 +08:00
Heng Sin Low c6e660ca50 IDEMPIERE-2005 Improvement to collapsed page header mode. 2014-06-19 17:29:05 +08:00
Heng Sin Low 330253aa89 IDEMPIERE-2006 Process dialog: initial focus. 2014-06-19 17:28:21 +08:00
Thomas Bayen 78eccc2deb IDEMPIERE-1698 change exported package name as hengsin suggested 2014-06-18 15:46:48 +02:00
Thomas Bayen 42a3f4f9f3 IDEMPIERE-1698 LEt the user choose a different JasperReports class 2014-06-18 14:06:59 +02:00
Carlos Ruiz aa6b4a36f9 Contributors Are Priceless ... U HAVE 2 BE 2014-06-09 11:57:51 -05: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
Carlos Ruiz 366f642f63 IDEMPIERE-1792 Info Window - Default Logic missing / peer review 2014-06-04 18:08:48 -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 f408e885ff IDEMPIERE-1711 / revert one-line change to restore IDEMPIERE-800 functionality / thanks to hieplq for pointing to the solution 2014-05-29 15:58:25 -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
hieplq c7e4d2cbeb IDEMPIERE-1419:InfoWindow List column display the value instead of the name 2014-05-26 20:59:00 +07:00
hieplq c5b2e653b9 IDEMPIERE-1957:add ability to make tooltip for any control not only gridField 2014-05-23 09:08:21 +07:00
Carlos Ruiz 78738e318e IDEMPIERE-1419 InfoWindow : List column display the value instead of the name / based on patch from hieplq 2014-05-28 12:32:24 -05:00
Carlos Ruiz dcc35ca737 hg merge release-2.0 (merge release2 into development) 2014-05-28 12:13:16 -05:00
Carlos Ruiz 9973ea483e IDEMPIERE-1868 / solve warnings 2014-05-28 11:09:09 -05:00
hieplq eae9f5a16c IDEMPIERE-1868:Browser Title showing "iDempiere" instead ZK_BROWSER_TITLE when session timeout
fix favico
2014-05-23 16:50:57 +07:00
Carlos Augusto Sanchez c6b0cd00f9 IDEMPIERE-1966 Configured sql-order-by statement in product info not taken into account when warehouse is selected 2014-05-27 17:00:55 -05:00
hieplq 8f301f9cea IDEMPIERE-1868:Browser Title showing "iDempiere" instead ZK_BROWSER_TITLE when session timeout 2014-05-22 08:41:24 +07:00
Carlos Ruiz a183558071 hg merge release-2.0 (merge release2 into development) 2014-05-21 15:33:17 -05:00
Heng Sin Low dc50ef3418 Ticket #1004012 IDEMPIERE-1954 Implement MaxQueryRecords for AD_InfoWindow. 2014-05-16 16:07:49 +08:00
hieplq 8ae6fad8dc IDEMPIERE-1957:add ability to make tooltip for any control not only gridField 2014-05-18 21:58:52 +07: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
Heng Sin Low 8ab4db18d5 IDEMPIERE-1960 InfoWindow: Can't set column with context variable as selection column. 2014-05-21 11:58:15 +08: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 03f22d1ca4 1004000 Performance issue with product info form. Minor fix for checking of empty order by clause. 2014-05-16 13:33:23 +08:00
Heng Sin Low 2b750ba2a2 IDEMPIERE-1960 InfoWindow: Can't set column with context variable as selection column. 2014-05-21 11:58:15 +08:00
Carlos Ruiz 20d2b7fdc3 IDEMPIERE-1726 Error in report when there are filters (historical records) 2014-05-07 19:10:47 -05:00
Nicolas Micoud 778d8a1307 IDEMPIERE-1843 Tabs and Fields not translated in Help 2014-05-07 18:29:13 -05:00
hieplq 45ede791a4 IDEMPIERE-1935:in changepassword window, push "enter" key make waiting window never end 2014-05-07 22:27:23 +08:00
hieplq 7aa1fe51b2 IDEMPIERE-1935:in changepassword window, push "enter" key make waiting window never end 2014-05-07 02:25:49 +08:00
Carlos Ruiz 9f24e8a85b IDEMPIERE-1927 MAccount.get creating deadlocks because it doesn't have trx 2014-05-02 16:19:10 -05:00
Heng Sin Low bc960ac0fa 1003856 IDEMPIERE-1951 Run report as a background job. Fix counts of background user jobs included scheduler jobs. 2014-05-06 20:00:10 +08: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 669b5e65f0 IDEMPIERE-1857:Incorrectly info window opens from views panel / minor - remove warning 2014-05-08 18:47:43 -05:00
Heng Sin Low 8ecad8bea8 1003894 Java OutOfMemory Issue. Turn off zk gzip compression - it is suspected that the zk gzip compression implementation leave many Deflater object over time that relying on finalizer thread to perform clean up. The finalizer thread failed to keep up and eventually cause OOM error. 2014-04-10 11:57:11 +08:00
Heng Sin Low 1d117110de 1003875 Prevent crashing. Disable desktop timeout as different desktop and session timeout value can produce unexpected error. 2014-03-26 20:36:13 +08:00
Elaine Tan 80f1cafe49 IDEMPIERE-1915 Tool Tip panel collapses when clicking into it or out of a field on window 2014-04-28 15:44:23 +08:00
Carlos Ruiz 898e61f153 IDEMPIERE-1917 Division by zero rendering performance indicator 2014-04-28 16:07:48 -05:00
hieplq 9b1f81f2cd IDEMPIERE-1857:Incorrectly info window opens from views panel 2014-03-25 18:17:48 +07: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 1dd6fecce4 hg merge release-2.0 (merge release2 into development) 2014-04-16 17:58:44 -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 2a980dfc58 hg merge release-2.0 (merge release2 into development) 2014-04-07 15:30:40 -05:00
Elaine Tan 8b603ec432 IDEMPIERE-1734 Product Info history records/reserved qty doesn't show reservations 2014-04-07 14:37:30 -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
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
Carlos Ruiz d75a1cb722 hg merge release-2.0 (merge release2 into development) 2014-03-26 21:26:40 -05:00
Heng Sin Low 61cb022c41 1003875 From server log - Fixed NPE in AbstractDesktop. 2014-03-26 20:41:39 +08:00
Heng Sin Low cb485f7191 1003875 From server log - Fixed bad exception handling in ProcessModalDialog. 2014-03-26 20:37:36 +08:00
Carlos Ruiz aced8500df IDEMPIERE-1797 Login dialog change language 2014-03-24 15:29:37 -05:00
Carlos Ruiz 8b7260453b hg merge release-2.0 (merge release2 into development) 2014-03-19 21:53:55 -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
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
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
Heng Sin Low 63c57b944c 1003869 Form to captured process parameter for scheduler. IDEMPIERE-1486 / Fixed captured to value for non-range parameter as well. 2014-04-02 06:47:46 +08:00
Carlos Ruiz 63b3aac408 IDEMPIERE-1871 Inactive records should be distinguishable from Active records in grid view / implement the same if current row is inactive 2014-04-02 11:24:43 -05:00
Heng Sin Low 8d6a31defd IDEMPIERE-1871 1003779 Inactive records should be distinguishable from Active records in grid view. 2014-03-27 22:50:00 +08:00
Carlos Ruiz bc9b8049bc hg merge release-2.0 (merge release2 into development) 2014-03-12 23:07:54 -05:00
Carlos Ruiz fe51afaaa2 IDEMPIERE-1701 Apply same patch from hiep for SaveCreate, Delete, DeleteSelection and Process 2014-03-12 22:53:05 -05:00
Carlos Ruiz 98850a7e39 IDEMPIERE-1794 Implement search box on Tree Maintenance / integrate and peer review patch from Sergio Oropeza 2014-03-07 22:38:04 -05:00
Carlos Ruiz 5583a606c2 hg merge release-2.0 (merge release2 into development) 2014-03-07 22:20:51 -05:00
Carlos Ruiz 2dbc965b5f IDEMPIERE-85 Add confirmation on TreeMaintenance when moving all nodes / finish translation of tooltips 2014-03-07 22:16:15 -05:00
Carlos Ruiz 9f67539c3d IDEMPIERE-1550 Zk: Problem with multiple browser tab / minor, regenerate serialVersionUID 2014-03-07 19:35:53 -05:00
Heng Sin Low 9dd3098138 IDEMPIERE-1550 Zk: Problem with multiple browser tab 2014-03-07 19:35:07 -05:00
Carlos Ruiz 8786638e1e IDEMPIERE-1789 remove grid border from workflow window 2014-03-07 19:17:14 -05:00
hieplq fa857fd070 IDEMPIERE-1701:when make new detail make head change, can't make more detail (requirement requery) 2014-03-07 14:55:18 +07:00
Carlos Ruiz 26e7dfdc64 hg merge release-2.0 (merge release2 into development) 2014-03-05 12:14:58 -05:00
Carlos Ruiz 6fb6825665 hg merge release-2.0 (merge release2 into development) 2014-02-19 10:14:38 -05:00
Carlos Ruiz 3e23250e18 IDEMPIERE-1747 when user click cancel button in "select role" in condition "change role". it should forward to system, not login / Peer review 2014-02-19 09:32:43 -05:00
Heng Sin Low e52d8c57ea IDEMPIERE-1749 Add event validator service support for ad window. Trivial - remove system.out.println line leftover from testing. 2014-02-18 15:56:14 +08:00
Heng Sin Low 4f8e31bdd3 IDEMPIERE-1749 Add window event validator for AD_Window 2014-02-18 00:16:41 +08:00
hieplq f7733eb430 IDEMPIERE-1757:miss css file for browse diff IE 2014-02-14 03:03:22 +07:00
Heng Sin Low 0196907539 1003720 How to avoid check re-printing. Part2 - Make WPayPrint more extensible. 2014-02-11 21:18:39 +08:00
hieplq fc810c64db IDEMPIERE-1747:when user click cancel button in "select role" in condition "change role". it should forward to system, not login. 2014-02-11 00:42:13 +07:00
Heng Sin Low b6dbfd5015 Trivial fix for process dialog: don't attempt to show status update message if desktop(client browser) is dead. 2014-02-14 20:40:32 +08:00
Elaine Tan 2c2743fcbf IDEMPIERE-724 Zk: Make iDempiere theme more easily customizable - Added css class to pending and in progress parent node 2014-02-13 11:51:52 +08:00
Elaine Tan 0321098119 * IDEMPIERE-1748 NullPointerException in Setup Wizard window
* IDEMPIERE-724 Zk: Make iDempiere theme more easily customizable - Added css class to open tasks parent node
2014-02-11 11:37:19 +08:00
Nicolas Micoud 9c5505cc77 IDEMPIERE-1361 Mismatch of layout in the window Tree Maintenance 2014-03-12 21:59:37 -05:00
hieplq 5e9593740c IDEMPIERE-1552:When double click into non line area (include header) of infoPanel. panel close. 2014-02-06 14:12:06 +07:00
Elaine Tan 85ff580ba1 IDEMPIERE-2061 Ticket #1004119: HTML error on Dashboard Report detail 2014-07-16 12:40:01 +08:00
hieplq a03563cda5 IDEMPIERE-1737:Double click into header or blank area (when non row is selected) of info window make NPE 2014-02-06 13:59:46 +07:00
Carlos Ruiz f269768f71 IDEMPIERE-1144 Generating shipments from existing orders fails if product has mandatory attribute set / thanks to Tony Snook (tspc) for the initial patch 2014-03-12 21:45:02 -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
Nicolas Micoud 900f6bd76e IDEMPIERE-976 Impossible to set a title for FDialog.error 2014-02-15 11:22:42 -05:00
Heng Sin Low 410c9a1131 IDEMPIERE-1749 Add window event validator for AD_Window 2014-02-12 09:31:14 -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
Carlos Ruiz 93b7e0b75b IDEMPIERE-1732 two users can complete same M_InOut and data is corrupted / peer review and integrate patch from hengsin 2014-02-07 15:47:22 -05:00
Carlos Ruiz c2737073e6 IDEMPIERE-1045 Improve info Window implementation to enable the definition of related info which will be rendered as tabs at the bottom of the content Pane / thanks to Anthony Sossah (xolali) for the contribution and red1 for the peer review and integration 2014-01-26 17:10:29 -05:00
Carlos Ruiz 410a19b632 IDEMPIERE-1353 Choose to display trees on master, detail or both tabs / based on patch from Nicolas Micoud (nmicoud) 2014-01-25 13:56:48 -05:00
Redhuan D. Oon f26d5d6a94 IDEMPIERE-1711 InfoWindow Process 2014-01-24 22:25:36 -05:00
Carlos Ruiz 75a83242d1 hg merge release-2.0 (merge release2 into development) 2014-01-24 16:57:56 -05:00
Carlos Ruiz 17e085641c IDEMPIERE-1693 In InfoProductWindow, tab "Available to Promise" can change by change level of log. Should make a checkbox for it. / based on patch from hieplq 2014-01-19 14:47:23 -05:00
Carlos Ruiz b3345e1e89 IDEMPIERE-1461 Zoom Condition doesn't work on empty fields 2014-01-15 09:36:21 -05:00
Carlos Ruiz 677b13dde1 IDEMPIERE-1684 Quick Info Widget 2014-01-13 08:46:06 -05:00
Carlos Ruiz ce00df6052 IDEMPIERE-1150 Status Line window / based on patch from Nicolas Micoud 2014-01-12 15:51:11 -05:00
Carlos Ruiz 83d3912c79 IDEMPIERE-1613 BOM drop window show error message when click to radio button / integrate patch from hieplq - peer reviewed by red1 2014-02-26 09:35:24 -05:00
Elaine Tan b379c973eb IDEMPIERE-1765 Support print format jasper process in WPayPrint 2014-02-20 18:54:37 +08:00
Carlos Ruiz 536f700fa4 hg merge release-2.0 (merge release2 into development) 2014-01-08 22:03:33 -05:00
Carlos Ruiz 8ef1250754 hg merge release-1.0c (merge release1 into release2) 2014-01-08 22:03:25 -05:00
Carlos Ruiz 8097e21fba IDEMPIERE-1085 Loading Info windows dynamically / based on patches from Nicolas Micoud (nmicoud) 2014-01-08 22:01:38 -05:00
Carlos Ruiz 17fc5f8bf1 IDEMPIERE-76 Bouton SelectAll should also be used to DeSelectAll / based on patch from Nicolas Micoud (nmicoud) 2014-01-08 20:13:57 -05:00
Carlos Ruiz e31bf2c561 IDEMPIERE-1673 In new state of record. click to print and export throws exception 2014-01-08 10:21:57 -05:00
Carlos Ruiz 9e17fdff49 IDEMPIERE-1357 Tree panel not is updated with result of Find window / testing IDEMPIERE-1477 found that IDEMPIERE-1357 was back 2013-12-26 18:27:37 -05:00
hieplq 9f7635ac7b IDEMPIERE-1477 NPE on tree 2013-12-26 20:19:50 +07:00
Carlos Ruiz 5a3b33d4af hg merge release-1.0c (merge release1 into release2) 2013-12-24 12:28:53 -05:00
Carlos Ruiz 7f70a69139 IDEMPIERE-1388 Info Window : Adding a IsActive criteria has no effect / thanks to Nicolas Micoud (nmicoud) 2013-12-24 12:24:02 -05:00
Carlos Ruiz 469edd0b96 IDEMPIERE-1480 Usability - Toolbar buttons reordering 2013-12-23 09:37:35 -05:00
Elaine Tan c1e857b4b8 Merged release-1.0c into release-2.0 2013-12-20 19:52:07 +08:00
Heng Sin Low c218175559 1003646 Print Dunning Letter - Null Pointer Exception. 2013-12-20 17:08:19 +08:00
Heng Sin Low 26f10efd30 Merged release-1.0c into release-2.0 2013-12-19 20:59:03 +08:00
Heng Sin Low 9dff6966e0 1003576 CLOSE TAB WARINING SHOULDN'T APPEAR WHEN SESSION IS KILLED. Peer review. 2013-12-19 16:59:29 +08:00
Carlos Ruiz f4ab371718 hg merge release-1.0c (merge release1 into release2) 2013-12-17 21:24:37 -05:00
Carlos Ruiz d186c35265 IDEMPIERE-1638 BUG: Could not invoke Toolbar listener method: onRefresh() / IDEMPIERE-1584 2013-12-17 21:23:26 -05:00
Carlos Ruiz 053bf7e8f4 hg merge release-1.0c (merge release1 into release2) 2013-12-17 12:05:23 -05:00
Heng Sin Low 0e6d317e2b 1003581 IDEMPIERE-1584 -- Custom sort order is lost when updating a record. 2013-12-17 18:04:50 +08:00
Heng Sin Low b58546521f 1003572 Problem with Locator field on "Import Inventory" process. Fixed wrong checking for "first locator element is empty". 2013-12-17 10:44:06 +08:00
Carlos Ruiz 4626279112 hg merge release-1.0c (merge release1 into release2) 2013-12-13 13:21:03 -05:00
Heng Sin Low 7e958c4f3f Merged release-1.0c into release-2.0 2013-12-13 20:49:04 +08:00
Heng Sin Low ed0d30fd31 IDEMPIERE-1448 Import File Loader window is showing columnnames. Peer review and commit patch from Carlos Ruiz. 2013-12-13 20:27:59 +08:00
Heng Sin Low dc1ac23175 1003574 The "Print" button is mute and not working. Always show process info if there's error. 2013-12-13 17:11:33 +08:00
Heng Sin Low 979c38bdfc 1003572 Problem with Locator field on "Import Inventory" process. 2013-12-13 16:28:33 +08:00
Carlos Ruiz 6c63b156a7 hg merge release-1.0c (merge release1 into release2) 2013-12-11 18:34:48 -05:00