diff --git a/resources/setup/importexport_default.xml b/resources/setup/importexport_default.xml index 5c6a54cd44..a0c5e45ea5 100644 --- a/resources/setup/importexport_default.xml +++ b/resources/setup/importexport_default.xml @@ -2,7 +2,7 @@ importexport definitions - user + utf-8 2 @@ -35,7 +35,7 @@ label 1 - 2011-05-24 10:00:00 + 2011-05-24 10:12:46 import-resources @@ -93,9 +93,22 @@ 1 + + res_id + exists + + update + 1 + + + insert + 1 + + + 1 - 2011-05-24 10:00:00 + 2012-05-15 17:19:20 diff --git a/timesheet/setup/importexport_default.xml b/timesheet/setup/importexport_default.xml index 6c90397952..5783c61449 100644 --- a/timesheet/setup/importexport_default.xml +++ b/timesheet/setup/importexport_default.xml @@ -2,7 +2,7 @@ importexport definitions - user + utf-8 2 @@ -36,7 +36,7 @@ label 1 - 2011-05-24 10:00:00 + 2011-05-24 10:12:46 import-timesheet @@ -52,39 +52,37 @@ 1 add - ts_project - ts_title - ts_description - ts_start - ts_duration - ts_quantity - ts_unitprice - cat_id - ts_owner - ts_modified - ts_modifier - pl_id - ts_status - user_timezone_read - no_csv_1 - no_csv_2 - no_csv_3 + Timesheet ID + Project + Title + Category + Description + Start + Duration + Quantity + Unitprice + Owner + Modifier + Status + Projectid + Text + Selectbox + Address ts_id ts_project ts_title - ts_description - ts_start - ts_duration - ts_quantity - ts_unitprice - cat_id + cat_id + ts_description + ts_start + ts_duration + ts_quantity + ts_unitprice ts_owner - ts_modified - ts_modifier + ts_modifier + ts_status pm_id - ts_status @@ -100,14 +98,31 @@ 1 + + ts_id + exists + + update + 1 + + + insert + 1 + + 0 1 + 1 + TRUE + Import options + 0 + 0 - 2011-05-24 10:00:00 + 2012-05-15 17:24:32