diff --git a/resources/inc/class.resources_bo.inc.php b/resources/inc/class.resources_bo.inc.php index 4fe6266ce4..851418b983 100755 --- a/resources/inc/class.resources_bo.inc.php +++ b/resources/inc/class.resources_bo.inc.php @@ -600,7 +600,7 @@ class resources_bo if (!isset($res_info_cache[$resource_id]['useable'])) { $res_info_cache[$resource_id]['useable'] = 1; } - // now decrement this quantity usable + // now decrement this quantity useable // TODO : decrement with real event quantity, not 1 // but this quantity is not given by calendar search, we should re-use a cal object // to load specific cal infos, like quantity... lot of requests diff --git a/resources/inc/class.resources_export_csv.inc.php b/resources/inc/class.resources_export_csv.inc.php index 6d9d9c6b19..bf8955571e 100644 --- a/resources/inc/class.resources_export_csv.inc.php +++ b/resources/inc/class.resources_export_csv.inc.php @@ -37,6 +37,7 @@ class resources_export_csv implements importexport_iface_export_plugin { elseif ( $options['selection'] == 'all' ) { $query = array( 'num_rows' => -1, + 'filter2' => -3, // Accessories & resources 'csv_export' => true, // so get_rows method _can_ produce different content or not store state in the session ); // all $bo->get_rows($query,$selection,$readonlys); diff --git a/resources/setup/importexport_default.xml b/resources/setup/importexport_default.xml index 13ce0e90ba..3861734fcf 100644 --- a/resources/setup/importexport_default.xml +++ b/resources/setup/importexport_default.xml @@ -21,7 +21,7 @@ Short description Category Quantity - Usable + Useable Location Storage Bookable @@ -37,7 +37,7 @@ label 1 - 2012-12-17 11:56:59 + 2012-12-18 09:00:00 import-resources @@ -58,7 +58,7 @@ Short description Category Quantity - Usable + Useable Location Storage Bookable @@ -101,7 +101,7 @@ 1 - 2012-12-17 11:58:15 + 2012-12-18 09:00:00