Mirror/odoo_account_ebics
2
0
Fork 0
mirror of https://github.com/brain-tec/account_ebics.git synced 2024-11-22 12:12:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26 from Noviat/13-multi-company-fix

Browse Source 
13 multi company fix
This commit is contained in:
Luc De Meyer 2021-01-07 09:10:48 +01:00 committed by GitHub
commit 5bdbaf38a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
account_ebics/data/ebics_file_format.xml
View File

@ -110,14 +110,6 @@
<field name="suffix">sdd.xml</field> <field name="suffix">sdd.xml</field>
</record> </record>
<record id="ebics_ff_CDD" model="ebics.file.format">
<field name="name">pain.008.001.02.sdd</field>
<field name="type">up</field>
<field name="order_type">CDD</field>
<field name="description">Sepa Core Direct Debit Order in format pain.008.001.02</field>
<field name="suffix">sdd.xml</field>
</record>
<record id="ebics_ff_XE3" model="ebics.file.format"> <record id="ebics_ff_XE3" model="ebics.file.format">
<field name="name">pain.008.001.02.sdd</field> <field name="name">pain.008.001.02.sdd</field>
<field name="type">up</field> <field name="type">up</field>

6
account_ebics/wizards/ebics_xfer.py
View File

@ -1,4 +1,4 @@
# Copyright 2009-2020 Noviat. # Copyright 2009-2021 Noviat.
# License LGPL-3 or later (http://www.gnu.org/licenses/lpgl). # License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
""" """
@ -311,7 +311,9 @@ class EbicsXfer(models.TransientModel):
'user_id': self._uid, 'user_id': self._uid,
'ebics_userid_id': self.ebics_userid_id.id, 'ebics_userid_id': self.ebics_userid_id.id,
'note': ef_note, 'note': ef_note,
'company_ids': [self.env.user.company_id.id], "company_ids": [
self.env.context.get("force_company", self.env.company.id)
],
} }
self._update_ef_vals(ef_vals) self._update_ef_vals(ef_vals)
ebics_file = self.env['ebics.file'].create(ef_vals) ebics_file = self.env['ebics.file'].create(ef_vals)

3
account_ebics_batch_payment/models/account_batch_payment.py
View File

@ -1,4 +1,4 @@
# Copyright 2009-2020 Noviat. # Copyright 2009-2021 Noviat.
# License LGPL-3 or later (http://www.gnu.org/licenses/lpgl). # License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
from odoo import _, models from odoo import _, models
@ -29,6 +29,7 @@ class AccountBatchPayment(models.Model):
"default_upload_data": self.export_file, "default_upload_data": self.export_file,
"default_upload_fname": self.export_filename, "default_upload_fname": self.export_filename,
"origin": origin, "origin": origin,
'force_comany': self.journal_id.company_id.id,
} }
) )

3
account_ebics_payment_order/models/account_payment_order.py
View File

@ -1,4 +1,4 @@
# Copyright 2009-2020 Noviat. # Copyright 2009-2021 Noviat.
# License LGPL-3 or later (http://www.gnu.org/licenses/lpgl). # License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
from odoo import _, models from odoo import _, models
@ -41,6 +41,7 @@ class AccountPaymentOrder(models.Model):
'default_upload_data': attach.datas, 'default_upload_data': attach.datas,
'default_upload_fname': attach.name, 'default_upload_fname': attach.name,
'origin': origin, 'origin': origin,
'force_comany': self.company_id.id,
}) })
ebics_xfer = self.env['ebics.xfer'].with_context(ctx).create({}) ebics_xfer = self.env['ebics.xfer'].with_context(ctx).create({})
ebics_xfer._onchange_ebics_config_id() ebics_xfer._onchange_ebics_config_id()