CRM-15829 and CRM-15881 for CiviCRM 4.6
authorMarco Valente <marco@compucorp.co.uk>
Mon, 8 Jun 2015 17:16:48 +0000 (18:16 +0100)
committerMarco Valente <marco@compucorp.co.uk>
Mon, 8 Jun 2015 17:16:48 +0000 (18:16 +0100)
commit358f8960355a7b2ff9d3688940789fe1146648bd
tree0514b73b56f8044b12d8d9622d4bd3c40392e689
parent8fa0afca29d29808d4c4a111369b9370833bceeb
CRM-15829 and CRM-15881 for CiviCRM 4.6

-----------------------------------

CRM-15829 (Relationships and inherited pending memberships)

Add pending memberships to new members of an organisation that has pending memberships

    CRM/Contact/BAO/Relationship -> line ~1458
    CRM/Contact/BAO/Relationship -> line ~1479
    CRM/Contact/BAO/Relationship -> line ~1483

Ensure these new pending memberships for an organisation's employees are not set to active

    CRM/Member/BAO/Membership -> line 265

-----------------------------------

CRM-15881 (Contact relationships (employee of))

Clear current employee when deleting a relationship that is the employer

    CRM/Contact/BAO/Relationship -> line ~623

Reload the tab ajax views to reflect removed employer display when deleting a relationship that is the employer

    CRM/Contact/Form/Relationship -> line ~399

If disabling an employer relationship (via the popup modal), unset the is_current_employer, please see comments in code

    CRM/Contact/Form/Relationship -> line ~444
CRM/Member/BAO/Membership.php