mirror of
https://github.com/OCA/bank-statement-import.git
synced 2025-01-20 12:37:43 +02:00
@@ -156,34 +156,32 @@ class OnlineBankStatementProviderPonto(models.Model):
|
||||
response = requests.get(
|
||||
page_url, params=params, headers=self._ponto_header()
|
||||
)
|
||||
if response.status_code == 200:
|
||||
if params.get("before"):
|
||||
params.pop("before")
|
||||
data = json.loads(response.text)
|
||||
links = data.get("links", {})
|
||||
if page_next:
|
||||
page_url = links.get("next", False)
|
||||
else:
|
||||
page_url = links.get("prev", False)
|
||||
transactions = data.get("data", [])
|
||||
if transactions:
|
||||
current_transactions = []
|
||||
for transaction in transactions:
|
||||
date = self._ponto_date_from_string(
|
||||
transaction.get("attributes", {}).get("executionDate")
|
||||
)
|
||||
if date_since <= date < date_until:
|
||||
current_transactions.append(transaction)
|
||||
|
||||
if current_transactions:
|
||||
if not page_next or (page_next and not latest_identifier):
|
||||
latest_identifier = current_transactions[0].get("id")
|
||||
transaction_lines.extend(current_transactions)
|
||||
else:
|
||||
if response.status_code != 200:
|
||||
raise UserError(
|
||||
_("Error during get transaction.\n\n%s \n\n %s")
|
||||
% (response.status_code, response.text)
|
||||
)
|
||||
if params.get("before"):
|
||||
params.pop("before")
|
||||
data = json.loads(response.text)
|
||||
links = data.get("links", {})
|
||||
if page_next:
|
||||
page_url = links.get("next", False)
|
||||
else:
|
||||
page_url = links.get("prev", False)
|
||||
transactions = data.get("data", [])
|
||||
if transactions:
|
||||
current_transactions = []
|
||||
for transaction in transactions:
|
||||
date = self._ponto_date_from_string(
|
||||
transaction.get("attributes", {}).get("executionDate")
|
||||
)
|
||||
if date_since <= date < date_until:
|
||||
current_transactions.append(transaction)
|
||||
if current_transactions:
|
||||
if not page_next or (page_next and not latest_identifier):
|
||||
latest_identifier = current_transactions[0].get("id")
|
||||
transaction_lines.extend(current_transactions)
|
||||
if latest_identifier:
|
||||
self.ponto_last_identifier = latest_identifier
|
||||
return transaction_lines
|
||||
@@ -197,6 +195,7 @@ class OnlineBankStatementProviderPonto(models.Model):
|
||||
return dt.replace(tzinfo=None)
|
||||
|
||||
def _ponto_obtain_statement_data(self, date_since, date_until):
|
||||
"""Translate information from Ponto to Odoo bank statement lines."""
|
||||
self.ensure_one()
|
||||
account_ids = self._ponto_get_account_ids()
|
||||
journal = self.journal_id
|
||||
@@ -215,27 +214,33 @@ class OnlineBankStatementProviderPonto(models.Model):
|
||||
sequence = 0
|
||||
for transaction in transaction_lines:
|
||||
sequence += 1
|
||||
attributes = transaction.get("attributes", {})
|
||||
ref_list = [
|
||||
attributes.get(x)
|
||||
for x in {"description", "counterpartName", "counterpartReference"}
|
||||
if attributes.get(x)
|
||||
]
|
||||
ref = " ".join(ref_list)
|
||||
date = self._ponto_date_from_string(attributes.get("executionDate"))
|
||||
vals_line = {
|
||||
"sequence": sequence,
|
||||
"date": date,
|
||||
"ref": re.sub(" +", " ", ref) or "/",
|
||||
"payment_ref": attributes.get("remittanceInformation", ref),
|
||||
"unique_import_id": transaction["id"],
|
||||
"amount": attributes["amount"],
|
||||
}
|
||||
if attributes.get("counterpartReference"):
|
||||
vals_line["account_number"] = attributes["counterpartReference"]
|
||||
if attributes.get("counterpartName"):
|
||||
vals_line["partner_name"] = attributes["counterpartName"]
|
||||
vals_line = self._ponto_get_transaction_vals(transaction, sequence)
|
||||
new_transactions.append(vals_line)
|
||||
if new_transactions:
|
||||
return new_transactions, {}
|
||||
return
|
||||
|
||||
def _ponto_get_transaction_vals(self, transaction, sequence):
|
||||
"""Translate information from Ponto to statement line vals."""
|
||||
attributes = transaction.get("attributes", {})
|
||||
ref_list = [
|
||||
attributes.get(x)
|
||||
for x in {"description", "counterpartName", "counterpartReference"}
|
||||
if attributes.get(x)
|
||||
]
|
||||
ref = " ".join(ref_list)
|
||||
date = self._ponto_date_from_string(attributes.get("executionDate"))
|
||||
vals_line = {
|
||||
"sequence": sequence,
|
||||
"date": date,
|
||||
"ref": re.sub(" +", " ", ref) or "/",
|
||||
"payment_ref": attributes.get("remittanceInformation", ref),
|
||||
"unique_import_id": transaction["id"],
|
||||
"amount": attributes["amount"],
|
||||
"online_raw_data": transaction,
|
||||
}
|
||||
if attributes.get("counterpartReference"):
|
||||
vals_line["account_number"] = attributes["counterpartReference"]
|
||||
if attributes.get("counterpartName"):
|
||||
vals_line["partner_name"] = attributes["counterpartName"]
|
||||
return vals_line
|
||||
|
||||
Reference in New Issue
Block a user