From e9840da1249f2e0adcea792fcda0666a50bf766c Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Wed, 6 Nov 2013 16:23:06 +0100
Subject: [PATCH 1/2] [IMP] adapt parser __init__ to new signature

---
 .../parser/transactionid_file_parser.py       | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/account_statement_transactionid_import/parser/transactionid_file_parser.py b/account_statement_transactionid_import/parser/transactionid_file_parser.py
index ecc5d054..c3a4a644 100644
--- a/account_statement_transactionid_import/parser/transactionid_file_parser.py
+++ b/account_statement_transactionid_import/parser/transactionid_file_parser.py
@@ -27,16 +27,21 @@ class TransactionIDFileParser(FileParser):
     bank statement.
     """
 
-    def __init__(self, parse_name, ftype='csv'):
-        conversion_dict = {'transaction_id': unicode,
-                           'label': unicode,
-                           'date': datetime.datetime,
-                           'amount': float,
-                           'commission_amount': float}
-        # Order of cols does not matter but first row of the file has to be header
-        keys_to_validate = ['transaction_id', 'label', 'date', 'amount', 'commission_amount']
-        super(TransactionIDFileParser, self).__init__(parse_name, keys_to_validate=keys_to_validate,
-                                                      ftype=ftype, conversion_dict=conversion_dict)
+    def __init__(self, parse_name, ftype='csv', extra_fields=None, header=None, **kwargs):
+        """
+        Add transaction_id in header keys
+            :param char: parse_name: The name of the parser
+            :param char: ftype: extension of the file (could be csv or xls)
+            :param dict: extra_fields: extra fields to add to the conversion dict. In the format
+                                     {fieldname: fieldtype}
+            :param list: header : specify header fields if the csv file has no header
+            """
+        extra_fields = {'transaction_id': unicode}
+        super(TransactionIDFileParser, self).__init__(parse_name, extra_fields=extra_fields,
+                                                      ftype=ftype, header=header, **kwargs)
+        # ref is replaced by transaction_id thus we delete it from check
+        self.keys_to_validate = [k for k in self.keys_to_validate if k != 'ref']
+        del self.conversion_dict['ref']
 
     @classmethod
     def parser_for(cls, parser_name):

From 112a4b5b85a1bad8d9dd9cb2388fa0b18e130df2 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Wed, 6 Nov 2013 16:23:49 +0100
Subject: [PATCH 2/2] [REM] commission computation, this has to be done by
 account_statement_commission

---
 .../parser/transactionid_file_parser.py               | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/account_statement_transactionid_import/parser/transactionid_file_parser.py b/account_statement_transactionid_import/parser/transactionid_file_parser.py
index c3a4a644..0a54b1e5 100644
--- a/account_statement_transactionid_import/parser/transactionid_file_parser.py
+++ b/account_statement_transactionid_import/parser/transactionid_file_parser.py
@@ -78,14 +78,3 @@ class TransactionIDFileParser(FileParser):
                 'label': line.get('label', ''),
                 'transaction_id': line.get('transaction_id', '/'),
                 'commission_amount': line.get('commission_amount', 0.0)}
-
-    def _post(self, *args, **kwargs):
-        """
-        Compute the commission from value of each line
-        """
-        res = super(TransactionIDFileParser, self)._post(*args, **kwargs)
-        val = 0.0
-        for row in self.result_row_list:
-            val += row.get('commission_amount', 0.0)
-        self.commission_global_amount = val
-        return res