diff --git a/account_banking_sepa_credit_transfer/__init__.py b/account_banking_sepa_credit_transfer/__init__.py index 711d83d4a..0a41c3f07 100644 --- a/account_banking_sepa_credit_transfer/__init__.py +++ b/account_banking_sepa_credit_transfer/__init__.py @@ -2,3 +2,4 @@ # © 2010-2013 Akretion (www.akretion.com) from . import models +from .post_install import update_bank_journals diff --git a/account_banking_sepa_credit_transfer/__openerp__.py b/account_banking_sepa_credit_transfer/__openerp__.py index e3adba80e..90f509f2d 100644 --- a/account_banking_sepa_credit_transfer/__openerp__.py +++ b/account_banking_sepa_credit_transfer/__openerp__.py @@ -23,5 +23,6 @@ 'demo': [ 'demo/sepa_credit_transfer_demo.xml' ], + 'post_init_hook': 'update_bank_journals', 'installable': True, } diff --git a/account_banking_sepa_credit_transfer/post_install.py b/account_banking_sepa_credit_transfer/post_install.py new file mode 100644 index 000000000..631bef653 --- /dev/null +++ b/account_banking_sepa_credit_transfer/post_install.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# © 2016 Akretion (Alexis de Lattre ) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from openerp import SUPERUSER_ID + + +def update_bank_journals(cr, pool): + ajo = pool['account.journal'] + journal_ids = ajo.search( + cr, SUPERUSER_ID, [('type', '=', 'bank')]) + sct_id = pool['ir.model.data'].xmlid_to_res_id( + cr, SUPERUSER_ID, + 'account_banking_sepa_credit_transfer.sepa_credit_transfer') + if sct_id: + ajo.write(cr, SUPERUSER_ID, journal_ids, { + 'outbound_payment_method_ids': [(4, sct_id)], + }) + return diff --git a/account_banking_sepa_direct_debit/__init__.py b/account_banking_sepa_direct_debit/__init__.py index cde864bae..a1815ae51 100644 --- a/account_banking_sepa_direct_debit/__init__.py +++ b/account_banking_sepa_direct_debit/__init__.py @@ -1,3 +1,4 @@ # -*- coding: utf-8 -*- from . import models +from .post_install import update_bank_journals diff --git a/account_banking_sepa_direct_debit/__openerp__.py b/account_banking_sepa_direct_debit/__openerp__.py index d0a9db4c5..d23eb7a93 100644 --- a/account_banking_sepa_direct_debit/__openerp__.py +++ b/account_banking_sepa_direct_debit/__openerp__.py @@ -31,5 +31,6 @@ 'views/report_sepa_direct_debit_mandate.xml', ], 'demo': ['demo/sepa_direct_debit_demo.xml'], + 'post_init_hook': 'update_bank_journals', 'installable': True, } diff --git a/account_banking_sepa_direct_debit/post_install.py b/account_banking_sepa_direct_debit/post_install.py new file mode 100644 index 000000000..1fbd61793 --- /dev/null +++ b/account_banking_sepa_direct_debit/post_install.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# © 2016 Akretion (Alexis de Lattre ) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from openerp import SUPERUSER_ID + + +def update_bank_journals(cr, pool): + ajo = pool['account.journal'] + journal_ids = ajo.search(cr, SUPERUSER_ID, [('type', '=', 'bank')]) + sdd_id = pool['ir.model.data'].xmlid_to_res_id( + cr, SUPERUSER_ID, + 'account_banking_sepa_direct_debit.sepa_direct_debit') + if sdd_id: + ajo.write(cr, SUPERUSER_ID, journal_ids, { + 'inbound_payment_method_ids': [(4, sdd_id)], + }) + return diff --git a/account_payment_mode/models/__init__.py b/account_payment_mode/models/__init__.py index a40aa5c9e..ae4c3c001 100644 --- a/account_payment_mode/models/__init__.py +++ b/account_payment_mode/models/__init__.py @@ -2,4 +2,5 @@ from . import account_payment_method from . import account_payment_mode +from . import account_journal from . import res_partner_bank diff --git a/account_payment_mode/models/account_journal.py b/account_payment_mode/models/account_journal.py new file mode 100644 index 000000000..e9150c523 --- /dev/null +++ b/account_payment_mode/models/account_journal.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# © 2016 Akretion (Alexis de Lattre ) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp import models, fields + + +class AccountJournal(models.Model): + _inherit = 'account.journal' + + def _default_outbound_payment_methods(self): + all_out = self.env['account.payment.method'].search([ + ('payment_type', '=', 'outbound')]) + return all_out + + def _default_inbound_payment_methods(self): + all_in = self.env['account.payment.method'].search([ + ('payment_type', '=', 'inbound')]) + return all_in + + outbound_payment_method_ids = fields.Many2many( + default=_default_outbound_payment_methods) + inbound_payment_method_ids = fields.Many2many( + default=_default_inbound_payment_methods) diff --git a/account_payment_order/models/account_payment_mode.py b/account_payment_order/models/account_payment_mode.py index 1fd4d40a5..263117b96 100644 --- a/account_payment_order/models/account_payment_mode.py +++ b/account_payment_order/models/account_payment_mode.py @@ -54,11 +54,11 @@ class AccountPaymentMode(models.Model): "(other modules can set additional fields to restrict the " "grouping.)") generate_move = fields.Boolean( - 'Generate Accounting Entries On File Upload') + string='Generate Accounting Entries On File Upload', default=True) offsetting_account = fields.Selection([ ('bank_account', 'Bank Account'), ('transfer_account', 'Transfer Account'), - ], string='Offsetting Account') + ], string='Offsetting Account', default='bank_account') transfer_account_id = fields.Many2one( 'account.account', string='Transfer Account', domain=[('internal_type', '=', 'other'), ('reconcile', '=', True)], @@ -72,7 +72,7 @@ class AccountPaymentMode(models.Model): move_option = fields.Selection([ ('date', 'One move per payment date'), ('line', 'One move per payment line'), - ], string='Move Option') + ], string='Move Option', default='date') @api.multi @api.constrains(