← Back to branch summary

~ghc-2011-codeathon/sahana-eden/team

~ghc-2011-codeathon/sahana-eden/team

Viewing all changes in revision 2868.

Committer: Fran Boon
Date: 2011-11-04 16:48:18 UTC
mfrom: (2653.1.50 eden)
Revision ID: fran@aidiq.com-20111104164818-a4c250rf7aq0d6vv

merge Michael: Project module in-line with DRRPP model, Inv tweaks, Prepop tweaks

files added:
private/prepopulate/demo/Request

private/prepopulate/demo/Request/SkillList.csv

private/prepopulate/demo/Request/req_item.csv

private/prepopulate/demo/Request/req_req.csv

private/prepopulate/demo/Request/tasks.cfg

static/formats/s3csv/inv/inv_item.csv

static/formats/s3csv/inv/inv_item.xsl

static/formats/s3csv/inv/recv_item.csv

static/formats/s3csv/inv/recv_item.xsl

static/formats/s3csv/inv/send_item.csv

static/formats/s3csv/inv/send_item.xsl

static/formats/s3csv/inv_inv_item.csv

static/formats/s3csv/inv_inv_item.xsl

static/formats/s3csv/req/req.csv

static/formats/s3csv/req/req_item.csv

static/formats/s3csv/supply/eric.csv

static/formats/s3csv/supply/eric.xsl

static/formats/s3csv/supply/eric_complete.csv

static/formats/s3csv/supply/eric_sample.csv

static/formats/s3csv/supply/eric_supply_item_category.csv

static/formats/s3csv/supply/eric_supply_item_category.xsl

files removed:
private/prepopulate/demo/LA

private/prepopulate/demo/LA/LASkillList.csv

private/prepopulate/demo/LA/req_item.csv

private/prepopulate/demo/LA/req_req.csv

private/prepopulate/demo/LA/tasks.cfg

private/prepopulate/demo/default

private/prepopulate/demo/default/tasks.cfg

static/formats/s3csv/inv/inv_item.csv

static/formats/s3csv/inv/inv_item.xsl

static/formats/s3csv/inv_stock_posn.csv

static/formats/s3csv/inv_stock_posn.xsl

files modified:
VERSION

controllers/admin.py

controllers/inv.py

controllers/project.py

deployment-templates/models/000_config.py

models/00_tables.py

models/01_menu.py

models/05_org.py

models/06_supply.py

models/09_project.py

private/prepopulate/demo/ADAT/24H_response.csv

private/prepopulate/demo/demo_folders.cfg

Show diffs side-by-side

added added

removed removed

controllers/admin.py

controllers/inv.py

controllers/project.py

deployment-templates/models/000_config.py

models/00_tables.py

models/01_menu.py

models/05_org.py

models/06_supply.py

models/09_project.py

private/prepopulate/demo/ADAT/24H_response.csv

private/prepopulate/demo/LA/

private/prepopulate/demo/LA/LASkillList.csv

private/prepopulate/demo/LA/req_item.csv

private/prepopulate/demo/LA/req_req.csv

private/prepopulate/demo/LA/tasks.cfg

private/prepopulate/demo/Request/

private/prepopulate/demo/Request/SkillList.csv

private/prepopulate/demo/Request/req_item.csv

private/prepopulate/demo/Request/req_req.csv

private/prepopulate/demo/Request/tasks.cfg

private/prepopulate/demo/default/

private/prepopulate/demo/default/tasks.cfg

private/prepopulate/demo/demo_folders.cfg

static/formats/s3csv/inv/inv_item.csv

static/formats/s3csv/inv/inv_item.csv

static/formats/s3csv/inv/inv_item.xsl

static/formats/s3csv/inv/inv_item.xsl

static/formats/s3csv/inv/recv_item.csv

static/formats/s3csv/inv/recv_item.xsl

static/formats/s3csv/inv/send_item.csv

static/formats/s3csv/inv/send_item.xsl

static/formats/s3csv/inv_inv_item.csv

static/formats/s3csv/inv_inv_item.xsl

static/formats/s3csv/inv_stock_posn.csv

static/formats/s3csv/inv_stock_posn.xsl

static/formats/s3csv/req/req.csv

static/formats/s3csv/req/req_item.csv

static/formats/s3csv/supply/eric.csv

static/formats/s3csv/supply/eric.xsl

static/formats/s3csv/supply/eric_complete.csv

static/formats/s3csv/supply/eric_sample.csv

static/formats/s3csv/supply/eric_supply_item_category.csv

static/formats/s3csv/supply/eric_supply_item_category.xsl

Older »