diff --git a/trunk/pages/testlist.inc.php b/trunk/pages/testlist.inc.php
index fcdb246cd..a0332e1f7 100644
--- a/trunk/pages/testlist.inc.php
+++ b/trunk/pages/testlist.inc.php
@@ -1118,7 +1118,7 @@ class TestItopWebServices extends TestWebServices
 			),
 			array(
 				'class' => 'bizIncidentTicket',
-				'csvdata' => "name;title;type;customer_id;initial_situation;start_date;next_update;caller_id;workgroup_id;agent_id\nOVSD-12345;server down;Network;1;server was found down;2009-04-10 12:00;2009-04-10 15:00;3;317;5"
+				'csvdata' => "name;title;type;org_id;initial_situation;start_date;next_update;caller_id;workgroup_id;agent_id\nOVSD-12345;server down;Network;1;server was found down;2009-04-10 12:00;2009-04-10 15:00;3;317;5"
 			),
 		);  
 
diff --git a/trunk/setup/data/03.persons.xml b/trunk/setup/data/03.persons.xml
index e19bb2f11..7cc42e9cc 100644
--- a/trunk/setup/data/03.persons.xml
+++ b/trunk/setup/data/03.persons.xml
@@ -2,7 +2,7 @@
 <Set>
 <bizPerson id="21">
 <name>Verne</name>
-<status>production</status>
+<status>available</status>
 <org_id>3</org_id>
 <email>jules.verne@gmail.com</email>
 <phone></phone>
@@ -12,7 +12,7 @@
 </bizPerson>
 <bizPerson id="20">
 <name>Dumas</name>
-<status>production</status>
+<status>available</status>
 <org_id>3</org_id>
 <email>alexandre.dumas@gmail.com</email>
 <phone></phone>
@@ -22,7 +22,7 @@
 </bizPerson>
 <bizPerson id="7">
 <name>Hugo</name>
-<status>production</status>
+<status>available</status>
 <org_id>3</org_id>
 <email>victor.hugo@gmail.com</email>
 <phone>33172382223</phone>
diff --git a/trunk/setup/data/11.incidents.xml b/trunk/setup/data/11.incidents.xml
index a448488d7..d0a78fe20 100644
--- a/trunk/setup/data/11.incidents.xml
+++ b/trunk/setup/data/11.incidents.xml
@@ -1,132 +1,132 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-<bizIncidentTicket id="1">
-<name>I-000001</name>
-<title>PC issue</title>
-<type>Desktop</type>
-<customer_id>3</customer_id>
-<ticket_status>WorkInProgress</ticket_status>
-<initial_situation>there is an issue with my PC</initial_situation>
-<current_situation></current_situation>
-<start_date>2009-02-10 21:30:55</start_date>
-<last_update></last_update>
-<next_update></next_update>
-<end_date></end_date>
-<caller_id>21</caller_id>
-<impact>not able to start IE</impact>
-<workgroup_id>19</workgroup_id>
-<agent_id>7</agent_id>
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<bizIncidentTicket id="1">
+<name>I-000001</name>
+<title>PC issue</title>
+<type>Desktop</type>
+<org_id>3</org_id>
+<ticket_status>WorkInProgress</ticket_status>
+<initial_situation>there is an issue with my PC</initial_situation>
+<current_situation></current_situation>
+<start_date>2009-02-10 21:30:55</start_date>
+<last_update></last_update>
+<next_update></next_update>
+<end_date></end_date>
+<caller_id>21</caller_id>
+<impact>not able to start IE</impact>
+<workgroup_id>19</workgroup_id>
+<agent_id>7</agent_id>
 <action_log>We are about to connect to your PC via Netmeeting and troubleshoot what&apos;s up.
 
-Then we will try to contact Microsoft to understand if it is a known issue</action_log>
-<severity>critical</severity>
-<assignment_count>1</assignment_count>
-<resolution></resolution>
-</bizIncidentTicket>
-<bizIncidentTicket id="2">
-<name>I-000002</name>
-<title>Network issue</title>
-<type>Network</type>
-<customer_id>3</customer_id>
-<ticket_status>Assigned</ticket_status>
-<initial_situation>No more access to the network</initial_situation>
-<current_situation>Network connectivity lost</current_situation>
-<start_date>2009-02-19 19:07:25</start_date>
-<last_update>0000-00-00 00:00:00</last_update>
-<next_update>0000-00-00 00:00:00</next_update>
-<end_date>0000-00-00 00:00:00</end_date>
-<caller_id>7</caller_id>
-<impact>high</impact>
-<workgroup_id>24</workgroup_id>
-<agent_id>21</agent_id>
-<action_log>need to investigate the network</action_log>
-<severity>low</severity>
-<assignment_count>2</assignment_count>
-<resolution></resolution>
-</bizIncidentTicket>
-<bizIncidentTicket id="3">
-<name>I-000003</name>
-<title>Disk Failure on Server01</title>
-<type>Server</type>
-<customer_id>3</customer_id>
-<ticket_status>WorkInProgress</ticket_status>
-<initial_situation>Partition /var is no more accessible.
-It seems that hard disk is broken</initial_situation>
-<current_situation>Filesystem is full</current_situation>
-<start_date>2009-03-21 08:27:46</start_date>
-<last_update>2009-02-10 22:25:00</last_update>
-<next_update>2009-02-10 00:25:00</next_update>
-<end_date>0000-00-00 00:00:00</end_date>
-<caller_id>20</caller_id>
-<impact>Really important for the business</impact>
-<workgroup_id>19</workgroup_id>
-<agent_id>7</agent_id>
-<action_log>There are lot of logs file to be trimed</action_log>
-<severity>medium</severity>
-<assignment_count>2</assignment_count>
-<resolution></resolution>
-</bizIncidentTicket>
-<bizIncidentTicket id="4">
-<name>I-000004</name>
-<title>Oracle Database down on domino</title>
-<type>Server</type>
-<customer_id>3</customer_id>
-<ticket_status>New</ticket_status>
-<initial_situation>Database Oracle is no more accessible on Server01</initial_situation>
-<current_situation>Customer cannot access Order web site.</current_situation>
-<start_date>2009-03-17 09:31:09</start_date>
-<last_update>0000-00-00 00:00:00</last_update>
-<next_update>0000-00-00 00:00:00</next_update>
-<end_date>0000-00-00 00:00:00</end_date>
-<caller_id>7</caller_id>
-<impact>Very critical</impact>
-<workgroup_id>19</workgroup_id>
-<agent_id>0</agent_id>
-<action_log></action_log>
-<severity>low</severity>
-<assignment_count>0</assignment_count>
-<resolution></resolution>
-</bizIncidentTicket>
-<bizIncidentTicket id="5">
-<name>I-000005</name>
-<title>Issue with my pc</title>
-<type>Desktop</type>
-<customer_id>3</customer_id>
-<ticket_status>Assigned</ticket_status>
-<initial_situation>My PC is locked</initial_situation>
-<current_situation>We have to analyze</current_situation>
-<start_date>2009-03-01 23:22:38</start_date>
-<last_update>0000-00-00 00:00:00</last_update>
-<next_update>0000-00-00 00:00:00</next_update>
-<end_date>0000-00-00 00:00:00</end_date>
-<caller_id>7</caller_id>
-<impact></impact>
-<workgroup_id>19</workgroup_id>
-<agent_id>20</agent_id>
-<action_log></action_log>
-<severity>medium</severity>
-<assignment_count>1</assignment_count>
-<resolution></resolution>
-</bizIncidentTicket>
-<bizIncidentTicket id="6">
-<name>I-000006</name>
-<title>Demo</title>
-<type>Server</type>
-<customer_id>3</customer_id>
-<ticket_status>New</ticket_status>
-<initial_situation>gdfgl</initial_situation>
-<current_situation></current_situation>
-<start_date>2009-03-18 22:00:00</start_date>
-<last_update>0000-00-00 00:00:00</last_update>
-<next_update>0000-00-00 00:00:00</next_update>
-<end_date>0000-00-00 00:00:00</end_date>
-<caller_id>20</caller_id>
-<impact>personne ne peut acceder au site de paris</impact>
-<workgroup_id>19</workgroup_id>
-<agent_id>0</agent_id>
-<action_log></action_log>
-<severity>low</severity>
-<assignment_count>0</assignment_count>
-<resolution></resolution>
-</bizIncidentTicket>
-</Set>
\ No newline at end of file
+Then we will try to contact Microsoft to understand if it is a known issue</action_log>
+<severity>critical</severity>
+<assignment_count>1</assignment_count>
+<resolution></resolution>
+</bizIncidentTicket>
+<bizIncidentTicket id="2">
+<name>I-000002</name>
+<title>Network issue</title>
+<type>Network</type>
+<org_id>3</org_id>
+<ticket_status>Assigned</ticket_status>
+<initial_situation>No more access to the network</initial_situation>
+<current_situation>Network connectivity lost</current_situation>
+<start_date>2009-02-19 19:07:25</start_date>
+<last_update>0000-00-00 00:00:00</last_update>
+<next_update>0000-00-00 00:00:00</next_update>
+<end_date>0000-00-00 00:00:00</end_date>
+<caller_id>7</caller_id>
+<impact>high</impact>
+<workgroup_id>24</workgroup_id>
+<agent_id>21</agent_id>
+<action_log>need to investigate the network</action_log>
+<severity>low</severity>
+<assignment_count>2</assignment_count>
+<resolution></resolution>
+</bizIncidentTicket>
+<bizIncidentTicket id="3">
+<name>I-000003</name>
+<title>Disk Failure on Server01</title>
+<type>Server</type>
+<org_id>3</org_id>
+<ticket_status>WorkInProgress</ticket_status>
+<initial_situation>Partition /var is no more accessible.
+It seems that hard disk is broken</initial_situation>
+<current_situation>Filesystem is full</current_situation>
+<start_date>2009-03-21 08:27:46</start_date>
+<last_update>2009-02-10 22:25:00</last_update>
+<next_update>2009-02-10 00:25:00</next_update>
+<end_date>0000-00-00 00:00:00</end_date>
+<caller_id>20</caller_id>
+<impact>Really important for the business</impact>
+<workgroup_id>19</workgroup_id>
+<agent_id>7</agent_id>
+<action_log>There are lot of logs file to be trimed</action_log>
+<severity>medium</severity>
+<assignment_count>2</assignment_count>
+<resolution></resolution>
+</bizIncidentTicket>
+<bizIncidentTicket id="4">
+<name>I-000004</name>
+<title>Oracle Database down on domino</title>
+<type>Server</type>
+<org_id>3</org_id>
+<ticket_status>New</ticket_status>
+<initial_situation>Database Oracle is no more accessible on Server01</initial_situation>
+<current_situation>Customer cannot access Order web site.</current_situation>
+<start_date>2009-03-17 09:31:09</start_date>
+<last_update>0000-00-00 00:00:00</last_update>
+<next_update>0000-00-00 00:00:00</next_update>
+<end_date>0000-00-00 00:00:00</end_date>
+<caller_id>7</caller_id>
+<impact>Very critical</impact>
+<workgroup_id>19</workgroup_id>
+<agent_id>0</agent_id>
+<action_log></action_log>
+<severity>low</severity>
+<assignment_count>0</assignment_count>
+<resolution></resolution>
+</bizIncidentTicket>
+<bizIncidentTicket id="5">
+<name>I-000005</name>
+<title>Issue with my pc</title>
+<type>Desktop</type>
+<org_id>3</org_id>
+<ticket_status>Assigned</ticket_status>
+<initial_situation>My PC is locked</initial_situation>
+<current_situation>We have to analyze</current_situation>
+<start_date>2009-03-01 23:22:38</start_date>
+<last_update>0000-00-00 00:00:00</last_update>
+<next_update>0000-00-00 00:00:00</next_update>
+<end_date>0000-00-00 00:00:00</end_date>
+<caller_id>7</caller_id>
+<impact></impact>
+<workgroup_id>19</workgroup_id>
+<agent_id>20</agent_id>
+<action_log></action_log>
+<severity>medium</severity>
+<assignment_count>1</assignment_count>
+<resolution></resolution>
+</bizIncidentTicket>
+<bizIncidentTicket id="6">
+<name>I-000006</name>
+<title>Demo</title>
+<type>Server</type>
+<org_id>3</org_id>
+<ticket_status>New</ticket_status>
+<initial_situation>gdfgl</initial_situation>
+<current_situation></current_situation>
+<start_date>2009-03-18 22:00:00</start_date>
+<last_update>0000-00-00 00:00:00</last_update>
+<next_update>0000-00-00 00:00:00</next_update>
+<end_date>0000-00-00 00:00:00</end_date>
+<caller_id>20</caller_id>
+<impact>personne ne peut acceder au site de paris</impact>
+<workgroup_id>19</workgroup_id>
+<agent_id>0</agent_id>
+<action_log></action_log>
+<severity>low</severity>
+<assignment_count>0</assignment_count>
+<resolution></resolution>
+</bizIncidentTicket>
+</Set>
diff --git a/trunk/setup/data/15.changetickets.xml b/trunk/setup/data/15.changetickets.xml
index bdbb71970..51b9695b0 100644
--- a/trunk/setup/data/15.changetickets.xml
+++ b/trunk/setup/data/15.changetickets.xml
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-<bizChangeTicket id="1">
-<name>CM-0000003</name>
-<title>1st change</title>
-<type>Routine</type>
-<domain>Desktop</domain>
-<reason>reason</reason>
-<requestor_id>20</requestor_id>
-<customer_id>3</customer_id>
-<ticket_status>PlannedScheduled</ticket_status>
-<creation_date>2009-02-19 21:35:47</creation_date>
-<last_update>2009-02-18 18:33:14</last_update>
-<start_date>0000-00-00 00:00:00</start_date>
-<end_date>0000-00-00 00:00:00</end_date>
-<close_date>0000-00-00 00:00:00</close_date>
-<impact>There is no impact</impact>
-<workgroup_id>19</workgroup_id>
-<agent_id>21</agent_id>
-<supervisorgroup_id>19</supervisorgroup_id>
-<supervisor_id>20</supervisor_id>
-<managergroup_id>19</managergroup_id>
-<manager_id>7</manager_id>
-<outage>No</outage>
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<bizChangeTicket id="1">
+<name>CM-0000003</name>
+<title>1st change</title>
+<type>Routine</type>
+<domain>Desktop</domain>
+<reason>reason</reason>
+<requestor_id>20</requestor_id>
+<org_id>3</org_id>
+<ticket_status>PlannedScheduled</ticket_status>
+<creation_date>2009-02-19 21:35:47</creation_date>
+<last_update>2009-02-18 18:33:14</last_update>
+<start_date>0000-00-00 00:00:00</start_date>
+<end_date>0000-00-00 00:00:00</end_date>
+<close_date>0000-00-00 00:00:00</close_date>
+<impact>There is no impact</impact>
+<workgroup_id>19</workgroup_id>
+<agent_id>21</agent_id>
+<supervisorgroup_id>19</supervisorgroup_id>
+<supervisor_id>20</supervisor_id>
+<managergroup_id>19</managergroup_id>
+<manager_id>7</manager_id>
+<outage>No</outage>
 <change_request>I would like to install SQL plus on my laptop.
-Could you make it please</change_request>
-<change_log>We will push via netmeeting the package and install it at 10:00 tomorrow</change_log>
-<fallback>If there is any issue we will uninstall it</fallback>
-<assignment_count>0</assignment_count>
-</bizChangeTicket>
-<bizChangeTicket id="2">
-<name>CM-0000004</name>
-<title>Oracle upgrade on domino</title>
-<type>Routine</type>
-<domain>Application</domain>
-<reason>Patch Installation for Oracle</reason>
-<requestor_id>21</requestor_id>
-<customer_id>3</customer_id>
-<ticket_status>Approved</ticket_status>
-<creation_date>2009-03-17 14:50:34</creation_date>
-<last_update>2009-03-17 14:50:34</last_update>
-<start_date>2009-02-24 00:00:00</start_date>
-<end_date>2009-02-24 02:00:00</end_date>
-<close_date>0000-00-00 00:00:00</close_date>
-<impact>application impacted</impact>
-<workgroup_id>19</workgroup_id>
-<agent_id>20</agent_id>
-<supervisorgroup_id>19</supervisorgroup_id>
-<supervisor_id>21</supervisor_id>
-<managergroup_id>19</managergroup_id>
-<manager_id>7</manager_id>
-<outage>Yes</outage>
-<change_request>We wan to install last Oracle Patch in order to fix rollback management issues</change_request>
-<change_log>We will install patch and reboot the server</change_log>
-<fallback>If not working we will remove this patch</fallback>
-<assignment_count>0</assignment_count>
-</bizChangeTicket>
-<bizChangeTicket id="3">
-<name>CM-0000005</name>
-<title>IOS upgrade</title>
-<type>Routine</type>
-<domain>Desktop</domain>
-<reason>security issue</reason>
-<requestor_id>21</requestor_id>
-<customer_id>3</customer_id>
-<ticket_status>New</ticket_status>
-<creation_date>2009-04-04 23:23:37</creation_date>
-<last_update>0000-00-00 00:00:00</last_update>
-<start_date>0000-00-00 00:00:00</start_date>
-<end_date>0000-00-00 00:00:00</end_date>
-<close_date>0000-00-00 00:00:00</close_date>
-<impact></impact>
-<workgroup_id>19</workgroup_id>
-<agent_id>21</agent_id>
-<supervisorgroup_id>19</supervisorgroup_id>
-<supervisor_id>20</supervisor_id>
-<managergroup_id>19</managergroup_id>
-<manager_id>7</manager_id>
-<outage>No</outage>
-<change_request>Upgrade to new IOS due to security reason</change_request>
-<change_log></change_log>
-<fallback></fallback>
-<assignment_count>0</assignment_count>
-</bizChangeTicket>
-</Set>
\ No newline at end of file
+Could you make it please</change_request>
+<change_log>We will push via netmeeting the package and install it at 10:00 tomorrow</change_log>
+<fallback>If there is any issue we will uninstall it</fallback>
+<assignment_count>0</assignment_count>
+</bizChangeTicket>
+<bizChangeTicket id="2">
+<name>CM-0000004</name>
+<title>Oracle upgrade on domino</title>
+<type>Routine</type>
+<domain>Application</domain>
+<reason>Patch Installation for Oracle</reason>
+<requestor_id>21</requestor_id>
+<org_id>3</org_id>
+<ticket_status>Approved</ticket_status>
+<creation_date>2009-03-17 14:50:34</creation_date>
+<last_update>2009-03-17 14:50:34</last_update>
+<start_date>2009-02-24 00:00:00</start_date>
+<end_date>2009-02-24 02:00:00</end_date>
+<close_date>0000-00-00 00:00:00</close_date>
+<impact>application impacted</impact>
+<workgroup_id>19</workgroup_id>
+<agent_id>20</agent_id>
+<supervisorgroup_id>19</supervisorgroup_id>
+<supervisor_id>21</supervisor_id>
+<managergroup_id>19</managergroup_id>
+<manager_id>7</manager_id>
+<outage>Yes</outage>
+<change_request>We wan to install last Oracle Patch in order to fix rollback management issues</change_request>
+<change_log>We will install patch and reboot the server</change_log>
+<fallback>If not working we will remove this patch</fallback>
+<assignment_count>0</assignment_count>
+</bizChangeTicket>
+<bizChangeTicket id="3">
+<name>CM-0000005</name>
+<title>IOS upgrade</title>
+<type>Routine</type>
+<domain>Desktop</domain>
+<reason>security issue</reason>
+<requestor_id>21</requestor_id>
+<org_id>3</org_id>
+<ticket_status>New</ticket_status>
+<creation_date>2009-04-04 23:23:37</creation_date>
+<last_update>0000-00-00 00:00:00</last_update>
+<start_date>0000-00-00 00:00:00</start_date>
+<end_date>0000-00-00 00:00:00</end_date>
+<close_date>0000-00-00 00:00:00</close_date>
+<impact></impact>
+<workgroup_id>19</workgroup_id>
+<agent_id>21</agent_id>
+<supervisorgroup_id>19</supervisorgroup_id>
+<supervisor_id>20</supervisor_id>
+<managergroup_id>19</managergroup_id>
+<manager_id>7</manager_id>
+<outage>No</outage>
+<change_request>Upgrade to new IOS due to security reason</change_request>
+<change_log></change_log>
+<fallback></fallback>
+<assignment_count>0</assignment_count>
+</bizChangeTicket>
+</Set>
diff --git a/trunk/setup/data/18.contracts.xml b/trunk/setup/data/18.contracts.xml
index 4de2eff8e..22f23c6b5 100644
--- a/trunk/setup/data/18.contracts.xml
+++ b/trunk/setup/data/18.contracts.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-<bizContract id="1">
-<name>Oracle Support</name>
-<customer_id>3</customer_id>
-<provider_id>6</provider_id>
-<service_name>Software support</service_name>
-<team_id>8</team_id>
-<service_level>Gold</service_level>
-<cost_unit>Global</cost_unit>
-<cost_freq>Yearly</cost_freq>
-<cost>30000</cost>
-<currency>Euros</currency>
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<bizContract id="1">
+<name>Oracle Support</name>
+<org_id>3</org_id>
+<provider_id>6</provider_id>
+<service_name>Software support</service_name>
+<team_id>8</team_id>
+<service_level>Gold</service_level>
+<cost_unit>Global</cost_unit>
+<cost_freq>Yearly</cost_freq>
+<cost>30000</cost>
+<currency>Euros</currency>
 <description>This contract define Oracle Support contract between Mecanorama and Oracle company.
 
-Yearly cost is 30.000 euros</description>
-<move2prod_date>2009-02-22 18:54:14</move2prod_date>
-<end_prod>2009-03-04 00:01:38</end_prod>
-<status>Signed</status>
-<type>Software</type>
-<version_number>3</version_number>
-</bizContract>
-</Set>
\ No newline at end of file
+Yearly cost is 30.000 euros</description>
+<move2prod_date>2009-02-22 18:54:14</move2prod_date>
+<end_prod>2009-03-04 00:01:38</end_prod>
+<status>Signed</status>
+<type>Software</type>
+<version_number>3</version_number>
+</bizContract>
+</Set>