DRRPP Fix
S3SQLCustomForm: don't try to mark fields as required if readonly.
Select the "office_type_id" field rather than "type".
Tweaks
Merge branch 'master' of git://github.com/nursix/eden
Merge branch 'master' of git://github.com/flavour/eden
Branch organisations inherit certain fields from their parent
organisation, even during imports.
Merge branch 'master' of git://github.com/nursix/eden
Merge branch 'master' of git://github.com/flavour/eden