mirror of
				https://github.com/brain-tec/account_ebics.git
				synced 2025-11-04 15:10:34 +00:00 
			
		
		
		
	Merge pull request #26 from Noviat/13-multi-company-fix
13 multi company fix
This commit is contained in:
		@@ -110,14 +110,6 @@
 | 
			
		||||
      <field name="suffix">sdd.xml</field>
 | 
			
		||||
    </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">
 | 
			
		||||
      <field name="name">pain.008.001.02.sdd</field>
 | 
			
		||||
      <field name="type">up</field>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
# Copyright 2009-2020 Noviat.
 | 
			
		||||
# Copyright 2009-2021 Noviat.
 | 
			
		||||
# License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
@@ -311,7 +311,9 @@ class EbicsXfer(models.TransientModel):
 | 
			
		||||
                        'user_id': self._uid,
 | 
			
		||||
                        'ebics_userid_id': self.ebics_userid_id.id,
 | 
			
		||||
                        '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)
 | 
			
		||||
                    ebics_file = self.env['ebics.file'].create(ef_vals)
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
# Copyright 2009-2020 Noviat.
 | 
			
		||||
# Copyright 2009-2021 Noviat.
 | 
			
		||||
# License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
 | 
			
		||||
 | 
			
		||||
from odoo import _, models
 | 
			
		||||
@@ -29,6 +29,7 @@ class AccountBatchPayment(models.Model):
 | 
			
		||||
                "default_upload_data": self.export_file,
 | 
			
		||||
                "default_upload_fname": self.export_filename,
 | 
			
		||||
                "origin": origin,
 | 
			
		||||
                'force_comany': self.journal_id.company_id.id,
 | 
			
		||||
            }
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
# Copyright 2009-2020 Noviat.
 | 
			
		||||
# Copyright 2009-2021 Noviat.
 | 
			
		||||
# License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
 | 
			
		||||
 | 
			
		||||
from odoo import _, models
 | 
			
		||||
@@ -41,6 +41,7 @@ class AccountPaymentOrder(models.Model):
 | 
			
		||||
                'default_upload_data': attach.datas,
 | 
			
		||||
                'default_upload_fname': attach.name,
 | 
			
		||||
                'origin': origin,
 | 
			
		||||
                'force_comany': self.company_id.id,
 | 
			
		||||
            })
 | 
			
		||||
            ebics_xfer = self.env['ebics.xfer'].with_context(ctx).create({})
 | 
			
		||||
            ebics_xfer._onchange_ebics_config_id()
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user