[Amazon] Amazon import source for amazon.de

beancount_import/amount_parsing.py

@@ -30,12 +30,18 @@ def parse_amount(x, assumed_currency=None):
     if not x:
         return None
     sign, amount_str = parse_possible_negative(x)
-    m = re.fullmatch(r'(?:[(][^)]+[)])?\s*([\$€£])?((?:[0-9](?:,?[0-9])*|(?=\.))(?:\.[0-9]+)?)(?:\s+([A-Z]{3}))?', amount_str)
+    m = re.fullmatch(r'(?:[(][^)]+[)])?\s*([\$€£]|[A-Z]{3})?\s*((?:[0-9](?:,?[0-9])*|(?=\.))(?:\.[0-9]+)?)(?:\s+([A-Z]{3}))?', amount_str)
     if m is None:
         raise ValueError('Failed to parse amount from %r' % amount_str)
     if m.group(1):
-        currency = {'$': 'USD', '€': 'EUR', '£': 'GBP'}[m.group(1)]
+        # unit before amount
+        if len(m.group(1)) == 3:
+            # 'EUR' or 'USD'
+            currency = m.group(1)
+        else:
+            currency = {'$': 'USD', '€': 'EUR', '£': 'GBP'}[m.group(1)]
     elif m.group(3):
+        # unit after amount
         currency = m.group(3)
     elif assumed_currency is not None:
         currency = assumed_currency

beancount_import/source/amazon.py

@@ -41,6 +41,7 @@
              'Gift Card Amount': 'Assets:Gift-Cards:Amazon',
              'Rewards Points': 'Income:Amazon:Cashback',
          },
+         locale='en_US'  # optional, defaults to 'en_US'
     )
 
 The `amazon_account` key must be specified, and should be set to the email
@@ -54,6 +55,9 @@
 specify these keys in the configuration, the generic automatic account
 prediction will likely handle them.
 
+The `locale` sets country/language specific settings.
+Currently, `en_US` and `de_DE` are available. 
+
 Specifying credit cards
 =======================
 
@@ -264,14 +268,15 @@
 import os
 import sys
 import pickle
+import logging
 
 from beancount.core.data import Transaction, Posting, Balance, Commodity, Price, EMPTY_SET, Directive
 from beancount.core.amount import Amount
 from beancount.core.flags import FLAG_OKAY
 from beancount.core.number import ZERO, ONE
 import beancount.core.amount
 
-from .amazon_invoice import parse_invoice, DigitalItem, Order
+from .amazon_invoice import LOCALES, parse_invoice, DigitalItem, Order
 
 from ..matching import FIXME_ACCOUNT, SimpleInventory
 from ..posting_date import POSTING_DATE_KEY, POSTING_TRANSACTION_DATE_KEY
@@ -280,6 +285,8 @@
 
 import datetime
 
+logger = logging.getLogger('amazon')
+
 ITEM_DESCRIPTION_KEY = 'amazon_item_description'
 ITEM_URL_KEY = 'amazon_item_url'
 ITEM_BY_KEY = 'amazon_item_by'
@@ -300,14 +307,15 @@ def make_amazon_transaction(
         posttax_adjustment_accounts,
         credit_card_accounts,
         amazon_account: str,
+        payee='Amazon.com'
 ):
     txn = Transaction(
         date=invoice.order_date,
         meta=collections.OrderedDict([
             (ORDER_ID_KEY, invoice.order_id),
             (AMAZON_ACCOUNT_KEY, amazon_account),
         ]),
-        payee='Amazon.com',
+        payee=payee,
         narration='Order',
         flag=FLAG_OKAY,
         tags=EMPTY_SET,
@@ -387,7 +395,7 @@ def make_amazon_transaction(
                         (INVOICE_DESCRIPTION, adjustment.description),
                     ]),
                 ))
-        if invoice.tax is not None and invoice.tax.number != ZERO:
+        if len(invoice.tax)>0 and invoice.tax.number != ZERO:
             txn.postings.append(
                 Posting(
                     account=unknown_account_name,
@@ -539,6 +547,7 @@ def __init__(self,
                  posttax_adjustment_accounts: Dict[str, str] = {},
                  pickle_dir: str = None,
                  earliest_date: datetime.date = None,
+                 locale='en_US',
                  **kwargs) -> None:
         super().__init__(**kwargs)
         self.directory = directory
@@ -551,6 +560,7 @@ def __init__(self,
         self.pickler = AmazonPickler(pickle_dir)
 
         self.earliest_date = earliest_date
+        self.locale = LOCALES[locale]
 
         self.invoice_filenames = []  # type: List[Tuple[str, str]]
         for filename in os.listdir(self.directory):
@@ -570,7 +580,7 @@ def _get_invoice(self, results: SourceResults, order_id: str, invoice_filename:
         invoice = self.pickler.load(results, invoice_path) # type: Optional[Order]
         if invoice is None:
             self.log_status('amazon: processing %s: %s' % (order_id, invoice_path, ))
-            invoice = parse_invoice(invoice_path)
+            invoice = parse_invoice(invoice_path, locale=self.locale)
             self.pickler.dump( results, invoice_path, invoice )
 
         self._cached_invoices[invoice_filename] = invoice, invoice_path
@@ -605,7 +615,8 @@ def prepare(self, journal: JournalEditor, results: SourceResults):
                 invoice=invoice,
                 posttax_adjustment_accounts=self.posttax_adjustment_accounts,
                 amazon_account=self.amazon_account,
-                credit_card_accounts=credit_card_accounts)
+                credit_card_accounts=credit_card_accounts,
+                payee=self.locale.payee)
             results.add_pending_entry(
                 ImportResult(
                     date=transaction.date,