add condition for partner id
added comment placeholder
update value for inactive
Merge remote-tracking branch 'origin/UAT' into UAT

Conflicts:
	application/models/marketing_model.php