-
+
This module is maintained by the OCA.
OCA, or the Odoo Community Association, is a nonprofit organization whose
diff --git a/account_bank_statement_import_paypal/tests/__init__.py b/account_bank_statement_import_paypal/tests/__init__.py
new file mode 100644
index 0000000..8160886
--- /dev/null
+++ b/account_bank_statement_import_paypal/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_paypal_statement_import
diff --git a/account_bank_statement_import_paypal/tests/paypal_en.csv b/account_bank_statement_import_paypal/tests/paypal_en.csv
new file mode 100644
index 0000000..f3ef282
--- /dev/null
+++ b/account_bank_statement_import_paypal/tests/paypal_en.csv
@@ -0,0 +1,3 @@
+"Date","Time","Time Zone","Description","Currency","Gross","Fee ","Net","Balance","Transaction ID","From Email Address","Name","Bank Name","Bank Account","Shipping and Handling Amount","Sales Tax","Invoice ID","Reference Txn ID"
+"12/15/2018","20:07:53","CET","Your best supplier","USD","-33,50","-2,3","-31,2","-31,2","53820712527632627","","John Doe","Bank of America","123456789","0","0","INV25","23"
+"12/15/2018","22:07:53","CET","Your payment","USD","525","0","525","493,80","34731322767782103","","Agrolait","","","0","0","INV/2019/0003","24"
diff --git a/account_bank_statement_import_paypal/tests/test_paypal_statement_import.py b/account_bank_statement_import_paypal/tests/test_paypal_statement_import.py
new file mode 100644
index 0000000..7b24197
--- /dev/null
+++ b/account_bank_statement_import_paypal/tests/test_paypal_statement_import.py
@@ -0,0 +1,54 @@
+# Copyright 2019 Tecnativa - Vicent Cubells
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+import os
+import base64
+from odoo.tests import common
+
+
+class TestPaypalFile(common.SavepointCase):
+ @classmethod
+ def setUpClass(cls):
+ super(TestPaypalFile, cls).setUpClass()
+
+ cls.map = cls.env['account.bank.statement.import.paypal.map'].create({
+ 'name': 'Paypal Map Test',
+ })
+ cls.journal = cls.env['account.journal'].create({
+ 'name': 'Paypal Bank',
+ 'type': 'bank',
+ 'code': 'PYPAL',
+ })
+
+ def _do_import(self, file_name):
+ file_name = os.path.join(os.path.dirname(__file__), file_name)
+ return open(file_name).read()
+
+ def test_import_header(self):
+ file = self._do_import('paypal_en.csv')
+ file = base64.b64encode(file.encode("utf-8"))
+ wizard = self.env['wizard.paypal.map.create'].with_context({
+ 'journal_id': self.journal.id,
+ 'active_ids': [self.map.id],
+ }).create({'data_file': file})
+ wizard.create_map_lines()
+ self.assertEqual(len(self.map.map_line_ids.ids), 18)
+
+ def test_import_paypal_file(self):
+ # Current statements before to run the wizard
+ old_statements = self.env['account.bank.statement'].search([])
+ # This journal is for Paypal statements
+ map = self.env.ref('account_bank_statement_import_paypal.paypal_map')
+ self.journal.paypal_map_id = map.id
+ file = self._do_import('paypal_en.csv')
+ file = base64.b64encode(file.encode("utf-8"))
+ wizard = self.env['account.bank.statement.import'].with_context({
+ 'journal_id': self.journal.id,
+ }).create({'data_file': file})
+ wizard.import_file()
+ staments_now = self.env['account.bank.statement'].search([])
+ statement = staments_now - old_statements
+ self.assertEqual(len(statement.line_ids), 3)
+ self.assertEqual(len(statement.mapped('line_ids').filtered(
+ lambda x: x.partner_id and x.account_id)), 1)
+ self.assertAlmostEqual(sum(statement.mapped('line_ids.amount')), 489.2)
diff --git a/account_bank_statement_import_paypal/views/account_journal_views.xml b/account_bank_statement_import_paypal/views/account_journal_views.xml
new file mode 100644
index 0000000..3e565b7
--- /dev/null
+++ b/account_bank_statement_import_paypal/views/account_journal_views.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ account.journal
+
+
+
+
+
+
+
+
+
+
+
diff --git a/account_bank_statement_import_paypal/views/paypal_map_views.xml b/account_bank_statement_import_paypal/views/paypal_map_views.xml
new file mode 100644
index 0000000..c3a40ba
--- /dev/null
+++ b/account_bank_statement_import_paypal/views/paypal_map_views.xml
@@ -0,0 +1,65 @@
+
+
+
+
+ account.bank.statement.import.paypal.map
+
+
+
+
+
+
+
+
+ account.bank.statement.import.paypal.map
+
+
+
+
+
+
+ account.bank.statement.import.paypal.map.line
+
+
+
+
+
+
+
+
+
+
+
+ account.bank.statement.import.paypal.map.line
+
+
+
+
+
+
+ Paypal Mapping
+ account.bank.statement.import.paypal.map
+ form
+ tree,form
+
+
+
+
+
diff --git a/account_bank_statement_import_paypal/wizards/__init__.py b/account_bank_statement_import_paypal/wizards/__init__.py
new file mode 100644
index 0000000..006d24c
--- /dev/null
+++ b/account_bank_statement_import_paypal/wizards/__init__.py
@@ -0,0 +1,2 @@
+from . import create_map_lines_from_file
+from . import account_bank_statement_import_paypal
diff --git a/account_bank_statement_import_paypal/models/account_bank_statement_import_paypal.py b/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py
similarity index 83%
rename from account_bank_statement_import_paypal/models/account_bank_statement_import_paypal.py
rename to account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py
index e15d15f..be82f8c 100644
--- a/account_bank_statement_import_paypal/models/account_bank_statement_import_paypal.py
+++ b/account_bank_statement_import_paypal/wizards/account_bank_statement_import_paypal.py
@@ -37,6 +37,12 @@ HEADERS = [
class AccountBankStatementImport(models.TransientModel):
_inherit = 'account.bank.statement.import'
+ paypal_map_id = fields.Many2one(
+ comodel_name='account.bank.statement.import.paypal.map',
+ string='Paypal map',
+ readonly=True,
+ )
+
@api.model
def _get_paypal_encoding(self):
return 'utf-8-sig'
@@ -47,11 +53,6 @@ class AccountBankStatementImport(models.TransientModel):
data_file = data_file.decode(self._get_paypal_encoding())
return data_file.strip()
- @api.model
- def _get_paypal_date_format(self):
- """ This method is designed to be inherited """
- return '%d/%m/%Y'
-
@api.model
def _paypal_convert_amount(self, amount_str):
""" This method is designed to be inherited """
@@ -63,31 +64,33 @@ class AccountBankStatementImport(models.TransientModel):
@api.model
def _check_paypal(self, data_file):
data_file = self._get_paypal_str_data(data_file)
- for header in HEADERS:
- if data_file.strip().startswith(header):
- return True
- return False
+ if not self.paypal_map_id:
+ return False
+ headers = self.mapped('paypal_map_id.map_line_ids.name')
+ file_headers = data_file.split('\n', 1)[0]
+ if any(item not in file_headers for item in headers):
+ raise UserError(
+ _("Headers of file to import and Paypal map lines does not "
+ "match."))
+ return True
def _convert_paypal_line_to_dict(self, idx, line):
- date_dt = datetime.strptime(line[0], self._get_paypal_date_format())
- rline = {
- 'date': fields.Date.to_string(date_dt),
- 'time': line[1],
- 'description': line[3],
- 'currency': line[4],
- 'amount': line[5],
- 'commission': line[6],
- 'balance': line[8],
- 'transaction_id': line[9],
- 'email': line[10],
- 'partner_name': line[11],
- # This two field are useful for bank transfer
- 'bank_name': line[12],
- 'bank_account': line[13],
- 'invoice_number': line[16],
- 'origin_transaction_id': line[17],
- 'idx': idx,
- }
+ rline = dict()
+ for item in range(len(line)):
+ map = self.mapped('paypal_map_id.map_line_ids')[item]
+ value = line[item]
+ if not map.field_to_assign:
+ continue
+ if map.date_format:
+ try:
+ value = fields.Date.to_string(
+ datetime.strptime(value, map.date_format))
+ except Exception:
+ raise UserError(
+ _("Date format of map file and Paypal date does "
+ "not match."))
+ rline[map.field_to_assign] = value
+
for field in ['commission', 'amount', 'balance']:
_logger.debug('Trying to convert %s to float' % rline[field])
try:
@@ -128,11 +131,14 @@ class AccountBankStatementImport(models.TransientModel):
'transaction_id': cline['transaction_id'],
}
- def _post_process_statement_line(self, raw_lines):
+ def _get_journal(self):
journal_id = self.env.context.get('journal_id')
if not journal_id:
raise UserError(_('You must run this wizard from the journal'))
- journal = self.env['account.journal'].browse(journal_id)
+ return self.env['account.journal'].browse(journal_id)
+
+ def _post_process_statement_line(self, raw_lines):
+ journal = self._get_journal()
currency = journal.currency_id or journal.company_id.currency_id
currency_change_lines = {}
real_transactions = []
@@ -265,17 +271,24 @@ class AccountBankStatementImport(models.TransientModel):
if partner:
return {
'partner_id': partner.id,
- 'account_id': partner.property_account_receivable.id,
+ 'account_id': partner.property_account_receivable_id.id,
}
return None
@api.model
- def _complete_statement(self, stmts_vals, journal_id, account_number):
+ def _complete_stmts_vals(self, stmts_vals, journal_id, account_number):
""" Match the partner from paypal information """
- stmts_vals = super(AccountBankStatementImport, self).\
- _complete_statement(stmts_vals, journal_id, account_number)
- for line in stmts_vals['transactions']:
+ stmts_vals = super(AccountBankStatementImport, self). \
+ _complete_stmts_vals(stmts_vals, journal_id, account_number)
+ for line in stmts_vals[0]['transactions']:
vals = self._complete_paypal_statement_line(line)
if vals:
line.update(vals)
return stmts_vals
+
+ @api.model
+ def default_get(self, fields):
+ res = super(AccountBankStatementImport, self).default_get(fields)
+ journal = self._get_journal()
+ res['paypal_map_id'] = journal.paypal_map_id.id
+ return res
diff --git a/account_bank_statement_import_paypal/wizards/account_bank_statement_import_view.xml b/account_bank_statement_import_paypal/wizards/account_bank_statement_import_view.xml
new file mode 100644
index 0000000..ecb7364
--- /dev/null
+++ b/account_bank_statement_import_paypal/wizards/account_bank_statement_import_view.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ account.bank.statement.import
+
+
+
+ Paypal with Template:
+
+
+
+
+
diff --git a/account_bank_statement_import_paypal/wizards/create_map_lines_from_file.py b/account_bank_statement_import_paypal/wizards/create_map_lines_from_file.py
new file mode 100644
index 0000000..139ae53
--- /dev/null
+++ b/account_bank_statement_import_paypal/wizards/create_map_lines_from_file.py
@@ -0,0 +1,38 @@
+# Copyright 2019 Tecnativa - Vicent Cubells
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+import csv
+import base64
+from odoo import api, fields, models
+from io import StringIO
+
+
+class WizardPaypalMapCreate(models.TransientModel):
+ _name = 'wizard.paypal.map.create'
+
+ data_file = fields.Binary(
+ string='Bank Statement File',
+ required=True,
+ )
+ filename = fields.Char()
+
+ @api.multi
+ def create_map_lines(self):
+ statement_obj = self.env['account.bank.statement.import.paypal.map']
+ data_file = base64.b64decode(self.data_file)
+ if not isinstance(data_file, str):
+ data_file = data_file.decode('utf-8-sig').strip()
+ file = StringIO(data_file)
+ file.seek(0)
+ reader = csv.reader(file)
+ headers = []
+ for row in reader:
+ headers = row
+ break
+ lines = []
+ for idx, title in enumerate(headers):
+ lines.append((0, 0, {'sequence': idx, 'name': title}))
+ if lines:
+ for statement in statement_obj.browse(
+ self.env.context.get('active_ids')):
+ statement.map_line_ids = lines
diff --git a/account_bank_statement_import_paypal/wizards/create_map_lines_from_file_views.xml b/account_bank_statement_import_paypal/wizards/create_map_lines_from_file_views.xml
new file mode 100644
index 0000000..c61136d
--- /dev/null
+++ b/account_bank_statement_import_paypal/wizards/create_map_lines_from_file_views.xml
@@ -0,0 +1,29 @@
+
+
+
+
+ Create Paypal Map Lines
+ wizard.paypal.map.create
+
+
+
+
+
+
+
