User: darrick Branch: DRUPAL-6--2 Date: Tue, 27 Jul 2010 21:57:47 +0000 Modified files: /modules/merci merci.module Log message: Fixed bug where a conflict occurred if a reservation in the past had an item still checked out, and the admin attempted to change the status of a future reservation for that item to "Canceled". Now, if the reservation status is changed to either "Checked in", "Canceled" or "No Show" the item conflict validation code is bypassed. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.module...