Merge branch 'next' of https://github.com/jwiegley/ledger into next

src/csv.cc

@@ -243,7 +243,7 @@ xact_t * csv_reader::read_xact(bool rich_data)
 
   // Translate the account name, if we have enough information to do so
 
-  foreach (account_mapping_t& value, context.journal->account_mappings) {
+  foreach (account_mapping_t& value, context.journal->payees_for_unknown_accounts) {
     if (value.first.match(xact->payee)) {
       post->account = value.second;
       break;

test/RegressTests.py

@@ -98,8 +98,10 @@ class RegressFile(object):
 
     def run_test(self, test):
         use_stdin = False
-        if test['command'].find("-f - ") != -1:
-            use_stdin = True
+        if test['command'].find("-f ") != -1:
+            test['command'] = '$ledger ' + test['command']
+            if test['command'].find("-f - ") != -1:
+                use_stdin = True
         else:
             test['command'] = (('$ledger -f "%s" ' % 
                                 os.path.abspath(self.filename)) +

test/baseline/feat-convert-with-diretives.dat

@@ -0,0 +1,3 @@
+date,payee,amount
+2012/01/01,KFC,$10
+2012/01/02,"REWE SAGT DANKE  123454321",10€

test/baseline/feat-convert-with-diretives.test

@@ -0,0 +1,28 @@
+account Expenses:Food
+    payee KFC
+    payee REWE
+
+payee REWE
+    alias REWE SAGT DANKE
+
+# When reading csv file without directives:
+test -f /dev/null convert test/baseline/feat-convert-with-diretives.dat
+2012/01/01 * KFC
+    Expenses:Unknown                             $10
+    Equity:Unknown
+
+2012/01/02 * REWE SAGT DANKE  123454321
+    Expenses:Unknown                             10€
+    Equity:Unknown
+end test
+
+# When reading csv file with directives:
+test --account "Assets:Cash" convert test/baseline/feat-convert-with-diretives.dat
+2012/01/01 * KFC
+    Expenses:Food                                $10
+    Assets:Cash
+
+2012/01/02 * REWE
+    Expenses:Food                                10€
+    Assets:Cash
+end test