#1070686 Expanded the Accessories select list on the edit form when the reservation is in a checked out state.  Assuming the user is checking the items back in.  Instead of the reverse workflow, implementations that where using that to record that all accessories were returned with the items can add a checkbox for staff to confirm all accessories where returned

added edit check for $edit_page on code that disabled form elements since the viewing the node is no longer a form

added merci_ui_type_reservations to replace functionality lost in transition to merci_ui_node_reservations

Made date a popup, move link to make reservation to module... no longer php in footer, removed Reservation/My Reservation menus, replaced node reservation with View

removed links to manage fields with merci_inventory from core merci, added admin settings tab for syncronizing fields from merci_inventory_master to merci_inventory.module

Removed empty reservation table rows when viewing reservations.

Issue #1055572 by thepulsingeye: Fixed the issue where editing the content type for a reservable item with no MERCI Equipment Grouping set made that item disappear from the reservaable item list.

Fixed some issues with the ahah callbacks.  Still trying to figure how best to disable validation.  Problem is the date_combo object form structure is set by it's validation function.  If you don't validate it then the form struct is in a state where the date values are unusable for filtering.

handler.

not sure if there is an update hook order issue, but the schema creates the merci_reservation_item_node table with the merci_default_availability and merci_sub_type columns. merci_update_6209 alters the column names, but merci_update_6207 call them before that so it fails

Added merci_staff.install file to set the module weight.

Added merci views argument handler to validate for merci types and sub
types.

Fixed issues with the checkout count.

Fixed some really bad errors in the code handling conflicts.
Fixed the add reservations function.

showing up as per issue #1072606
Disable validation error for date_combo during ahah calls.

Added alert as a database for admins to check the permissions.  Better then changing it for them as they should know what they are doing.

Moved form['existing_items'] to from['merci_reservation_items'].
Moved form['choices'] to form['merci_reservation_items'].
Removed drupal_access_denied() from the validation functions for deleting types and items.  Changed to just removing the Delete submit on the confirm buttons.
The choice select box is now part of the reservation_table_form instead of seperated out.
Got rid of merci/datefilter menu callback as merci/js callback is exactly the same.
Removed mercistaff/js and mercistaff/datefilter as the merci/js callback does the same.
Added merci_ahah_get_form to help with the ahah callback functions.
Since the form fields now match the node fields all the ahah callbacks are done properly as in they rebuild and cache the entire form and then return the requested element for rendering.
Changed permission for merci_staff from adminster MERCI or manage MERCI to just manage reservations.
Added regression test for issue #1070662. Also fixed the issue.
Added regression test for issue #1070658. Also fixed the issue.

changed permission name from 'manage MERCI'  to manage reservations... still need to add update hook

check for merci_invenotry_view instead of module_exists.  unlinked title when view didn't exist instead of linking to itself which was confusing