merci 6.x-2.0-beta3

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

• needs more work, but .install was trying create fields in the enable and add_cost_fields_and_group_taxonomy() function called in merci_update_5().
• fixed #648786, #463906 as well as made some impovements to MERCI UI
• Fixed issue #807824. Also cleaned up autocheckin and autocheckout code in merci_cron function which doesn't work yet but gets us closer.
• Fixed issue #806134. Also increased DB schema for the sake of standarizing the schema number.
• Fixed issue #807972.
• applied darrick's fix for #808092
• altered merci_get_available_bucket_count to work for merci_conflict_grid function
• fixed #809154
• added links to availability grid to conflicting placeholder nodes
• Fixed minor validation bug for conflicts with reservations have the same date/time.
• Fixed issue #810092
• Fixed current inventory page.
• Fixes for issue #811490
• Fixed issue where group taxonomy wasn't removed during module uninstall.
• Cleaned up install.
• Removed openmedia menu paths as those should be implemented is seperate module via hook_menu and hook_menu_alter.
• Fixed coding style which was simple regexp replacement in vim.
• Ran code cleanup script.
• Last of coding style fixes.
• Fixed issue #815472
• Fixed location for content_database_info for field_merci_date
• changed administrate MERCI to administer or manage MERCI
• Changed message for Reservations made outside of hours of operation to only appear when the reservation is actually being made outside of the hours of operation
• Reverted a change darrick made to merci_get_reservable_items to fix issue with Resources conflicting. Added merci_load_reservations_for_node_in_timespan to fix conflict grid display. Changed link in grid to Reservation instead of placeholder node. Removed permission so if Reservation nodes are published users can see who made a reservation that conflicts with theirs and possible work out a change on their own.
• fixed issues with printable contract. Includes leo's fix for the View-less merci_current_inventory
• Added if (user_access("administer MERCI") || user_access("manage MERCI")) { exception back to merci_check_content_type_restrictions. Without that, there is no way to make longer, commercial rentals
• expanded merci setting in admin form, fixed hours outside hours of operation check, tightened up conflict grid css
• reworked the admin menu structure so contract and permsisions show up as tabs in the main MERCI admin form. Moved the funcationality that moved MERCI under Open Media System into om_project
• Fixed issue #835274
• Added warning for site wide default timezone being set.