lp:~ptressel/sahana-eden/devel

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:sahana-eden

nursix (community): Disapprove on 2011-09-02

Fran Boon: Pending requested 2011-06-03

Diff: 709 lines (+444/-54)

4 files modified

controllers/hrm.py (+6/-0)
models/06_hrm.py (+8/-1)
modules/s3/s3crud.py (+174/-52)
modules/s3/s3tools.py (+256/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2266. By Pat Tressel on 2011-06-03

Merge from trunk.

2265. By Pat Tressel on 2011-06-03

Add fake virtual fields. For fk$fn for list_fields, allow records with empty fk if fk field isn't notnull.

2264. By Fran Boon on 2011-05-26

Partial fix for #977 (Non-Item Requests now don't direct to Items page after creation & Commitment status gets updated after a commitment is made)
merge nursix: Revert error handling in __create_job (error details to be reported to the tree, not in the top level message)

2263. By Fran Boon on 2011-05-26

merge Graeme: Duplicate detection for Imports is done using a Resolver, Usability fixes for validation process

2262. By Fran Boon on 2011-05-26

pre-merge commit

2261. By Fran Boon on 2011-05-26

merge Michael: revert fromn_location_id on Shipments, inv_recv search added to menu

2260. By Fran Boon on 2011-05-25

Use the default Organisation in more places

2259. By Fran Boon on 2011-05-25

Organsiation_id widget can default to current user's Org Profile (invoked like this in HRM), Sector/Cluster is a configurable option, Made menu options visible on index pages

2258. By Fran Boon on 2011-05-25

Tweak Location Represents & small optimisations/fixes

2257. By Fran Boon on 2011-05-25

print statement