← Back to branch summary

~michael-howden/sahana-eden/ifrc

~michael-howden/sahana-eden/ifrc

Viewing all changes in revision 2161.

Committer: Michael Howden
Date: 2012-01-19 13:13:07 UTC
mfrom: (2159.1.3 ifrc)
Revision ID: michael@sahanafoundation.org-20120119131307-bmnfnuxozxkfgsyg

Merge IFRC

files removed:
private/prepopulate/demo/IFRC Train

private/prepopulate/demo/IFRC Train/tasks.cfg

files modified:
VERSION

controllers/hrm.py

controllers/inv.py

models/01_menu.py

models/08_inv.py

modules/eden/hrm.py

modules/s3/s3aaa.py

modules/s3/s3msg.py

modules/s3/s3report.py

views/_report.html

Show diffs side-by-side

added added

removed removed

controllers/hrm.py

controllers/inv.py

models/01_menu.py

models/08_inv.py

modules/eden/hrm.py

modules/s3/s3aaa.py

modules/s3/s3msg.py

modules/s3/s3report.py

private/prepopulate/demo/IFRC Train/

private/prepopulate/demo/IFRC Train/tasks.cfg

views/_report.html

Older »