mirror of
https://github.com/OCA/contract.git
synced 2025-02-13 17:57:24 +02:00
contract_payment_mode: Several fixes+imps:
* Copy partner payment mode to contracts when installing * Filter payment modes for sales * Adding tests
This commit is contained in:
committed by
Carolina Fernandez
parent
9f8549ee4b
commit
d9e188ea2a
@@ -34,6 +34,7 @@ Contributors
|
|||||||
------------
|
------------
|
||||||
|
|
||||||
* Ángel Moya <angel.moya@domatix.com>
|
* Ángel Moya <angel.moya@domatix.com>
|
||||||
|
* Antonio Espinosa <antonioea@antiun.com>
|
||||||
|
|
||||||
|
|
||||||
Maintainer
|
Maintainer
|
||||||
|
|||||||
@@ -1,2 +1,6 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
# © 2016 Antiun Ingenieria S.L. - Antonio Espinosa
|
||||||
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||||
|
|
||||||
from . import models
|
from . import models
|
||||||
|
from .hooks import post_init_hook
|
||||||
|
|||||||
@@ -35,6 +35,7 @@
|
|||||||
'views/contract_view.xml',
|
'views/contract_view.xml',
|
||||||
],
|
],
|
||||||
'test': ['test/contract_payment_mode.yml'],
|
'test': ['test/contract_payment_mode.yml'],
|
||||||
|
'post_init_hook': 'post_init_hook',
|
||||||
'installable': True,
|
'installable': True,
|
||||||
'auto_install': True,
|
'auto_install': True,
|
||||||
}
|
}
|
||||||
|
|||||||
27
contract_payment_mode/hooks.py
Normal file
27
contract_payment_mode/hooks.py
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# © 2016 Antiun Ingenieria S.L. - Antonio Espinosa
|
||||||
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||||
|
|
||||||
|
from openerp import api, SUPERUSER_ID
|
||||||
|
import logging
|
||||||
|
|
||||||
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
def post_init_hook(cr, registry):
|
||||||
|
"""Copy payment mode from partner to the new field at contract."""
|
||||||
|
with api.Environment.manage():
|
||||||
|
env = api.Environment(cr, SUPERUSER_ID, {})
|
||||||
|
m_contract = env['account.analytic.account']
|
||||||
|
contracts = m_contract.search([
|
||||||
|
('type', '=', 'contract'),
|
||||||
|
('payment_mode_id', '=', False),
|
||||||
|
])
|
||||||
|
if contracts:
|
||||||
|
_logger.info('Setting payment mode: %d contracts' %
|
||||||
|
len(contracts))
|
||||||
|
for contract in contracts:
|
||||||
|
payment_mode = contract.partner_id.customer_payment_mode
|
||||||
|
if payment_mode:
|
||||||
|
contract.payment_mode_id = payment_mode.id
|
||||||
|
_logger.info('Setting payment mode: Done')
|
||||||
@@ -8,7 +8,7 @@ class AccountAnalyticAccount(models.Model):
|
|||||||
payment_mode_id = fields.Many2one(
|
payment_mode_id = fields.Many2one(
|
||||||
'payment.mode',
|
'payment.mode',
|
||||||
string='Payment Mode',
|
string='Payment Mode',
|
||||||
domain="[('type', '=', 'sale')]")
|
domain="[('sale_ok', '=', True)]")
|
||||||
|
|
||||||
@api.multi
|
@api.multi
|
||||||
def on_change_partner_id(self, partner_id, name):
|
def on_change_partner_id(self, partner_id, name):
|
||||||
@@ -23,8 +23,7 @@ class AccountAnalyticAccount(models.Model):
|
|||||||
@api.model
|
@api.model
|
||||||
def _prepare_invoice_data(self, contract):
|
def _prepare_invoice_data(self, contract):
|
||||||
invoice_vals = super(AccountAnalyticAccount, self).\
|
invoice_vals = super(AccountAnalyticAccount, self).\
|
||||||
_prepare_invoice_data(
|
_prepare_invoice_data(contract)
|
||||||
contract)
|
|
||||||
if contract.payment_mode_id:
|
if contract.payment_mode_id:
|
||||||
invoice_vals['payment_mode_id'] = contract.payment_mode_id.id
|
invoice_vals['payment_mode_id'] = contract.payment_mode_id.id
|
||||||
invoice_vals['partner_bank_id'] = \
|
invoice_vals['partner_bank_id'] = \
|
||||||
|
|||||||
5
contract_payment_mode/tests/__init__.py
Normal file
5
contract_payment_mode/tests/__init__.py
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# © 2016 Antiun Ingenieria S.L. - Antonio Espinosa
|
||||||
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||||
|
|
||||||
|
from . import test_contract_payment_init
|
||||||
40
contract_payment_mode/tests/test_contract_payment_init.py
Normal file
40
contract_payment_mode/tests/test_contract_payment_init.py
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# © 2015 Antiun Ingenieria S.L. - Antonio Espinosa
|
||||||
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||||
|
|
||||||
|
from openerp.tests.common import TransactionCase
|
||||||
|
from ..hooks import post_init_hook
|
||||||
|
|
||||||
|
|
||||||
|
class TestContractPaymentInit(TransactionCase):
|
||||||
|
# Use case : Prepare some data for current test case
|
||||||
|
def setUp(self):
|
||||||
|
super(TestContractPaymentInit, self).setUp()
|
||||||
|
self.payment_mode = self.env.ref('account_payment.payment_mode_1')
|
||||||
|
self.partner = self.env['res.partner'].create({
|
||||||
|
'name': 'Test contract partner',
|
||||||
|
'customer_payment_mode': self.payment_mode.id,
|
||||||
|
})
|
||||||
|
|
||||||
|
def _contract_payment_mode_id(self, contract_id):
|
||||||
|
contract = self.env['account.analytic.account'].search([
|
||||||
|
('id', '=', contract_id),
|
||||||
|
])
|
||||||
|
return contract.payment_mode_id.id
|
||||||
|
|
||||||
|
def test_post_init_hook(self):
|
||||||
|
contract = self.env['account.analytic.account'].create({
|
||||||
|
'name': 'Test contract',
|
||||||
|
'type': 'contract',
|
||||||
|
'partner_id': self.partner.id,
|
||||||
|
'payment_mode_id': self.payment_mode.id,
|
||||||
|
})
|
||||||
|
self.assertEqual(self._contract_payment_mode_id(contract.id),
|
||||||
|
self.payment_mode.id)
|
||||||
|
|
||||||
|
contract.payment_mode_id = False
|
||||||
|
self.assertEqual(self._contract_payment_mode_id(contract.id), False)
|
||||||
|
|
||||||
|
post_init_hook(self.cr, self.env)
|
||||||
|
self.assertEqual(self._contract_payment_mode_id(contract.id),
|
||||||
|
self.payment_mode.id)
|
||||||
Reference in New Issue
Block a user