From cc975d4c0d467191ace27a25f5a848692c2f0b83 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 10 Oct 2012 19:09:57 +0000
Subject: [PATCH] Update default definitions to include storage info, expect
 column Usable

---
 resources/setup/importexport_default.xml | 54 ++++++++++++------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/resources/setup/importexport_default.xml b/resources/setup/importexport_default.xml
index b714321bc3..b500605f12 100644
--- a/resources/setup/importexport_default.xml
+++ b/resources/setup/importexport_default.xml
@@ -18,16 +18,17 @@
         <entry type="array" name="mapping">
           <entry type="string" name="res_id">Resource ID</entry>
           <entry type="string" name="name">Name</entry>
+          <entry type="string" name="inventory_number">Inventory number</entry>
           <entry type="string" name="short_description">Short description</entry>
+          <entry type="string" name="long_description">Long description</entry>
           <entry type="string" name="cat_id">Category</entry>
           <entry type="string" name="quantity">Quantity</entry>
-          <entry type="string" name="useable">useable</entry>
+          <entry type="string" name="useable">Usable</entry>
           <entry type="string" name="location">Location</entry>
+          <entry type="string" name="storage_info">Storage</entry>
           <entry type="string" name="bookable">Bookable</entry>
           <entry type="string" name="buyable">Buyable</entry>
           <entry type="string" name="prize">Prize</entry>
-          <entry type="string" name="long_description">Long description</entry>
-          <entry type="string" name="inventory_number">Inventory number</entry>
           <entry type="string" name="all_custom_fields">resources</entry>
         </entry>
         <entry type="string" name="delimiter">;</entry>
@@ -35,7 +36,7 @@
         <entry type="string" name="begin_with_fieldnames">label</entry>
         <entry type="string" name="convert">1</entry>
       </entry>
-      <entry type="string" name="modified">2011-05-24 10:12:46</entry>
+      <entry type="string" name="modified">2012-10-10 12:43:09</entry>
     </entry>
     <entry type="array" name="import-resources">
       <entry type="string" name="name">import-resources</entry>
@@ -53,31 +54,32 @@
         <entry type="array" name="csv_fields">
           <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 type="string" name="2">Inventory number</entry>
+          <entry type="string" name="3">Short description</entry>
+          <entry type="string" name="4">Long description</entry>
+          <entry type="string" name="5">Category</entry>
+          <entry type="string" name="6">Quantity</entry>
+          <entry type="string" name="7">Usable</entry>
+          <entry type="string" name="8">Location</entry>
+          <entry type="string" name="9">Storage</entry>
+          <entry type="string" name="10">Bookable</entry>
+          <entry type="string" name="11">Buyable</entry>
+          <entry type="string" name="12">Prize</entry>
         </entry>
         <entry type="array" name="field_mapping">
           <entry type="string" name="0">res_id</entry>
           <entry type="string" name="1">name</entry>
-          <entry type="string" name="2">short_description</entry>
-          <entry type="string" name="3">cat_id</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="2">inventory_number</entry>
+          <entry type="string" name="3">short_description</entry>
+          <entry type="string" name="4">long_description</entry>
+          <entry type="string" name="5">cat_id</entry>
+          <entry type="string" name="6">quantity</entry>
+          <entry type="string" name="7">useable</entry>
+          <entry type="string" name="8">location</entry>
+          <entry type="string" name="9">storage_info</entry>
+          <entry type="string" name="10">bookable</entry>
+          <entry type="string" name="11">buyable</entry>
+          <entry type="string" name="12">prize</entry>
         </entry>
         <entry type="string" name="field_conversion"/>
         <entry type="array" name="conditions">
@@ -96,7 +98,7 @@
         </entry>
         <entry type="string" name="convert">1</entry>
       </entry>
-      <entry type="string" name="modified">2012-10-09 11:00:00</entry>
+      <entry type="string" name="modified">2012-10-10 12:55:25</entry>
     </entry>
   </entry>
 </entry>