← Back to branch summary

~graeme-acm/sahana-eden/LA

~graeme-acm/sahana-eden/LA

Viewing all changes in revision 2382.

Committer: graeme at acm
Author(s): graeme-acm
Date: 2011-08-12 02:33:31 UTC
mfrom: (2124.16.172 la)
Revision ID: graeme@acm.org-20110812023331-8d6zeiks3e9a34ha

merge la

files added:
modules/test_utils

modules/test_utils/__init__.py

modules/test_utils/compare_lines.py

private/prepopulate/import_eric2.py

static/formats/s3csv/asset

static/formats/s3csv/asset/asset.csv

static/formats/s3csv/asset/asset.xsl

static/formats/s3csv/duplicate files are for simpler importer which will soon be deprecated

static/formats/s3csv/hrm_person.csv

static/formats/s3csv/inv/stock_posn.csv

static/formats/s3csv/inv/stock_posn.xsl

static/formats/s3csv/inv/warehouse.csv

static/scripts/S3/jquery.ba-resize.js

static/scripts/S3/jquery.ba-resize.min.js

static/scripts/S3/s3.select_object.js

tests/unit_tests/controllers

tests/unit_tests/controllers/hrm.py

tests/unit_tests/modules

tests/unit_tests/modules/s3

tests/unit_tests/modules/s3/s3widgets.py

views/inner_form.html

files renamed:
tests/run.py => modules/test_utils/run.py

static/formats/s3csv/hrm_person.csv => static/formats/s3csv/hrm/person.csv

files modified:
VERSION

controllers/hrm.py

controllers/inv.py

models/01_menu.py

models/03_gis.py

models/04_pr.py

models/06_hrm.py

models/07_cr.py

models/08_inv.py

modules/s3/s3crud.py

modules/s3/s3import.py

modules/s3/s3tools.py

modules/s3/s3utils.py

modules/s3/s3widgets.py

static/formats/s3csv/hrm/person.xsl

static/formats/s3csv/hrm_person.xsl

static/scripts/S3/S3.js

static/styles/S3/sahana.css

static/styles/S3/sahana.min.css

tests/nose.py

tests/unit_tests/gis/s3gis.py

views/hrm/index.html

views/layout.html

Show diffs side-by-side

added added

removed removed

controllers/hrm.py

controllers/inv.py

models/01_menu.py

models/03_gis.py

models/04_pr.py

models/06_hrm.py

models/07_cr.py

models/08_inv.py

modules/s3/s3crud.py

modules/s3/s3import.py

modules/s3/s3tools.py

modules/s3/s3utils.py

modules/s3/s3widgets.py

modules/test_utils/

modules/test_utils/__init__.py

modules/test_utils/compare_lines.py

modules/test_utils/run.py

private/prepopulate/import_eric2.py

static/formats/s3csv/asset/

static/formats/s3csv/asset/asset.csv

static/formats/s3csv/asset/asset.xsl

static/formats/s3csv/duplicate files are for simpler importer which will soon be deprecated

static/formats/s3csv/hrm/person.csv

static/formats/s3csv/hrm/person.xsl

static/formats/s3csv/hrm_person.csv

static/formats/s3csv/hrm_person.xsl

static/formats/s3csv/inv/stock_posn.csv

static/formats/s3csv/inv/stock_posn.xsl

static/formats/s3csv/inv/warehouse.csv

static/scripts/S3/S3.js

static/scripts/S3/jquery.ba-resize.js

static/scripts/S3/jquery.ba-resize.min.js

static/scripts/S3/s3.select_object.js

static/styles/S3/sahana.css

static/styles/S3/sahana.min.css

tests/unit_tests/controllers/

tests/unit_tests/controllers/hrm.py

tests/unit_tests/gis/s3gis.py

tests/unit_tests/modules/

tests/unit_tests/modules/s3/

tests/unit_tests/modules/s3/s3widgets.py

views/hrm/index.html

views/inner_form.html

views/layout.html

Older »