Merge branch 'master' of github.com:domify/registry

app/models/bank_transaction.rb

@@ -75,7 +75,7 @@ class BankTransaction < ActiveRecord::Base
     create_account_activity(
       account: registrar.cash_account,
       invoice: invoice,
-      sum: sum,
+      sum: invoice.sum_without_vat,
       currency: currency,
       description: description
     )

config/initializers/settings.rb

@@ -1,6 +1,4 @@
 TEST_EMAILS = %w(
-  martin@gitlab.eu
-  priit@gitlab.eu
   timo.vohmar@internet.ee
   rene.vahtel@internet.ee
   martin.mettig@internet.ee
@@ -9,6 +7,9 @@ TEST_EMAILS = %w(
   norman.aeg@internet.ee
   martti.oigus@internet.ee
   jana.jarve@internet.ee
+  martin@gitlab.eu
+  priit@gitlab.eu
+  info@gitlab.eu
   test@example.com
   test@example.org
 )

doc/repp-doc.md

@@ -1,7 +1,7 @@
 # REPP integration specification
 
 REPP uses currently Basic Authentication (http://tools.ietf.org/html/rfc2617#section-2) with ssl certificate and key.
-Credentials and certificate are issued by EIS (in an exchange for desired API username, CSR (where CN must match username) and IP).
+Credentials and certificate are issued by EIS (in an exchange for desired API username, CSR and IP).
 
 To quickly test the API, use curl:
 

spec/models/bank_statement_spec.rb

@@ -63,7 +63,7 @@ describe BankStatement do
 
       AccountActivity.count.should == 1
 
-      r.cash_account.balance.should == 240.0
+      r.cash_account.balance.should == 200.0
 
       bs.bank_transactions.unbinded.count.should == 1
       bs.partially_binded?.should == true

spec/models/bank_transaction_spec.rb

@@ -45,7 +45,7 @@ describe BankTransaction do
       bt.bind_invoice(invoice.number)
 
       invoice.receipt_date.should_not be_blank
-      r.cash_account.balance.should == 240.0
+      r.cash_account.balance.should == 200.0
     end
 
     it 'should not bind transaction with mismatching sums' do