audrius/account-financial-tools
1
0
Fork 0
mirror of https://github.com/OCA/account-financial-tools.git synced 2025-02-02 12:47:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #167 from acsone/8.0-imp-credit-control-total-due-ape

Browse Source 
[IMP][Credit Control] Include the fees in the total due
This commit is contained in:
Guewen Baconnier
2015-03-16 16:05:49 +01:00
parent ee857c8ddd 846819a732
commit b8e8c83394
4 changed files with 69 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
account_credit_control/wizard/credit_control_communication.py
View File

@@ -68,17 +68,25 @@ class CreditCommunication(models.TransientModel):
total_invoiced = fields.Float(string='Total Invoiced',
compute='_compute_total')
total_due = fields.Float(string='Total Invoiced',
total_due = fields.Float(string='Total Due',
compute='_compute_total')
@api.model
def _get_total(self):
amount_field = 'credit_control_line_ids.amount_due'
return sum(self.mapped(amount_field))
@api.model
def _get_total_due(self):
balance_field = 'credit_control_line_ids.balance_due'
return sum(self.mapped(balance_field))
@api.depends('credit_control_line_ids',
'credit_control_line_ids.amount_due',
'credit_control_line_ids.balance_due')
def _compute_total(self):
amount_field = 'credit_control_line_ids.amount_due'
balance_field = 'credit_control_line_ids.balance_due'
self.total_invoiced = sum(self.mapped(amount_field))
self.total_due = sum(self.mapped(balance_field))
self.total_invoiced = self._get_total()
self.total_due = self._get_total_due()
@api.model
@api.returns('self', lambda value: value.id)

1
account_credit_control_dunning_fees/__init__.py
View File

@@ -19,3 +19,4 @@
#
##############################################################################
from . import model
from . import wizard

23
account_credit_control_dunning_fees/wizard/__init__.py Normal file
View File

@@ -0,0 +1,23 @@
# -*- coding: utf-8 -*-
#
##############################################################################
#
# Authors: Adrien Peiffer
# Copyright (c) 2015 Acsone SA/NV (http://www.acsone.eu)
#
# 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 . import credit_control_communication

32
account_credit_control_dunning_fees/wizard/credit_control_communication.py Normal file
View File

@@ -0,0 +1,32 @@
# -*- coding: utf-8 -*-
#
##############################################################################
#
# Authors: Adrien Peiffer
# Copyright (c) 2015 Acsone SA/NV (http://www.acsone.eu)
#
# 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 import models, api
class CreditCommunication(models.TransientModel):
_inherit = 'credit.control.communication'
@api.model
def _get_total_due(self):
balance_field = 'credit_control_line_ids.balance_due_total'
return sum(self.mapped(balance_field))