+
+
+ ${_('Reminder')}: ${comm.current_policy_level.name or '' }
+
+
+
${_('Dear')},
+
${comm.current_policy_level.custom_text.replace('\n', '
')}
+
+
+
+
${_('Summary')}
+
+
+ | ${_('Invoice number')} |
+ ${_('Invoice date')} |
+ ${_('Date due')} |
+ ${_('Invoiced amount')} |
+ ${_('Open amount')} |
+ ${_('Fees')} |
+ ${_('Currency')} |
+
+
+%for line in comm.credit_control_line_ids:
+
+ %if line.invoice_id:
+ ${line.invoice_id.number}
+ %if line.invoice_id.name:
+
+ ${line.invoice_id.name}
+ %endif
+ |
+ %else:
+ ${line.move_line_id.name} |
+ %endif
+ ${line.date_entry} |
+ ${line.date_due} |
+ ${line.amount_due} |
+ ${line.balance_due} |
+ ${line.dunning_fees_amount} |
+ ${line.currency_id.name or comm.company_id.currency_id.name} |
+
+%endfor
+
+
+
+<%doc>
+
+
${_('If you have any question, do not hesitate to contact us.')}
+
+
${comm.user_id.name} ${comm.user_id.email and '<%s>'%(comm.user_id.email) or ''}
+ ${comm.company_id.name}
+ % if comm.company_id.street:
+ ${comm.company_id.street or ''}
+
+ % endif
+
+ % if comm.company_id.street2:
+ ${comm.company_id.street2}
+ % endif
+ % if comm.company_id.city or comm.company_id.zip:
+ ${comm.company_id.zip or ''} ${comm.company_id.city or ''}
+ % endif
+ % if comm.company_id.country_id:
+ ${comm.company_id.state_id and ('%s, ' % comm.company_id.state_id.name) or ''} ${comm.company_id.country_id.name or ''}
+ % endif
+ % if comm.company_id.phone:
+ Phone: ${comm.company_id.phone}
+ % endif
+ % if comm.company_id.website:
+ ${comm.company_id.website or ''}
+ % endif
+
+
+
+ %endfor
+
+
+
diff --git a/account_credit_control_dunning_fees/report/report.xml b/account_credit_control_dunning_fees/report/report.xml
new file mode 100644
index 000000000..89a9874a6
--- /dev/null
+++ b/account_credit_control_dunning_fees/report/report.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
diff --git a/account_credit_control_dunning_fees/tests/__init__.py b/account_credit_control_dunning_fees/tests/__init__.py
new file mode 100644
index 000000000..db75f16d2
--- /dev/null
+++ b/account_credit_control_dunning_fees/tests/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Author: Nicolas Bessi
+# Copyright 2014 Camptocamp SA
+#
+# 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
.
+#
+##############################################################################
+from . import test_fees_generation
+
+checks = [test_fees_generation]
diff --git a/account_credit_control_dunning_fees/tests/test_fees_generation.py b/account_credit_control_dunning_fees/tests/test_fees_generation.py
new file mode 100644
index 000000000..0d7037a9a
--- /dev/null
+++ b/account_credit_control_dunning_fees/tests/test_fees_generation.py
@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Author: Nicolas Bessi
+# Copyright 2014 Camptocamp SA
+#
+# 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
.
+#
+##############################################################################
+from mock import MagicMock
+import openerp.tests.common as test_common
+
+
+class FixedFeesTester(test_common.TransactionCase):
+
+ def setUp(self):
+ """Initialize credit control level mock to test fees computations"""
+ super(FixedFeesTester, self).setUp()
+ self.currency_model = self.registry('res.currency')
+ self.euro = self.currency_model.search(self.cr, self.uid,
+ [('name', '=', 'EUR')])
+ self.assertTrue(self.euro)
+ self.euro = self.registry('res.currency').browse(self.cr,
+ self.uid,
+ self.euro[0])
+
+ self.usd = self.currency_model.search(self.cr, self.uid,
+ [('name', '=', 'USD')])
+ self.assertTrue(self.usd)
+ self.usd = self.registry('res.currency').browse(self.cr,
+ self.uid,
+ self.usd[0])
+
+ self.euro_level = MagicMock(name='Euro policy level')
+ self.euro_level.dunning_fixed_amount = 5.0
+ self.euro_level.dunning_currency_id = self.euro
+ self.euro_level.dunning_type = 'fixed'
+
+ self.usd_level = MagicMock(name='USD policy level')
+ self.usd_level.dunning_fixed_amount = 5.0
+ self.usd_level.dunning_currency_id = self.usd
+ self.usd_level.dunning_type = 'fixed'
+ self.dunning_model = self.registry('credit.control.dunning.fees.computer')
+
+ def test_type_getter(self):
+ """Test that correct compute function is returned for "fixed" type"""
+ c_fun = self.dunning_model._get_compute_fun('fixed')
+ self.assertEqual(c_fun, self.dunning_model.compute_fixed_fees)
+
+ def test_unknow_type(self):
+ """Test that non implemented error is raised if invalide fees type"""
+ with self.assertRaises(NotImplementedError):
+ self.dunning_model._get_compute_fun('bang')
+
+ def test_computation_same_currency(self):
+ """Test that fees are correctly computed with same currency"""
+ credit_line = MagicMock(name='Euro credit line')
+ credit_line.policy_level_id = self.euro_level
+ credit_line.currency_id = self.euro
+ fees = self.dunning_model.compute_fixed_fees(self.cr, self.uid,
+ credit_line,
+ {})
+ self.assertEqual(fees, self.euro_level.dunning_fixed_amount)
+
+ def test_computation_different_currency(self):
+ """Test that fees are correctly computed with different currency"""
+ credit_line = MagicMock(name='USD credit line')
+ credit_line.policy_level_id = self.euro_level
+ credit_line.currency_id = self.usd
+ fees = self.dunning_model.compute_fixed_fees(self.cr, self.uid,
+ credit_line,
+ {})
+ self.assertNotEqual(fees, self.euro_level.dunning_fixed_amount)
+
+ def test_no_fees(self):
+ """Test that fees are not generated if no amount defined on level"""
+ credit_line = MagicMock(name='USD credit line')
+ credit_line.policy_level_id = self.euro_level
+ self.euro_level.dunning_fixed_amount = 0.0
+ credit_line.currency_id = self.usd
+ fees = self.dunning_model.compute_fixed_fees(self.cr, self.uid,
+ credit_line,
+ {})
+ self.assertEqual(fees, 0.0)
diff --git a/account_credit_control_dunning_fees/view/line_view.xml b/account_credit_control_dunning_fees/view/line_view.xml
new file mode 100644
index 000000000..9d4688bd5
--- /dev/null
+++ b/account_credit_control_dunning_fees/view/line_view.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+ add fees on credit control line
+ credit.control.line
+
+
+
+
+
+
+
+
+
+ add fees on credit control line form
+ credit.control.line
+
+
+
+
+
+
+
+
+
+
diff --git a/account_credit_control_dunning_fees/view/policy_view.xml b/account_credit_control_dunning_fees/view/policy_view.xml
new file mode 100644
index 000000000..02e9ac618
--- /dev/null
+++ b/account_credit_control_dunning_fees/view/policy_view.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ add dunning fees on policy
+ credit.control.policy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/async_move_line_importer/__openerp__.py b/async_move_line_importer/__openerp__.py
index 526f337a8..097191d9a 100644
--- a/async_move_line_importer/__openerp__.py
+++ b/async_move_line_importer/__openerp__.py
@@ -19,7 +19,7 @@
#
##############################################################################
{'name': 'Asynchronous move/move line CSV importer',
- 'version': '0.1.1',
+ 'version': '0.1.2',
'author': 'Camptocamp',
'maintainer': 'Camptocamp',
'category': 'Accounting',
diff --git a/async_move_line_importer/model/move_line_importer.py b/async_move_line_importer/model/move_line_importer.py
index 2ae7c725c..f515bf8fe 100644
--- a/async_move_line_importer/model/move_line_importer.py
+++ b/async_move_line_importer/model/move_line_importer.py
@@ -41,7 +41,7 @@ class move_line_importer(orm.Model):
It will parse the saved CSV file using orm.BaseModel.load
in a thread. If you set bypass_orm to True then the load function
- will use a totally overriden create function that is a lot faster
+ will use a totally overridden create function that is a lot faster
but that totally bypass the ORM
"""
@@ -303,7 +303,7 @@ class move_line_importer(orm.Model):
Will generate an success/failure report and generate some
maile threads. It uses BaseModel.load to lookup CSV.
If you set bypass_orm to True then the load function
- will use a totally overriden create function that is a lot faster
+ will use a totally overridden create function that is a lot faster
but that totally bypass the ORM
"""