Merge lp://staging/~mike-amy/sahana-eden/LA into lp://staging/sahana-eden

.bzrignore (+2/-0)
VERSION (+1/-1)
clean_la.cmd (+11/-0)
controllers/admin.py (+52/-1)
controllers/default.py (+638/-379)
controllers/don.py (+693/-0)
controllers/event.py (+11/-1)
controllers/gis.py (+3/-2)
controllers/hrm.py (+193/-0)
controllers/master.py (+22/-0)
controllers/org.py (+83/-0)
controllers/project.py (+2/-59)
controllers/req.py (+13/-9)
controllers/supply.py (+1/-0)
controllers/vol.py (+2350/-176)
deployment-templates/models/000_config.py (+223/-205)
languages/es.py (+917/-6599)
models/00_db.py (+0/-1)
models/00_settings.py (+71/-29)
models/00_tables.py (+41/-61)
models/00_utils.py (+11/-5)
models/01_menu.py (+654/-340)
models/02_pr.py (+2/-0)
models/03_gis.py (+2/-1)
models/04_pr.py (+21/-4)
models/05_irs.py (+0/-1)
models/05_org.py (+513/-95)
models/06_hrm.py (+100/-31)
models/06_supply.py (+44/-35)
models/08_inv.py (+7/-1)
models/09_project.py (+108/-11)
models/don.py (+613/-0)
models/event.py (+98/-2)
models/req.py (+3064/-1922)
models/vol.py (+1889/-342)
models/zzz_1st_roles.py (+169/-89)
models/zzz_1st_run.py (+86/-185)
modules/s3/add_object_inline.py (+108/-0)
modules/s3/s3aaa.py (+103/-27)
modules/s3/s3cfg.py (+4/-0)
modules/s3/s3export.py (+4/-4)
modules/s3/s3gis.py (+5/-7)
modules/s3/s3import.py (+57/-20)
modules/s3/s3msg.py (+18/-2)
modules/s3/s3pdf.py (+65/-14)
modules/s3/s3search.py (+7/-2)
modules/s3/s3tools.py (+138/-258)
modules/s3/s3utils.py (+0/-1)
modules/s3/s3widgets.py (+526/-382)
modules/test_utils/__init__.py (+5/-0)
modules/test_utils/load_unit.py (+32/-0)
modules/test_utils/login.py (+19/-0)
modules/test_utils/run.py (+13/-10)
modules/test_utils/setup_request_environment.py (+23/-0)
private/prepopulate/default/StandardItems.csv (+4/-0)
private/prepopulate/demo/LA/California_L2.csv (+59/-0)
private/prepopulate/demo/LA/LASkillList.csv (+62/-64)
private/prepopulate/demo/LA/USA_L1.csv (+52/-0)
private/prepopulate/demo/LA/office.csv (+16/-0)
private/prepopulate/demo/LA/organisation.csv (+8/-0)
private/prepopulate/demo/LA/people.csv (+86/-0)
private/prepopulate/demo/LA/req_req.csv (+15/-4)
private/prepopulate/demo/LA/req_skill.csv (+12/-0)
private/prepopulate/demo/LA/sector.csv (+21/-0)
private/prepopulate/demo/LA/tasks.cfg (+17/-1)
private/prepopulate/demo/LA/users.csv (+86/-0)
private/prepopulate/demo/LA/vol_application.csv (+41/-0)
private/prepopulate/demo/LA/vol_assignment.csv (+41/-0)
private/prepopulate/regression/office.csv (+1/-1)
static/formats/edrm/export.xsl (+18/-0)
static/formats/edrm/import.xsl (+14/-2)
static/formats/s3csv/hrm/person.xsl (+44/-33)
static/formats/s3csv/org/office.xsl (+47/-5)
static/formats/s3csv/org/officela.xsl (+261/-0)
static/formats/s3csv/org/organisation.xsl (+6/-1)
static/formats/s3csv/org/sector.xsl (+38/-0)
static/formats/s3csv/req/req.xsl (+32/-21)
static/formats/s3csv/req/req_skill.xsl (+70/-0)
static/formats/s3csv/vol/application.xsl (+76/-0)
static/formats/s3csv/vol/assignment.xsl (+74/-0)
static/formats/s3csv/vol/contact.xsl (+75/-0)
static/formats/s3csv/vol/req.xsl (+77/-0)
static/scripts/S3/S3.js (+4/-3)
static/scripts/S3/S3.min.js (+4/-4)
static/scripts/S3/anytimec.js (+0/-789)
static/scripts/S3/jquery.ba-resize.js (+249/-0)
static/scripts/S3/jquery.ba-resize.min.js (+9/-0)
static/scripts/S3/jquery.hoverIntent.js (+106/-0)
static/scripts/S3/jquery.hoverIntent.minified.js (+9/-0)
static/scripts/S3/s3.dataTables.js (+10/-4)
static/scripts/S3/s3.dataTables.min.js (+5/-5)
static/scripts/S3/s3.select_object.js (+136/-0)
static/scripts/S3/s3.select_person.js (+1/-1)
static/scripts/S3/s3.select_person.min.js (+1/-1)
static/scripts/S3/ui.multiselect.js (+3/-0)
static/styles/S3/anytime.css (+0/-777)
static/styles/S3/anytimec.css (+0/-44)
static/styles/S3/sahana.css (+949/-833)
static/styles/S3/sahana.min.css (+1/-1)
tests/selenium/selenium-version (+2/-2)
tests/smoke_tests.cmd (+2/-0)
tests/unit_tests/controllers/hrm.py (+233/-0)
tests/unit_tests/controllers/org.py (+121/-0)
tests/unit_tests/models/01_menu.py (+128/-0)
tests/unit_tests/modules/s3/s3gis/FeatureLayer.py (+7/-1)
tests/unit_tests/modules/s3/s3gis/FeatureQueries.py (+7/-2)
tests/unit_tests/modules/s3/s3gis/GPXLayer.py (+3/-1)
tests/unit_tests/modules/s3/s3gis/GeoJSONLayer.py (+3/-1)
tests/unit_tests/modules/s3/s3gis/GeoRSSLayer.py (+3/-1)
tests/unit_tests/modules/s3/s3gis/KMLLayer.py (+1/-5)
tests/unit_tests/modules/s3/s3gis/TrueCodePaths.py (+97/-135)
tests/unit_tests/modules/s3/s3gis/WFSLayer.py (+2/-0)
tests/unit_tests/modules/s3/s3gis/__init__.py (+1/-1)
views/_create.html (+2/-2)
views/_delete.html (+1/-1)
views/_display.html (+2/-2)
views/_list.html (+30/-27)
views/_list_create.html (+4/-4)
views/_merge.html (+2/-2)
views/_ocr_page_upload.html (+1/-1)
views/_ocr_upload.html (+1/-1)
views/_search.html (+2/-2)
views/_update.html (+2/-2)
views/admin/export_data.html (+1/-1)
views/admin/groups.html (+1/-1)
views/admin/import_data.html (+1/-1)
views/admin/index.html (+1/-1)
views/admin/role_edit.html (+1/-1)
views/admin/role_list.html (+1/-1)
views/admin/role_users.html (+1/-1)
views/admin/settings.html (+2/-1)
views/admin/users.html (+1/-1)
views/assess/basic_assess.html (+1/-1)
views/assess/index.html (+1/-1)
views/asset/index.html (+1/-1)
views/auth/_login.html (+1/-1)
views/breadcrumbs.html (+6/-0)
views/budget/budget_staff_bundle_header.html (+1/-1)
views/budget/bundle_kit_item_header.html (+1/-1)
views/budget/kit_item_header.html (+1/-1)
views/building/adminLevel.html (+1/-1)
views/building/index.html (+1/-1)
views/building/report.html (+1/-1)
views/building/timeline.html (+1/-1)
views/cr/index.html (+1/-1)
views/dataTables.html (+37/-62)
views/default/about.html (+1/-1)
views/default/contact.html (+7/-17)
views/default/disclaimer.html (+13/-0)
views/default/faq.html (+9/-0)
views/default/help.html (+11/-2)
views/default/index.html (+24/-59)
views/default/register.html (+14/-0)
views/default/sitemap.html (+5/-0)
views/default/user.html (+1/-1)
views/default/why.html (+8/-0)
views/delphi/index.html (+1/-1)
views/don/index.html (+69/-0)
views/dvi/index.html (+1/-1)
views/dvr/index.html (+1/-1)
views/errors/index.html (+1/-1)
views/event/index.html (+1/-1)
views/flood/index.html (+1/-1)
views/footer.html (+15/-7)
views/formats.html (+7/-6)
views/gis/catalogue_toolbar.html (+1/-1)
views/gis/legend.html (+11/-11)
views/gis/location_duplicates.html (+1/-1)
views/gis/location_resolve.html (+1/-1)
views/hrm/index.html (+1/-1)
views/importer/index.html (+1/-1)
views/inner_form.html (+109/-0)
views/inv/index.html (+1/-1)
views/irs/index.html (+1/-1)
views/key.html (+1/-1)
views/layout.html (+56/-88)
views/list_create_ext.html (+1/-1)
views/list_ext.html (+1/-1)
views/master/index.html (+15/-0)
views/mobile/settings_update.html (+1/-1)
views/mpr/index.html (+1/-1)
views/msg/_compose.html (+1/-1)
views/msg/api_settings_update.html (+1/-1)
views/msg/contacts.html (+1/-1)
views/msg/email_settings_update.html (+1/-1)
views/msg/group_user_header.html (+1/-1)
views/msg/index.html (+1/-1)
views/msg/modem_settings_update.html (+1/-1)
views/msg/outbox_create.html (+1/-1)
views/msg/setting_display.html (+1/-1)
views/msg/setting_update.html (+1/-1)
views/msg/sms_to_smtp_settings_update.html (+1/-1)
views/msg/tropo_settings_update.html (+1/-1)
views/org/index.html (+1/-1)
views/patient/index.html (+1/-1)
views/pr/index.html (+1/-1)
views/pr/person_duplicates.html (+1/-1)
views/pr/person_presence_list.html (+1/-1)
views/pr/person_presence_list_create.html (+1/-1)
views/pr/person_resolve.html (+1/-1)
views/project/index.html (+1/-1)
views/project/project_search.html (+1/-1)
views/req/index.html (+2/-2)
views/req/req_assignment_update.html (+33/-0)
views/req/req_item_inv_item.html (+1/-1)
views/scenario/index.html (+1/-1)
views/supply/index.html (+26/-0)
views/survey/index.html (+1/-1)
views/ticket/index.html (+1/-1)
views/vehicle/index.html (+1/-1)
views/vol/index.html (+5/-29)
views/vol/profile.html (+10/-0)
views/vol/register.html (+11/-0)
views/vol/req_assignment_update.html (+32/-0)