Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-03-14-48-25

Conflicts:
	CRM/Contribute/BAO/Contribution.php
	tests/phpunit/api/v3/GroupContactTest.php

diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge

diff --cc CRM/Contribute/Form/Contribution.php
Simple merge

diff --cc CRM/Contribute/Form/Contribution/Main.php
Simple merge

diff --cc CRM/Core/Payment/BaseIPN.php
index 8a28c766ded218e1555a53bccbc1ed19a5481b70,3976560052fb1a937debca4a8caadf044746a742..bff9c57858fb61320ebabcd1c3fe5b1664995a34
--- 1/CRM/Core/Payment/BaseIPN.php
--- 2/CRM/Core/Payment/BaseIPN.php
+++ b/CRM/Core/Payment/BaseIPN.php
@@@ -506,9 -502,10 +506,10 @@@ LIMIT 1;"
      $contribution->trxn_id = $input['trxn_id'];
      $contribution->receive_date = CRM_Utils_Date::isoToMysql($contribution->receive_date);
      $contribution->thankyou_date = CRM_Utils_Date::isoToMysql($contribution->thankyou_date);
+     $contribution->receipt_date = CRM_Utils_Date::isoToMysql($contribution->receipt_date);
      $contribution->cancel_date = 'null';
  
 -    if (CRM_Utils_Array::value('check_number', $input)) {
 +    if (!empty($input['check_number'])) {
        $contribution->check_number = $input['check_number'];
      }
  

diff --cc CRM/Core/Permission.php
Simple merge

diff --cc CRM/Financial/BAO/FinancialItem.php
index e6c09496c31b93b99e491e559f437571dddbde66,8eaa001019c38c9012927f7eaeeb0b5f29660b78..349fb2ebe43e829bc5b6536f05cad9646d0ea22d
--- 1/CRM/Financial/BAO/FinancialItem.php
--- 2/CRM/Financial/BAO/FinancialItem.php
+++ b/CRM/Financial/BAO/FinancialItem.php
@@@ -82,12 -83,10 +83,13 @@@ class CRM_Financial_BAO_FinancialItem e
      if ($contribution->contribution_status_id == array_search('Completed', $contributionStatuses)) {
        $itemStatus = array_search('Paid', $financialItemStatus);
      }
-     elseif ($contribution->contribution_status_id == array_search('Pending', $contributionStatuses)) {
+     elseif ($contribution->contribution_status_id == array_search('Pending', $contributionStatuses) 
+       || $contribution->contribution_status_id == array_search('In Progress', $contributionStatuses)) {
        $itemStatus = array_search('Unpaid', $financialItemStatus);
      }
 +    elseif ($contribution->contribution_status_id == array_search('Partially paid', $contributionStatuses)) {
 +      $itemStatus = array_search('Partially paid', $financialItemStatus);
 +    }
      $params = array(
        'transaction_date'  => CRM_Utils_Date::isoToMysql($contribution->receive_date),
        'contact_id'        => $contribution->contact_id,

diff --cc CRM/Member/BAO/Membership.php
Simple merge

diff --cc CRM/Member/BAO/MembershipType.php
Simple merge

diff --cc CRM/Report/Form/Event/ParticipantListCount.php
Simple merge

diff --cc CRM/Report/Form/Event/ParticipantListing.php
Simple merge

diff --cc CRM/Upgrade/Incremental/php/FourTwo.php
Simple merge

diff --cc templates/CRM/Group/Form/Search.tpl
index cba5e072b1b1902928f85a114d0a95dd63264f87,0eccd0934301d8c02bd50a14f7dc03d764d55c6f..bf746c2d76515356561c790b066b2e4130e10360
--- 1/templates/CRM/Group/Form/Search.tpl
--- 2/templates/CRM/Group/Form/Search.tpl
+++ b/templates/CRM/Group/Form/Search.tpl
@@@ -302,9 -282,16 +302,12 @@@ function showChildren( parent_id, showO
              }
              appendHTML += "<td>" + val.group_id + "</td>";
              appendHTML += "<td>" + val.created_by + "</td>";
 -            if (val.group_description) {
 -              appendHTML += "<td>" + val.group_description + "</td>";
 -            } else {
 -              appendHTML += "<td>&nbsp;</td>";
 -            }
 +            appendHTML += '<td><span class="crm-editable crmf-description" data-type="textarea">' + (val.group_description || '') + "</span></td>";
              appendHTML += "<td>" + val.group_type + "</td>";
              appendHTML += "<td>" + val.visibility + "</td>";
+                                               if (showOrgInfo) {
+                                                       appendHTML += "<td>" + val.org_info + "</td>";
+                                               }
              appendHTML += "<td>" + val.links + "</td>";
              appendHTML += "</tr>";
            });

diff --cc templates/CRM/Price/Form/Calculate.tpl
Simple merge

diff --cc tests/phpunit/CiviTest/CiviUnitTestCase.php
Simple merge

diff --cc tests/phpunit/api/v3/GroupContactTest.php
Simple merge