extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 09:42:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix usable vs useable. Both are right, but seems useable is more frequent in code.

Browse Source
This commit is contained in:
Nathan Gray 2012-12-18 16:35:24 +00:00
parent 872fe5918e
commit 1c4f15078d
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/inc/class.resources_bo.inc.php
View File

@ -600,7 +600,7 @@ class resources_bo
if (!isset($res_info_cache[$resource_id]['useable'])) { if (!isset($res_info_cache[$resource_id]['useable'])) {
$res_info_cache[$resource_id]['useable'] = 1; $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 // TODO : decrement with real event quantity, not 1
// but this quantity is not given by calendar search, we should re-use a cal object // 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 // to load specific cal infos, like quantity... lot of requests

1
resources/inc/class.resources_export_csv.inc.php
View File

@ -37,6 +37,7 @@ class resources_export_csv implements importexport_iface_export_plugin {
elseif ( $options['selection'] == 'all' ) { elseif ( $options['selection'] == 'all' ) {
$query = array( $query = array(
'num_rows' => -1, '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 'csv_export' => true, // so get_rows method _can_ produce different content or not store state in the session
); // all ); // all
$bo->get_rows($query,$selection,$readonlys); $bo->get_rows($query,$selection,$readonlys);

8
resources/setup/importexport_default.xml
View File

@ -21,7 +21,7 @@
<entry type="string" name="short_description">Short description</entry> <entry type="string" name="short_description">Short description</entry>
<entry type="string" name="cat_id">Category</entry> <entry type="string" name="cat_id">Category</entry>
<entry type="string" name="quantity">Quantity</entry> <entry type="string" name="quantity">Quantity</entry>
<entry type="string" name="useable">Usable</entry> <entry type="string" name="useable">Useable</entry>
<entry type="string" name="location">Location</entry> <entry type="string" name="location">Location</entry>
<entry type="string" name="storage_info">Storage</entry> <entry type="string" name="storage_info">Storage</entry>
<entry type="string" name="bookable">Bookable</entry> <entry type="string" name="bookable">Bookable</entry>
@ -37,7 +37,7 @@
<entry type="string" name="begin_with_fieldnames">label</entry> <entry type="string" name="begin_with_fieldnames">label</entry>
<entry type="string" name="convert">1</entry> <entry type="string" name="convert">1</entry>
</entry> </entry>
<entry type="string" name="modified">2012-12-17 11:56:59</entry> <entry type="string" name="modified">2012-12-18 09:00:00</entry>
</entry> </entry>
<entry type="array" name="import-resources"> <entry type="array" name="import-resources">
<entry type="string" name="name">import-resources</entry> <entry type="string" name="name">import-resources</entry>
@ -58,7 +58,7 @@
<entry type="string" name="2">Short description</entry> <entry type="string" name="2">Short description</entry>
<entry type="string" name="3">Category</entry> <entry type="string" name="3">Category</entry>
<entry type="string" name="4">Quantity</entry> <entry type="string" name="4">Quantity</entry>
<entry type="string" name="5">Usable</entry> <entry type="string" name="5">Useable</entry>
<entry type="string" name="6">Location</entry> <entry type="string" name="6">Location</entry>
<entry type="string" name="7">Storage</entry> <entry type="string" name="7">Storage</entry>
<entry type="string" name="8">Bookable</entry> <entry type="string" name="8">Bookable</entry>
@ -101,7 +101,7 @@
</entry> </entry>
<entry type="string" name="convert">1</entry> <entry type="string" name="convert">1</entry>
</entry> </entry>
<entry type="string" name="modified">2012-12-17 11:58:15</entry> <entry type="string" name="modified">2012-12-18 09:00:00</entry>
</entry> </entry>
</entry> </entry>
</entry> </entry>