Merge branch 'master' of git://github.com/coldblooded01/eden

flavour · Oct 8, 2012 · 9b64fe1 · 9b64fe1
2 parents 86b49d6 + d6b4bf0
commit 9b64fe1
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-9c4c78f (2012-10-08 12:51:13)
+86b49d6 (2012-10-08 13:05:00)
diff --git a/modules/tests/hrm/add_staff_to_organisation.py b/modules/tests/hrm/add_staff_to_organisation.py
@@ -58,7 +58,7 @@ def test_hrm005_add_staff_to_organization(self):
 
         self.create("hrm_human_resource", 
                     [( "site_id",
-                       "AP Zone (Office)",
+                       "Lori (Facility)",
                        "option"),
                      ( "first_name",
                        "Herculano",

diff --git a/modules/tests/hrm/create_staff.py b/modules/tests/hrm/create_staff.py
@@ -67,7 +67,7 @@ def test_hrm001_create_staff(self):
                        "Warehouse Manager",
                        "option"),
                      ( "site_id",
-                       "AP Zone",
+                       "AP Zone (Office)",
                        "option",
                        3),
                      ]

diff --git a/modules/tests/hrm/create_staff_training.py b/modules/tests/hrm/create_staff_training.py
@@ -69,7 +69,7 @@ def test_hrm003_create_staff_training(self):
                      ( "hours",
                        "12"),
                      ( "site_id",
-                       "Bucharest RFAAT Centre (Test) (Office)",
+                       "AP Zone (Office)",
                        "option"),
                      ( "comments",
                        "Testing comments"),

diff --git a/modules/tests/hrm/create_volunteer.py b/modules/tests/hrm/create_volunteer.py
@@ -64,7 +64,7 @@ def test_hrm002_create_volunteer(self):
                        "Security",
                        "option"),
                      ( "site_id",
-                       "AP Zone",
+                       "AP Zone (Office)",
                        "option",
                        3),
                      ]

diff --git a/views/admin/result.html b/views/admin/result.html
@@ -1,5 +1,5 @@
 {{extend "layout.html"}}
 <h2>Sahana Eden Test Results Compilation:</h2>
 >> <a href="result_automated">View Automated Test Results</a><br />
->> <a href="result_smoke">View Smoke Test Results</a>
->> <a href="result_roles">View Roles Test Results</a>
+>> <a href="result_smoke">View Smoke Test Results</a><br />
+>> <a href="result_roles">View Roles Test Results</a><br />