mirror of
				https://github.com/brain-tec/account_ebics.git
				synced 2025-11-03 22:50:59 +00:00 
			
		
		
		
	Merge branch '16-file-format-on-payment_mode' into '16.0'
[IMP]EBICS File Format on Payment Mode See merge request Noviat/Noviat_Generic/accounting-ebics!45
This commit is contained in:
		@@ -94,6 +94,7 @@
 | 
				
			|||||||
                        name="format_id"
 | 
					                        name="format_id"
 | 
				
			||||||
                        domain="[('id', 'in', upload_format_ids)]"
 | 
					                        domain="[('id', 'in', upload_format_ids)]"
 | 
				
			||||||
                        required="1"
 | 
					                        required="1"
 | 
				
			||||||
 | 
					                        readonly="context.get('active_model') == 'account.payment.order'"
 | 
				
			||||||
                    />
 | 
					                    />
 | 
				
			||||||
          <field name="order_type" />
 | 
					          <field name="order_type" />
 | 
				
			||||||
          <field
 | 
					          <field
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,9 +16,13 @@ This module depends upon the following modules (cf. apps.odoo.com):
 | 
				
			|||||||
- account_ebics
 | 
					- account_ebics
 | 
				
			||||||
- account_payment_order
 | 
					- account_payment_order
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Configuration
 | 
				
			||||||
 | 
					=============
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Set the EBICS File Format on your Payment Modes.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Usage
 | 
					Usage
 | 
				
			||||||
=====
 | 
					=====
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Create your Payment Order and generate the bank file.
 | 
					Create your Payment Order and generate the bank file.
 | 
				
			||||||
Upload the generated file via the 'EBICS Upload' button on the payment order.
 | 
					Upload the generated file via the 'EBICS Upload' button on the payment order.
 | 
				
			||||||
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,9 +1,9 @@
 | 
				
			|||||||
# Copyright 2009-2023 Noviat.
 | 
					# Copyright 2009-2024 Noviat.
 | 
				
			||||||
# License LGPL-3 or later (http://www.gnu.org/licenses/lgpl).
 | 
					# License LGPL-3 or later (http://www.gnu.org/licenses/lgpl).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    "name": "Upload Payment Order via EBICS",
 | 
					    "name": "Upload Payment Order via EBICS",
 | 
				
			||||||
    "version": "16.0.1.0.0",
 | 
					    "version": "16.0.1.1.0",
 | 
				
			||||||
    "license": "LGPL-3",
 | 
					    "license": "LGPL-3",
 | 
				
			||||||
    "author": "Noviat",
 | 
					    "author": "Noviat",
 | 
				
			||||||
    "website": "https://www.noviat.com/",
 | 
					    "website": "https://www.noviat.com/",
 | 
				
			||||||
@@ -11,6 +11,7 @@
 | 
				
			|||||||
    "depends": ["account_ebics", "account_payment_order"],
 | 
					    "depends": ["account_ebics", "account_payment_order"],
 | 
				
			||||||
    "data": [
 | 
					    "data": [
 | 
				
			||||||
        "views/account_payment_order_views.xml",
 | 
					        "views/account_payment_order_views.xml",
 | 
				
			||||||
 | 
					        "views/account_payment_mode_views.xml",
 | 
				
			||||||
    ],
 | 
					    ],
 | 
				
			||||||
    "images": ["static/description/cover.png"],
 | 
					    "images": ["static/description/cover.png"],
 | 
				
			||||||
    "installable": True,
 | 
					    "installable": True,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1 +1,2 @@
 | 
				
			|||||||
 | 
					from . import account_payment_mode
 | 
				
			||||||
from . import account_payment_order
 | 
					from . import account_payment_order
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										15
									
								
								account_ebics_payment_order/models/account_payment_mode.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								account_ebics_payment_order/models/account_payment_mode.py
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,15 @@
 | 
				
			|||||||
 | 
					# Copyright 2009-2024 Noviat.
 | 
				
			||||||
 | 
					# License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					from odoo import fields, models
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class AccountPaymentMode(models.Model):
 | 
				
			||||||
 | 
					    _inherit = "account.payment.mode"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ebics_format_id = fields.Many2one(
 | 
				
			||||||
 | 
					        comodel_name="ebics.file.format",
 | 
				
			||||||
 | 
					        string="EBICS File Format",
 | 
				
			||||||
 | 
					        domain="[('type', '=', 'up')]",
 | 
				
			||||||
 | 
					        help="Select EBICS File Format to upload.",
 | 
				
			||||||
 | 
					    )
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
# Copyright 2009-2023 Noviat.
 | 
					# Copyright 2009-2024 Noviat.
 | 
				
			||||||
# License LGPL-3 or later (http://www.gnu.org/licenses/lgpl).
 | 
					# License LGPL-3 or later (http://www.gnu.org/licenses/lgpl).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from odoo import _, models
 | 
					from odoo import _, models
 | 
				
			||||||
@@ -10,6 +10,18 @@ class AccountPaymentOrder(models.Model):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    def ebics_upload(self):
 | 
					    def ebics_upload(self):
 | 
				
			||||||
        self.ensure_one()
 | 
					        self.ensure_one()
 | 
				
			||||||
 | 
					        ctx = self._context.copy()
 | 
				
			||||||
 | 
					        ebics_format_id = self.payment_mode_id.ebics_format_id
 | 
				
			||||||
 | 
					        if not ebics_format_id:
 | 
				
			||||||
 | 
					            raise UserError(
 | 
				
			||||||
 | 
					                _("Missing EBICS File Format setting on your Payment Mode.")
 | 
				
			||||||
 | 
					            )
 | 
				
			||||||
 | 
					        ctx.update(
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					                "active_model": self._name,
 | 
				
			||||||
 | 
					                "default_format_id": ebics_format_id.id,
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        )
 | 
				
			||||||
        attach = self.env["ir.attachment"].search(
 | 
					        attach = self.env["ir.attachment"].search(
 | 
				
			||||||
            [("res_model", "=", self._name), ("res_id", "=", self.id)]
 | 
					            [("res_model", "=", self._name), ("res_id", "=", self.id)]
 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -0,0 +1,18 @@
 | 
				
			|||||||
 | 
					<?xml version="1.0" encoding="utf-8" ?>
 | 
				
			||||||
 | 
					<odoo>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <record id="account_payment_mode_form" model="ir.ui.view">
 | 
				
			||||||
 | 
					        <field name="name">account.payment.mode.form</field>
 | 
				
			||||||
 | 
					        <field name="model">account.payment.mode</field>
 | 
				
			||||||
 | 
					        <field name="inherit_id" ref="account_payment_mode.account_payment_mode_form" />
 | 
				
			||||||
 | 
					        <field name="arch" type="xml">
 | 
				
			||||||
 | 
					            <field name="payment_type" position="after">
 | 
				
			||||||
 | 
					                <field
 | 
				
			||||||
 | 
					                    name="ebics_format_id"
 | 
				
			||||||
 | 
					                    attrs="{'invisible': [('payment_order_ok', '=', False)]}"
 | 
				
			||||||
 | 
					                />
 | 
				
			||||||
 | 
					            </field>
 | 
				
			||||||
 | 
					        </field>
 | 
				
			||||||
 | 
					    </record>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					</odoo>
 | 
				
			||||||
		Reference in New Issue
	
	Block a user