merci 6.x-2.0-beta10

Changes since DRUPAL-6--2-0-BETA9:

• added overide option to merci_staff
• code cleanup to keep coder happy
• added more structure to custom validation hook
• Fixed issue #1006450
• Fixed issue #1007014
• Fixed issue #1007024
• Added $items to theme function
• reverting change, Darrick had already added $items to the end of the function
• Added fieldgroup_update_fields to install function.
• Fix issues #1007030 and #998262
• fixed #1008104
• Fixed issue #1008248
• Added ajax handler for updating choices and groups when user is changed.
• Added ajax handler for "Limit list to available items" button.
• Fixed issue #1010868
• Fixed issue #1010814
• Alter group list on form load based on node author.
• Fixed issue with node author not filtering item list on loading an existing node.
  Fixed issue with ajax update in merci_staff toasting merci_choices_js ajax call.
• Fixed issue with merci_date_filter_js ajax call breaking merci_choices_js ajax call.
• Fixed timezone issue with reservation dates for the ajax calls.
• Removed dpm debugging.
• Fixed issue when selected user only was in one group for merci_staff ajax call.
• Don't show resouce name in item list if no reservable resources of that type.
• added view all reservations permission to address #1011030
• Refactored hook_form_alter and hook_nodeapi as form generation and defaults were happening all over the place.
• Moved admin functions to includes/merci.admin.inc
• Moved all the module hook functions to the top to help clean up the code.
• Fix date field not showing up.
• Split up merci_node_validate into seperate functions to make more readable.
• Fix array being passed to check_plain in merci_user_load function.
• Updated language about email receipt and confirmation link... added check so link isn't added to Reservations made as Confirmed.
• Minor bug fixes.
• Removed create merci_reservation content permission.
• Added more tests.
• More test functions.
  Changed wording for error on reseravation time before or after hours of operation.
• Refactored the settings so they can be overridden by a hook.
• Fixed issues with item settings in sub modules.
• Removed errant dpm
• Fixed bug for conflicts with two resources of the same type.
• Fixed incorrectly passed values to merci_user_load.
• Moved menu callbacks to include/menu.inc.
  Moved theme functions to theme/theme.inc.
  Themed merci_conflict_grid function.
• Fixed a link to reservations which are overdue.
• Fixed issue with conflicts for canceled reservations containing unassigned bucket items.
  Fixed issue with the number of bucket items shown in the conflict grid.
• Fixed issue #1034372.
• Fix for #1038378.
• Added view merci_reservable_items which shows resevable items optionally filtered by Checked Out status or Default booking availability. For use with admin/merci/manage/current_inventory page.
• Started the process of moving the admin/merci/manage/current_inventory to a theme function.
• Modified admin/merci/manage/current_inventory to link to the new merci_reservable_items.
• Added operations to admin/merci/manage/current_inventory to add new items, add new merci types or edit type.
• Removed views handlers for Default booking availability -- resource, Default booking availability -- bucket, Sub type -- bucket and Sub type -- resource. Migrate these to the handler noted below.
• Added views handlers for Default booking availability and Sub type. So same handler field/filter for either bucket or resource items.
• Added relationship for getting the reservation nid for a given item_nid (Reservation nid (for item nid)).
• Removed INNER JOIN designation for the views handlers.