audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] move the payment term filter to a standalone module account_payment_mode_term

Browse Source
This commit is contained in:
Stéphane Bidoul
2014-09-30 19:16:31 +02:00
parent 92460ac7c9
commit d0d2b5ef62
8 changed files with 130 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
account_banking_payment_transfer/model/__init__.py
View File

@@ -1,5 +1,4 @@
from . import account_payment
from . import payment_line
from . import payment_mode
from . import payment_order_create
from . import account_move_reconcile

47
account_banking_payment_transfer/model/payment_order_create.py
View File

@@ -1,47 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (C) 2009 EduSense BV (<http://www.edusense.nl>).
# (C) 2011 - 2013 Therp BV (<http://therp.nl>).
# (C) 2014 ACSONE SA/NV (<http://acsone.eu>).
#
# All other contributions are (C) by their respective contributors
#
# All Rights Reserved
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from openerp.osv import orm
# TODO: extract this in anoter module such as account_banking_payment_term
class payment_order_create(orm.TransientModel):
_inherit = 'payment.order.create'
def extend_payment_order_domain(
self, cr, uid, payment_order, domain, context=None):
super(payment_order_create, self).extend_payment_order_domain(
cr, uid, payment_order, domain, context=context)
# apply payment term filter
if payment_order.mode.payment_term_ids:
domain += [
('invoice.payment_term', 'in',
[term.id for term in payment_order.mode.payment_term_ids]
)
]
return True

40
account_banking_payment_transfer/view/payment_mode.xml
View File

@@ -3,7 +3,7 @@
<data>
<!--
Add the payment mode type and transfer settings
Add the payment mode transfer account settings
-->
<record id="view_payment_mode_form_inherit" model="ir.ui.view">
<field name="name">payment.mode.form.inherit</field>
@@ -11,29 +11,21 @@
<field name="inherit_id" ref="account_banking_payment_export.view_payment_mode_form_inherit"/>
<field name="arch" type="xml">
<field name="type" position="after">
<group colspan="4" col="4">
<group colspan="2">
<separator colspan="2"
string="Transfer move settings" />
<field name="transfer_account_id"
domain="[('type', '=', 'other'),
('reconcile', '=', True),
('company_id', '=', company_id)]"
context="{
'default_type': 'other',
'default_reconcile': True,
'default_company_id': company_id}"
/>
<field name="transfer_journal_id"
domain="[('company_id', '=', company_id)]"
/>
</group>
<group colspan="2">
<!-- TODO: extract to account_banking_payment_term -->
<separator colspan="2"
string="Optional filter by payment term" />
<field name="payment_term_ids" nolabel="1" colspan="2"/>
</group>
<group colspan="2">
<separator colspan="2"
string="Transfer move settings" />
<field name="transfer_account_id"
domain="[('type', '=', 'other'),
('reconcile', '=', True),
('company_id', '=', company_id)]"
context="{
'default_type': 'other',
'default_reconcile': True,
'default_company_id': company_id}"
/>
<field name="transfer_journal_id"
domain="[('company_id', '=', company_id)]"
/>
</group>
</field>
</field>