From 01fa7e080a8a36b86a9663eb0cfc92eca54fd0fa Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Mar 2011 17:03:53 +0000
Subject: [PATCH] Rename ID field to Resource ID to deal with Excel issue

---
 .../class.resources_wizard_export_csv.inc.php |  2 +-
 .../class.resources_wizard_import_csv.inc.php |  2 +-
 resources/lang/egw_en.lang                    |  1 +
 resources/setup/importexport_default.xml      | 33 +++++++++----------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/resources/inc/class.resources_wizard_export_csv.inc.php b/resources/inc/class.resources_wizard_export_csv.inc.php
index 33dc0c95f1..6f599e2c37 100644
--- a/resources/inc/class.resources_wizard_export_csv.inc.php
+++ b/resources/inc/class.resources_wizard_export_csv.inc.php
@@ -17,7 +17,7 @@ class resources_wizard_export_csv extends importexport_wizard_basic_export_csv
 
 		// Field mapping
 		$this->export_fields = array(
-			'res_id'	=> lang('ID'),
+			'res_id'	=> lang('Resource ID'),
 			'name'		=> lang('name'),
 			'short_description'	=> lang('short description'),
 			'cat_id'	=> lang('Category'),
diff --git a/resources/inc/class.resources_wizard_import_csv.inc.php b/resources/inc/class.resources_wizard_import_csv.inc.php
index 01a2f3d33a..e5c3cefb36 100644
--- a/resources/inc/class.resources_wizard_import_csv.inc.php
+++ b/resources/inc/class.resources_wizard_import_csv.inc.php
@@ -27,7 +27,7 @@ class resources_wizard_import_csv extends importexport_wizard_basic_import_csv
 		// Field mapping
 		$export = new resources_wizard_export_csv();
 		$this->mapping_fields = array(
-                        'res_id'        => lang('ID'),
+                        'res_id'        => lang('Resource ID'),
                         'name'          => lang('name'),
                         'short_description'     => lang('short description'),
                         'cat_id'        => lang('Category'),
diff --git a/resources/lang/egw_en.lang b/resources/lang/egw_en.lang
index b1e5166230..ab9d906a34 100644
--- a/resources/lang/egw_en.lang
+++ b/resources/lang/egw_en.lang
@@ -69,6 +69,7 @@ quantity:	resources	en	Quantity:
 read calendar permissions	resources	en	Read Calendar permissions
 read permissions	resources	en	Read permissions
 related links	resources	en	Related links
+resource id	resources	en	Resource ID
 resources	common	en	Resources
 resources list	resources	en	Resources list
 responsible:	resources	en	Responsible:
diff --git a/resources/setup/importexport_default.xml b/resources/setup/importexport_default.xml
index c385f1d6f8..7ed15a81b4 100644
--- a/resources/setup/importexport_default.xml
+++ b/resources/setup/importexport_default.xml
@@ -16,7 +16,7 @@
       </entry>
       <entry type="array" name="plugin_options">
         <entry type="array" name="mapping">
-          <entry type="string" name="res_id">ID</entry>
+          <entry type="string" name="res_id">Resource ID</entry>
           <entry type="string" name="name">Name</entry>
           <entry type="string" name="short_description">Short description</entry>
           <entry type="string" name="cat_id">Category</entry>
@@ -35,7 +35,7 @@
         <entry type="string" name="begin_with_fieldnames">label</entry>
         <entry type="string" name="convert">1</entry>
       </entry>
-      <entry type="string" name="modified">2011-03-02 10:17:41</entry>
+      <entry type="string" name="modified">2011-03-28 10:59:50</entry>
     </entry>
     <entry type="array" name="import-resources">
       <entry type="string" name="name">import-resources</entry>
@@ -51,20 +51,19 @@
         <entry type="string" name="num_header_lines">1</entry>
         <entry type="string" name="update_cats">add</entry>
         <entry type="array" name="csv_fields">
-          <entry type="string" name="0">name</entry>
-          <entry type="string" name="1">short_description</entry>
-          <entry type="string" name="2">cat_id</entry>
-          <entry type="string" name="3">quantity</entry>
-          <entry type="string" name="4">useable</entry>
-          <entry type="string" name="5">location</entry>
-          <entry type="string" name="6">bookable</entry>
-          <entry type="string" name="7">buyable</entry>
-          <entry type="string" name="8">prize</entry>
-          <entry type="string" name="9">long_description</entry>
-          <entry type="string" name="10">inventory_number</entry>
-          <entry type="string" name="11">no_csv_1</entry>
-          <entry type="string" name="12">no_csv_2</entry>
-          <entry type="string" name="13">no_csv_3</entry>
+          <entry type="string" name="0">Resource ID</entry>
+          <entry type="string" name="1">Name</entry>
+          <entry type="string" name="2">Short description</entry>
+          <entry type="string" name="3">Category</entry>
+          <entry type="string" name="4">Quantity</entry>
+          <entry type="string" name="5">useable</entry>
+          <entry type="string" name="6">Location</entry>
+          <entry type="string" name="7">Bookable</entry>
+          <entry type="string" name="8">Buyable</entry>
+          <entry type="string" name="9">Prize</entry>
+          <entry type="string" name="10">Long description</entry>
+          <entry type="string" name="11">Inventory number</entry>
+          <entry type="string" name="12">Test CF</entry>
         </entry>
         <entry type="array" name="field_mapping">
           <entry type="string" name="0">res_id</entry>
@@ -96,7 +95,7 @@
           </entry>
         </entry>
       </entry>
-      <entry type="string" name="modified">2011-03-02 10:16:33</entry>
+      <entry type="string" name="modified">2011-03-28 11:02:19</entry>
     </entry>
   </entry>
 </entry>