Commit Graph

1612 Commits

Author SHA1 Message Date
Carlos Ruiz a6ee2fec0f IDEMPIERE-385 Resolve M_Storage locking and data consistency / Fix error on view (ERROR: column "m_storage_uu" does not exist) 2012-12-03 15:21:10 -05:00
Carlos Ruiz 583074cb16 IDEMPIERE-293 Support for Kill Session / Peer Review 2012-12-03 00:37:06 -05:00
Deepak Pansheriya 7788bf9bae IDEMPIERE-293 Support for Kill Session 2012-11-30 17:15:19 +05:30
Carlos Ruiz 2de5900c6c IDEMPIERE-294 BroadCast Message / Peer review 2012-12-02 23:59:49 -05:00
Deepak Pansheriya f992cef2d7 IDEMPIERE-294 BroadCast Message 2012-11-30 14:56:59 +05:30
Carlos Ruiz 5c01bfc982 IDEMPIERE-390 Attachments/archives on load balancer scenario / Fix oracle migration script 2012-11-28 17:45:24 -05:00
Carlos Ruiz a1c02e5d6a IDEMPIERE-393 Setup wizards / Fix oracle migration script 2012-11-28 17:45:02 -05:00
Carlos Ruiz beb0b209e8 IDEMPIERE-390 Attachments/archives on load balancer scenario / Peer review 2012-11-28 17:00:13 -05:00
Juliana Corredor 28008f2737 IDEMPIERE-390 Attachments/archives on load balancer scenario 2012-11-28 15:52:54 -05:00
Carlos Ruiz 04e7d33c47 IDEMPIERE-393 Setup wizards / Two messages required 2012-11-28 01:12:12 -05:00
Carlos Ruiz 5c4de4a93a IDEMPIERE-393 Setup wizards / Peer review 2012-11-28 01:05:41 -05:00
David Peñuela 7fa15475a8 IDEMPIERE-393 Setup wizards 2012-11-27 22:54:38 -05:00
Carlos Ruiz 51525163ee IDEMPIERE-509 Problem in create new record in the window Production / Thanks to Tony Snook for suggested solution 2012-11-26 13:58:24 -05:00
Carlos Ruiz a4562a33fc IDEMPIERE-163 Implement isupdateable and isalwaysupdateable on ad_field / Peer review 2012-11-23 13:34:49 -05:00
Juan David Arboleda 6433b7c02f IDEMPIERE-163 Implement isupdateable and isalwaysupdateable on ad_field 2012-11-23 12:57:35 -05:00
Carlos Ruiz ce09c51372 IDEMPIERE-369 Master Detail layout improvements / Reorganize tabs on some windows for ease access:
Affected windows: Charge, Country Region and City, Currency, Form, Payment Term, Reference, Report & Process, Table and Column, Tax Rate, Unit of Measure, Window Tab & Field, Workflow
2012-11-23 10:34:06 -05:00
Carlos Ruiz 794d9cedbe IDEMPIERE-385 Resolve M_Storage locking and data consistency / avoid ERROR: failed to recreate dependent view 2012-11-22 11:32:12 -05:00
Carlos Ruiz d74f7933ba IDEMPIERE-385 Resolve M_Storage locking and data consistency / M_StorageReservation requires IsSOTrx part of they key / PO.java need changes to manage Boolean on multi-column primary key 2012-11-20 17:30:16 -05:00
Carlos Ruiz bba1082d4e IDEMPIERE-385 Resolve M_Storage locking and data consistency / Finish changes to database:
- view replacement for M_Storage – ad_table marked as view
- migration script from M_Storage to the two new tables
- migration script to fill M_Warehouse.ReserveLocator_ID
- generate UUID columns and model classes for the two new tables
- the unique index key m_storagereservation_pkey must have IsSOTrx
- reorg unique index key m_storagereonhand_pkey - most accessed columns first
- m_product_stock_v - restored to previous version based on M_Storage now view
- m_product_substituterelated_v - restored to previous version based on M_Storage now view
2012-11-19 16:17:40 -05:00
Carlos Ruiz bb76dee97a IDEMPIERE-385 / QA migration scripts 2012-11-14 17:51:23 -05:00
Carlos Ruiz 3f1f81078b IDEMPIERE-385 / rename migration scripts 2012-11-14 17:37:13 -05:00
Edwin Ang 0c5c1284a8 commit storage related script 2012-11-14 20:12:10 +07:00
Carlos Ruiz 5e23f70cf0 IDEMPIERE-387 Enable mixed payments on POS Sales Order 2012-11-16 20:45:04 -05:00
Carlos Ruiz ea5cadb162 Ticket #1001611: Adjust Payment Processor Options for Tenant / Fix migration scripts 2012-11-16 11:13:33 -05:00
Elaine Tan 17aeb199ef Merge with ade8e366cf54154e97af42addf956d38229c553c 2012-11-16 18:08:19 +08:00
Elaine Tan 89143356e7 IDEMPIERE-462 Ticket #1001503: Credit Cards Online - add a validation rule to exclude authorizations transaction type from trx type list field at payment window. 2012-11-16 17:43:12 +08:00
Elaine Tan bec8fac40c Ticket #1001611: Adjust Payment Processor Options for Tenant 2012-11-16 17:40:17 +08:00
Carlos Ruiz 39ecc6f10e IDEMPIERE-378 - register migration script 2012-11-14 16:49:36 -05:00
Juan David Arboleda 34267029f4 IDEMPIERE-457 Tab Editor (to ease positioning of fields) 2012-11-14 16:32:44 -05:00
Heng Sin Low fcce5918dd Merge with 8d3b639fd52cecdc89d7256e97f469430175ecb1 2012-11-14 10:21:13 +08:00
Heng Sin Low 6bdc0b187e IDEMPIERE-378 Implement Reverse Accrual 2012-11-14 09:58:53 +08:00
Carlos Ruiz b98d84e788 IDEMPIERE-457 Tab Editor (to ease positioning of fields) / Team work with Juan Arboleda 2012-11-12 18:09:48 -05:00
Carlos Ruiz 99f2517034 IDEMPIERE-498 Make BP quick entry configurable 2012-11-09 23:56:37 -05:00
Carlos Ruiz 93c292c89b Last migration script is not being set properly 2012-11-09 13:30:52 -05:00
Carlos Ruiz 0dd0d36ad2 IDEMPIERE-316 Inform when the user is not approver of a workflow doc / Peer review 2012-11-09 13:11:09 -05:00
Carlos Ruiz e8eb6147dd IDEMPIERE-462 Ticket #1001503: Credit Cards Online 2012-11-07 10:40:21 -05:00
Carlos Ruiz d74fc3788b IDEMPIERE-422 Complete Native Sequence feature / Fix broken oracle procedure 2012-11-07 09:12:41 -05:00
Carlos Ruiz 795de13042 IDEMPIERE-462 Ticket #1001503: Credit Cards Online / minor error applying script 2012-11-02 16:44:33 -05:00
Elaine Tan 5aad42166e Merge with b45413933366d42287c38f0e9bcd9b0ba4a019b1 2012-11-02 18:34:32 +08:00
Elaine Tan 236e06c7cc IDEMPIERE-462 Ticket #1001503: Credit Cards Online - support online credit payment, include copyright text, use translate message, fix credit card online processing issues 2012-11-02 18:27:14 +08:00
Heng Sin Low 2bc50c1c30 IDEMPIERE-478 Zk: Theme 2012-11-02 16:39:53 +08:00
Heng Sin Low 193445a598 IDEMPIERE-478 Zk: Theme 2012-11-02 16:38:13 +08:00
Elaine Tan fe8573e501 Merge with 28f0ff5b4ae2e8ae3565045da5ed334120e2965f 2012-11-01 20:48:51 +08:00
Elaine Tan 442fd422a1 IDEMPIERE-462 Ticket #1001503: Credit Cards Online - support online sales, authorization, delay capture and void payment 2012-11-01 20:23:20 +08:00
Carlos Ruiz d8a879304c Rename 360lts-release to 360lts-i1.0a 2012-10-31 19:16:12 -05:00
Carlos Ruiz e78e038164 Prepare folder for migration scripts starting with version 1.0 i1.0a-release 2012-10-31 19:14:47 -05:00
Carlos Ruiz a198c32c59 Remove obsolete duplicate files 2012-10-31 19:11:02 -05:00
Carlos Ruiz d89bc0d4d0 Preparing release 2012-10-31 15:56:29 -05:00
Carlos Ruiz ae74c7e714 Pre-release work 2012-10-31 15:09:02 -05:00
Deepak Pansheriya 75b4c86421 PFA patch for fixes related to ticket IDEMPIERE-265 zk - Save/etrieve search problems 2012-10-31 11:30:32 -05:00
Elaine Tan 3b347d70cd IDEMPIERE-357 Ticket #1001002 Move the Menu to be a Portlet - clean up old user preference data and hide user/contact and role fields from dashboard content edit window 2012-10-31 14:34:48 +08:00
Carlos Ruiz 8c58fc91e7 IDEMPIERE-379 Reporting wizard for end users / Fix problem with second panel on chrome - fix migration scripts registration 2012-10-30 23:16:50 -05:00
Carlos Ruiz 3a8d5ce4fe IDEMPIERE-379 Reporting wizard for end users / Peer review and tests 2012-10-30 22:42:43 -05:00
Carlos Ruiz 66c3d210df IDEMPIERE-454 Easy import / Fix migration script, wrong ID 2012-10-30 21:34:08 -05:00
Juliana Corredor a0324420be IDEMPIERE-379 Reporting wizard for end users 2012-10-30 21:23:46 -05:00
Carlos Ruiz a8a3be8b96 IDEMPIERE-234 Configurable Toolbar / fix oracle script 2012-10-30 21:19:34 -05:00
Heng Sin Low 5a9ca8fac3 Merge with 15aebb85c791866dcec0bdd70dc75a728e703cbb 2012-10-28 13:22:27 +08:00
Heng Sin Low 6a71e527ab iDempiere IDEMPIERE-234 Configurable Toolbar.
- Expose AD_Window_UU, AD_Tab_UU, AD_Table_UU and IsSortTab as part of the _TabInfo. This allow display logic of button to target specific tab or table that is not using official id.
2012-10-28 12:13:27 +08:00
Heng Sin Low 85df60640e Merge with ab6c4c5381e1acfbb968b4d0352aa141cbd71760 2012-10-28 00:33:14 +08:00
Heng Sin Low 3c4c00a409 iDempiere IDEMPIERE-234 Configurable Toolbar.
- Bug fixes for report viewer button control.
- Added window toolbar button.
- Added custom window button using osgi service.
- Refactor ExportAction as an custom window button service example.
2012-10-28 00:31:25 +08:00
Carlos Ruiz 494c20a6b5 hg merge ab6c4c5381e1 2012-10-26 10:19:39 -05:00
Carlos Ruiz 066f24162e IDEMPIERE-454 Easy import / v1 -> Exporter - export data from 1 tab / Importer - allow insert in 1 tab 2012-10-26 00:03:39 -05:00
Deepak Pansheriya 6794c0b410 IDEMPIERE-293 Adding User Name, Role Name, Client Name and Org Name to allow filtering 2012-10-26 00:30:22 +05:30
Carlos Ruiz 95622fc317 IDEMPIERE-197 Stabilize Fixed Assets / Required fixes for iDempiere 2012-10-24 22:30:01 -05:00
Carlos Ruiz c6f25f2a6d IDEMPIERE-197 Stabilize Fixed Assets / Bring migration script and generate model classes 2012-10-24 21:30:00 -05:00
David Peñuela 02c508d425 IDEMPIERE-446 Implement Restrictions on Toolbar to the report viewer 2012-10-23 18:40:04 -05:00
David Peñuela 7b7f63f405 IDEMPIERE-158 Make selection of login languages more flexible 2012-10-23 17:32:04 -05:00
Juliana Corredor 1461cf652e IDEMPIERE-366 Improve Role Inheritance / restrict use of master roles 2012-10-23 16:48:50 -05:00
Carlos Ruiz 822c42c89a IDEMPIERE-293 List of logged users / Fix error on script 935_IDEMPIERE-293.sql 2012-10-23 14:53:52 -05:00
Carlos Ruiz 1734f84893 IDEMPIERE-466 AD_Client.RequestUserPW too short 2012-10-23 14:05:08 -05:00
Carlos Ruiz b5252784db IDEMPIERE-293 List of active session / fixes on migration script 2012-10-19 15:30:37 -05:00
Heng Sin Low 6d7d975d22 Merge with fdeadc94d67201e8d02f497dfc34d054fd224c6b 2012-10-19 20:46:09 +08:00
Heng Sin Low 44d6da7dd8 iDempiere IDEMPIERE-234 Configure Toolbar.
- Added AD_Column.IsToolbarButton to support  column button as part of toolbar instead of as field.
- Added API to support dialog implementation of AD_Form.
2012-10-19 20:44:11 +08:00
Deepak Pansheriya 61b327991a IDEMPIERE-293 : Adding AD_User_ID and making window to show session from all org. 2012-10-19 15:18:31 +05:30
Elaine Tan e1778c1501 IDEMPIERE-392 Redesign payment button 2012-10-19 16:35:15 +08:00
Deepak Pansheriya bb085c5546 IDEMPIERE-293 List of active session 2012-10-18 15:53:46 +05:30
Elaine Tan 34328a3591 IDEMPIERE-447 Abstract Payment Processor from Tenant configuration - allow multiple payment processors link to the same bank account 2012-10-17 17:39:12 +08:00
Deepak Pansheriya dbf854396a IDEMPIERE-389: Appending Host name and IP to server name and adding field
for server name on session audit
2012-10-16 13:08:12 +05:30
Deepak Pansheriya d77b007817 IDEMPIERE-389 - Adding server name into AD_Session table 2012-10-15 18:38:57 +05:30
Elaine Tan e280cbbd70 Ticket #1001503: Credit Cards Online 2012-10-15 17:00:07 +08:00
Carlos Ruiz 1d945a4109 hg merge a34c69915b7d 2012-10-10 11:22:37 -05:00
Elaine Tan 8000086ad4 IDEMPIERE-375 Implement Forgot my Password - improve the user-friendliness 2012-10-10 17:35:36 +08:00
Heng Sin Low 0bca8c738b IDEMPIERE-369 Master Detail layout improvements. Script to disable included tab field. 2012-10-10 07:54:44 +08:00
Carlos Ruiz bfb6c70256 IDEMPIERE-458 Invalid indirect foreign keys on GardenWorld 2012-10-09 14:23:10 -05:00
Carlos Ruiz 83a7f121c3 IDEMPIERE-388 Enable port and TLS configuration for email 2012-10-09 01:30:05 -05:00
Carlos Ruiz 595fda5ef4 IDEMPIERE-422 Complete Native Sequence feature / peer review and tests 2012-10-05 19:03:57 -05:00
Juan David Arboleda 7874f573e4 IDEMPIERE-422 Complete Native Sequence feature 2012-10-05 11:22:33 -05:00
Elaine Tan a5f5d8d972 IDEMPIERE-447 Abstract Payment Processor from Tenant configuration 2012-10-03 18:30:46 +08:00
Carlos Ruiz 110618d495 IDEMPIERE-391 Scheduler improvements / Peer review, tests, some refactoring 2012-10-02 23:16:41 -05:00
Juliana Corredor 993116f1ea IDEMPIERE-391 Scheduler improvements 2012-10-02 17:43:43 -05:00
Carlos Ruiz 1d5a201e7f IDEMPIERE-362 Hide things that don't work on iDempiere / Fix problem reported by Michael Hüttemann
http://red1.org/adempiere/viewtopic.php?f=31&t=1693&p=8084#p8084
2012-10-02 14:52:05 -05:00
Carlos Ruiz c7d1ef47e0 IDEMPIERE-207 GL Journal Generator / Fix ORA-00972: identifier is too long 2012-10-02 14:50:34 -05:00
Kirit Thummar 917fe37caa IDEMPIERE-370 Implement link from process ending message to next records 2012-10-02 11:48:33 -05:00
Carlos Ruiz 80d9c6bda3 Fix strange character on commit 80090351de1c - IDEMPIERE-373 2012-09-28 13:56:57 -05:00
Carlos Ruiz 0a76dbb1c4 hg merge 80090351de1c 2012-09-28 13:49:29 -05:00
Carlos Ruiz 671b042b27 IDEMPIERE-362 Hide things that don't work on iDempiere / Thanks to David Peñuela 2012-09-28 13:40:45 -05:00
Carlos Ruiz 19342a042e IDEMPIERE-366 Improve Role Inheritance / Thanks to Juliana Corredor 2012-09-27 12:20:39 -05:00
Elaine Tan cb910d298d IDEMPIERE-373 Implement User Locking - fix login error message 2012-09-27 15:22:39 +08:00
Carlos Ruiz 1ab3ea6f00 IDEMPIERE-207 GL Journal Generator 2012-09-24 15:44:28 -05:00
Carlos Ruiz 0c0e46fc20 IDEMPIERE-366 Improve Role Inheritance / Fix wrong migration script 2012-09-21 20:18:25 -05:00
Carlos Ruiz ec69327826 IDEMPIERE-362 Hide things that don't work on iDempiere / Dictionary work / Thanks to David Peñuela 2012-09-21 19:35:02 -05:00
Carlos Ruiz 7e3a7baa71 hg merge d7a60c56c795 / solving conflict on AbstractMenuPanel 2012-09-19 12:35:01 -05:00
Elaine Tan 527ab89cfe IDEMPIERE-374 Change password must be changed to be a form instead of a process 2012-09-19 11:23:16 +08:00
Juliana Corredor 340acefdf6 IDEMPIERE-366 Improve Role Inheritance / Fix problem with validation rules 2012-09-17 21:01:42 -05:00
Carlos Ruiz 92f9a9f47c hg merge 71b0bba695a6 / Solving the conflict for AbstractADWindowPanel.java 2012-09-13 14:56:32 -05:00
Elaine Tan 951765ccd0 IDEMPIERE-375 Implement Forgot my Password - add validation to check new password differ from old password and change the security question design 2012-09-13 16:29:23 +08:00
Juliana Corredor 7f85ffeaf8 IDEMPIERE-366 Improve Role Inheritance 2012-09-12 19:23:38 -05:00
David Peñuela ca61e6d5ad IDEMPIERE-403 zk login can read messages from database instead of resource file 2012-09-11 17:40:53 -05:00
Carlos Ruiz 42eb30488f IDEMPIERE-375 Implement Forgot my Password 2012-09-11 17:05:42 -05:00
Carlos Ruiz a5dc636526 hg merge 6c7533fd2bc8 2012-09-11 09:46:50 -05:00
Elaine Tan 6c787d4654 IDEMPIERE-375 Implement Forgot my Password 2012-09-11 19:33:10 +08:00
Carlos Ruiz df52b82c37 hg merge 493f67289f4d 2012-09-10 15:04:30 -05:00
Elaine Tan ab31be0c56 IDEMPIERE-270 Reports should inherit search filter from window 2012-09-10 11:30:17 +08:00
Carlos Ruiz 368ce19b6e IDEMPIERE-332 Document sequence organization level and restart monthly / Thanks to Nicolas Micoud 2012-09-07 16:56:44 -05:00
Carlos Ruiz 0329963b14 IDEMPIERE-387 Enable mixed payments on POS Sales Order 2012-09-07 00:14:21 -05:00
Carlos Ruiz 9735670208 IDEMPIERE-221 Implement password policies / make password policy system wide configurable instead of tenant 2012-09-06 15:20:49 -05:00
Carlos Ruiz c6c4c65120 IDEMPIERE-377 Improve current search dialog box / create the messages - fix the call to query 2012-09-05 18:55:06 -05:00
Carlos Ruiz 7ba2400a73 IDEMPIERE-373 Implement User Locking / minor fix on migration script 2012-09-05 08:09:55 -05:00
Heng Sin Low 44b1b277a7 Merge with 626f88fda0dd1ee86a114a49a4fea4f04f90a09e 2012-09-05 20:20:19 +08:00
Elaine Tan 65d8b478f3 IDEMPIERE-373 Implement User Locking - fix the default date password change and use translatable message 2012-09-05 14:48:14 +08:00
Carlos Ruiz 14085d6218 IDEMPIERE-420 Improve the way to register migration scripts applied 2012-09-04 15:19:45 -05:00
Carlos Ruiz 482903959c IDEMPIERE-373 Implement User Locking / Set fields according to IDEMPIERE-368 2012-09-04 11:50:52 -05:00
Elaine Tan 078684b68d IDEMPIERE-373 Implement User Locking 2012-09-04 11:11:01 +08:00
Carlos Ruiz 7c9ffc152f IDEMPIERE-368 Improve Form Layout to allow more columns and positioning / Thanks to Juliana Corredor 2012-08-31 19:26:46 -05:00
Carlos Ruiz e3ae21da2b IDEMPIERE-63 Document number is updated again when document completed after reactivation 2012-08-29 19:33:18 -05:00
Carlos Ruiz bc047d7eb4 IDEMPIERE-377 Improve current search dialog box / Peer review and tests 2012-08-29 13:00:57 -05:00
Kirit Thummar 27696117cb IDEMPIERE-377 Improve current search dialog box / Remove history button from toolbar and implement the same options into search box 2012-08-29 12:59:41 -05:00
Carlos Ruiz cf2bc53017 IDEMPIERE-29 Improvement on full location / Thanks to Yansolo for the idea and the swing implementation / extended for zkwebui 2012-08-29 09:58:47 -05:00
Carlos Ruiz 0b98614113 IDEMPIERE-246 Integrate Manufacturing Light / peer review with tests following Adaxa Manual - lots of fixes 2012-08-27 18:21:27 -05:00
Carlos Ruiz d1ca3a4c50 IDEMPIERE-246 - m_product_bom already had the patioset configured 2012-08-24 10:24:37 -05:00
Carlos Ruiz 5cd19d949b Merge from trekglobal repository 2012-08-23 08:38:25 -05:00
Juliana Corredor f8141fe4aa IDEMPIERE-363 ASP / SaaS module - implement reference lists show/hide option 2012-08-22 23:24:10 -05:00
Heng Sin Low 1123aec6d1 Merge with 8a571dacb86e47e42584969a5958b504c7616469 2012-08-23 12:18:04 +08:00
Carlos Ruiz 2678306349 IDEMPIERE-393 Setup wizards 2012-08-22 22:56:07 -05:00
Carlos Ruiz ea3399cca5 IDEMPIERE-246 Integrate Manufacturing Light / fix migration script 2012-08-22 22:55:42 -05:00
Carlos Ruiz 56fff1e1b8 IDEMPIERE-217 Allocate Payment to Charge
Credits:
Adaxa (Paul Bowden) / development
David Peñuela / integration
Edwin Ang / testings
2012-08-22 22:27:33 -05:00
Carlos Ruiz 85b4deb4db IDEMPIERE-357 Ticket #1001002 Move the Menu to be a Portlet / Fix wrong message "Google Calendar" as reported by Nicolas Micoud 2012-08-22 21:48:26 -05:00
Carlos Ruiz d1b2ac2012 IDEMPIERE-377 Improve current search dialog box 2012-08-22 20:31:24 -05:00
Carlos Ruiz 4802d9d6b1 IDEMPIERE-370 Implement link from process ending message to next records 2012-08-22 20:31:07 -05:00
Deepak Pansheriya 01c8bbc3de Merging two heads 2012-08-22 23:30:39 +05:30
Elaine Tan e03942ee8f Ticket #1001002: Move the Menu to be a Portlet - Add a new table to store user dashboard preference and fix some bugs 2012-08-22 19:34:57 +08:00
Heng Sin Low 724515c9c2 Merge with 9588c6ccc43c675f7b186512072c248daa1a6f57 2012-08-22 18:41:04 +08:00
Rajesh.Rajesh-VAIO 1b9067d23f Task 1001118 - Link end-of-process to next window 2012-08-22 13:47:50 +05:30
Kirit Thummar d5ef3c327a IDEMPIERE-377 : Add search sequence support for search dialog field[1001253] 2012-08-22 11:01:07 +05:30
Carlos Ruiz 4ceda4ce93 IDEMPIERE-246 Integrate Manufacturing Light 2012-08-21 18:53:37 -05:00
Carlos Ruiz aa062ec80c IDEMPIERE-246 Integrate Manufacturing Light 2012-08-21 17:26:37 -05:00
Dirk Niemeyer ba06c7d31b Bring in Manufacturing Light code from Adaxa / Paul Bowden
Disable Libero Mfg menu entries
2012-08-21 12:51:08 +02:00
Dirk Niemeyer b3a379eca4 Bring in Manufacturing Light code from Adaxa / Paul Bowden
Add buttons as described in Adaxa paper sect. "2.14 Additional functions"
2012-08-21 12:50:05 +02:00
Dirk Niemeyer 0ee0a2e2ef Bring in Manufacturing Light code from Adaxa / Paul Bowden
More corrections
2012-08-21 12:47:47 +02:00
Heng Sin Low 98d4cd4a89 Merge with aea1818c6420a4382d08866a41fd96dc9ccb0f5c 2012-08-21 08:49:30 +08:00