Merge pull request #11572 from civicrm/4.7.30-rc

4.7.30 rc to master

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

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

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

diff --cc tests/phpunit/CRM/Contribute/Form/ContributionTest.php
index 005ca08bf4822a35d9eda5f4e47b8dc9c86c92fe,cb565d468fb7b383cf94f8087e5d342ae932ba71..60e6d2cecd5ed6974614ed0a93675bab7235ed6e
--- 1/tests/phpunit/CRM/Contribute/Form/ContributionTest.php
--- 2/tests/phpunit/CRM/Contribute/Form/ContributionTest.php
+++ b/tests/phpunit/CRM/Contribute/Form/ContributionTest.php
@@@ -143,12 -143,19 +143,17 @@@ class CRM_Contribute_Form_ContributionT
  
    /**
     * Test the submit function on the contribution page.
+    *
+    * @param string $thousandSeparator
+    *
+    * @dataProvider getThousandSeparators
     */
-   public function testSubmit() {
+   public function testSubmit($thousandSeparator) {
+     $this->setCurrencySeparators($thousandSeparator);
      $form = new CRM_Contribute_Form_Contribution();
      $form->testSubmit(array(
-       'total_amount' => 50,
+       'total_amount' => $this->formatMoneyInput(1234),
        'financial_type_id' => 1,
 -      'receive_date' => '04/21/2015',
 -      'receive_date_time' => '11:27PM',
        'contact_id' => $this->_individualId,
        'payment_instrument_id' => array_search('Check', $this->paymentInstruments),
        'contribution_status_id' => 1,

diff --cc tests/phpunit/CRM/Member/Form/MembershipTest.php
Simple merge