← Back to branch summary

~graeme-acm/sahana-eden/RMS

~graeme-acm/sahana-eden/RMS

Viewing all changes in revision 2035.

Committer: Fran Boon
Date: 2011-10-31 19:23:23 UTC
mfrom: (1875.1.982 eden)
Revision ID: fran@aidiq.com-20111031192323-byx9m5vph6p9gnbn

merge Trunk: Org import templates

files added:
static/formats/s3csv/org/office.csv

static/formats/s3csv/org/organisation.csv

views/supply

views/supply/index.html

files modified:
VERSION

controllers/supply.py

models/05_org.py

models/06_supply.py

private/prepopulate/demo/Standard/organisation.csv

views/org/index.html

Show diffs side-by-side

added added

removed removed

controllers/supply.py

models/05_org.py

models/06_supply.py

private/prepopulate/demo/Standard/organisation.csv

static/formats/s3csv/org/office.csv

static/formats/s3csv/org/organisation.csv

views/org/index.html

views/supply/index.html

Older »