merci 6.x-2.0-rc1

Release notes

Changes since 6.x-2.0-beta11:

• Fixed notices in views handlers.
• Removed fieldgroup from module dependencies.
• Updated tests.
• Got rid of most php notices. Fixed tests. Back ported D7 merci_validate_merci_selected_items.
• Fixed breadcrumbs for merci_reservable_items.
• Small update to remove a variable not defined notice.
• Fix typos in merci_cron.
• Fixed some error notices for undefined variables.
• Fix issue where merci_type_setting was not being set to disabled on the node_type_form.
• Fixed Issue#1295962: Reservation status is set to "checked in" after being checked out for a few hours Added test case for the above issue.
• #1199048: Fix Endless loop if closing time > 23:00 when conflict grid is displayed.
• #1287572: added label "No Show" for MERCI_STATUS_NO_SHOW status.
• Fixed warning notice for call by reference to theme_merci_type_setting.
• Fix issue #1141390: last fix was for buckets. This one is for resources.
• Added reference for variables in merci_preprocess_merci_printable_contract
• #1141390: Mismatch error for selecting more bucket items then available in current_inventory.
• More stringent validation for closed days textfield.
• Added validation for date elements on the merci settings page.
• Isuue #1141390: Changed wording on error when attempting to reserve more items then are available in the current inventory.
• Add merci_type_setting_type and merci_grouping_type variables upon enabling merci module.
• Fixed issue #1134370 by clemens.tolboom: merci_db_reservations_by_status_in_timespan had a typo for the date time column names which caused merci_cron to throw errors.
• Fixed issue #1133782 by johnthatcherjr. Reverted merci_staff after_build function to merci_staff_form_alter.
• Fixed Fatal error: Only variables can be passed by reference in merci/includes/database.inc on line 69.
• Removed merci_staff.install module.
• Added preprocess function to merci_printable_contract module.
• Removed duplicate semi-colon typo.
• Moved calls to node_get_types('name', $value) to use $content_settings['type_name'] variable instead since it was already set.
• Moved code around.
• Applied coding format
• Moved functions around.
• Moved more functions to database.inc file.
• Moved grouping of choices from _merci_choice_form function to merci_build_reservable_items function.
• Cleaned up hook_cron function.
• Split up hook_nodeapi into seperate op functions.
• Fixed an error from last commit for double semi-colons.
• Moved more code around.
• Moved code around so D6 and D7 will share most of the files.
• Merge branch '6.x-2.x' of git.drupal.org:project/merci into 6.x-2.x
• Cosmetic changes from coder_upgrade.
• Removed translation function from schema descriptions.
• Removed merci_lock/unlock menu items.
• Changed the lock field option on the admin settings page to a checkbox.
• Cosmetic update from coder upgrade.
• Minor fixes for last commit of moving merci_current_inventory to theme function.
• Moved some functions around and did some abstraction.
• Applied coding standards.
• Fixed the simpletests. They all run and pass now.
• Removed merci_rro module.
• Fixed issue with auto_assign_bucket_item not working since the code was refactored.
• Hopefully fixed the ahah callback validation handler for good.
• Clear form errors on ahah submitted forms.
• Fixed issue where date_popup wasn't attaching to the merci_date_field after a merci_staff_update_name AHAH call.
• Fix php warnings for invalid call by reference.
• removed devel output
• Fixed issue #1112510 by kreynen: Users with minimal permissions can update Reservations in any state.
• Minor fix for to much late night copying and pasting.
• Added #merci_staff_validated key to form array so merci_staff will know which validation to override.
• #1013482 changed merci_debug to merci_verbose_logging, cleaned up admin settings, removed content type listing, and moved verbose and unlock options to advanced field group
• Merge remote branch 'origin/6.x-2.x' into 6.x-2.x
• Fixed issue #1075208 by cmseasy: Users can make a reservation without inventory item.
• Fixed issue #1062660 by mhamilton: 'MERCI: Reserved item nid' Filter not displaying correct options.
• Fix missing bracket and alias in merci_has_accessories function.
• Fixes for issue #816324.
• fix for #1049318 and #1055080
• Added more tests. Note the tests currently need a bit of cleanup so they can all be run at once. Currently you have to uncomment out the ones to run and double check to make sure the environment is correct.
• removed "my" from path
• another tweak to the user view, dropped title and added items
• fixed uid in view
• Fixed Issue #1103328 by @thepulsingeye: Buckets not optimizing.
• removed first user_access("manage reservations") so $node->uid == $user->uid is actually checked. Not sure these checks are nested this way, but users should have the option of removing items from their reservation until they are either confirmed or checked out, depending on the permissions.
• Fix issue #1013516. Handle conflicts due to late returns in conflict_grid properly.