Merge branch '4.4' into master
authorColeman Watts <coleman@civicrm.org>
Sat, 3 May 2014 22:03:11 +0000 (15:03 -0700)
committerColeman Watts <coleman@civicrm.org>
Sat, 3 May 2014 22:03:11 +0000 (15:03 -0700)
Conflicts:
templates/CRM/Contact/Form/OnBehalfOf.tpl
templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl

1  2 
CRM/Contact/BAO/Contact/Utils.php
CRM/Contact/Form/RelatedContact.php
CRM/Contribute/Form/Contribution/OnBehalfOf.php
CRM/Contribute/Form/ContributionBase.php
CRM/Contribute/xml/Menu/Contribute.xml
CRM/Core/I18n.php
CRM/Core/Page/AJAX/Location.php
CRM/Report/Form/Pledge/Pbnp.php
templates/CRM/Contact/Form/OnBehalfOf.tpl
templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 233ecdd5416241170e4226380dd2eb768c8c4bf2,cc4d7711287230c6c3ec78bb85cb4f306293f59a..1ea2da371214f178b01781d54ba80999d8ded00e
@@@ -180,11 -170,11 +170,12 @@@ function resetValues() 
  }
  
  function createNew( ) {
 -  if (cj("#mode").attr('checked')) {
 +  if (cj("#mode").prop('checked')) {
      var textMessage = ' {/literal}{ts escape="js"}Use existing organization{/ts}{literal} ';
      cj("#onbehalf_organization_name").removeAttr('readonly');
-     resetValues( false );
 +    cj("#mode").prop('checked', false);
+     cj("#mode").removeAttr('checked');
+     resetValues();
    }
    else {
      var textMessage = ' {/literal}{ts escape="js"}Enter a new organization{/ts}{literal} ';