Flectra/l10n-switzerland-flectra
1
0
Fork 0
mirror of https://gitlab.com/flectra-community/l10n-switzerland-flectra.git synced 2024-11-16 19:12:04 +00:00
Code Issues Projects Releases Wiki Activity

message now define which provider the ebill is sent

Browse Source 
invocloud xml get now bank clearing number
This commit is contained in:
Kevin Kempf 2022-08-31 09:56:34 +00:00
parent d76fc65c98
commit 7daf54fee2
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebill_paynet/messages/invoice-2013A-invocloud.xml
View File

@ -60,7 +60,7 @@
<Acct-No>{{ bank.sanitized_acc_number }}</Acct-No> <Acct-No>{{ bank.sanitized_acc_number }}</Acct-No>
<Acct-Name>{{ bank.acc_holder_name or bank.partner_id.name }}</Acct-Name> <Acct-Name>{{ bank.acc_holder_name or bank.partner_id.name }}</Acct-Name>
{# Is this the default for e-banking customers ? -#} {# Is this the default for e-banking customers ? -#}
<BankId Type="BCNr-int" Country="CH">209</BankId> <BankId Type="BCNr-int" Country="CH">{{bank.bank_id.clearing}}</BankId>
</BANK-INFO> </BANK-INFO>
</BILLER> </BILLER>
<PAYER> <PAYER>

14
ebill_paynet/models/account_invoice.py
View File

@ -106,28 +106,26 @@ class AccountInvoice(models.Model):
self.ensure_one() self.ensure_one()
return [] return []
def log_invoice_accepted_by_system(self): def log_invoice_accepted_by_system(self, provider = False):
""" """ """ """
self.activity_feedback( self.activity_feedback(
["ebill_paynet.mail_activity_dws_error"], ["ebill_paynet.mail_activity_dws_error"],
feedback="It worked on a later try", feedback="It worked on a later try",
) )
self.message_post(body=_("Invoice accepted by the Paynet system")) self.message_post(body=_("Invoice accepted by the %s system" % (provider)))
self.invoice_export_confirmed = True self.invoice_export_confirmed = True
def log_invoice_refused_by_system(self): def log_invoice_refused_by_system(self, provider = False):
""" """ """ """
activity_type = "ebill_paynet.mail_activity_dws_error" activity_type = "ebill_paynet.mail_activity_dws_error"
activity = self.activity_reschedule( activity = self.activity_reschedule(
[activity_type], date_deadline=fields.Date.today() [activity_type], date_deadline=fields.Date.today()
) )
values = {}
if not activity: if not activity:
message = self.env.ref("ebill_paynet.dws_reject_invoice")._render( message = _("The %s system rejected the eBill that was send." % (provider))
values=values
)
activity = self.activity_schedule( activity = self.activity_schedule(
activity_type, summary="Invoice rejected by Paynet", note=message activity_type, summary="Invoice rejected by %s" % (provider), note=message
) )
# error_log = values.get("error_detail") # error_log = values.get("error_detail")
# if not error_log: # if not error_log:

5
ebill_paynet/models/paynet_invoice_message.py
View File

@ -183,8 +183,9 @@ class PaynetInvoiceMessage(models.Model):
def update_invoice_status(self): def update_invoice_status(self):
"""Update the export status in the chatter.""" """Update the export status in the chatter."""
provider = self.service_id.service_provider if self.service_id.service_provider else 'No provider chosen'
for message in self: for message in self:
if message.state == "done": if message.state == "done":
message.invoice_id.log_invoice_accepted_by_system() message.invoice_id.log_invoice_accepted_by_system(provider)
elif message.state in ["reject", "error"]: elif message.state in ["reject", "error"]:
message.invoice_id.log_invoice_refused_by_system() message.invoice_id.log_invoice_refused_by_system(provider)

4
ebill_paynet/models/paynet_service.py
View File

@ -53,7 +53,7 @@ class PaynetService(models.Model):
readonly=True, readonly=True,
) )
active = fields.Boolean(default=True) active = fields.Boolean(default=True)
#Adjustment to use InvoCloud #Adjustment to use InvoCloud
service_provider = fields.Selection( service_provider = fields.Selection(
selection=[("paynet", "Paynet"), ("invocloud", "InvoCloud")], selection=[("paynet", "Paynet"), ("invocloud", "InvoCloud")],
@ -61,7 +61,7 @@ class PaynetService(models.Model):
default="paynet", default="paynet",
help="There are some specific diference between provider", help="There are some specific diference between provider",
) )
@api.depends("use_test_service") @api.depends("use_test_service")
def _compute_url(self): def _compute_url(self):