Skip to content

Commit

Permalink
Fix errors, improve menus, views, readme
Browse files Browse the repository at this point in the history
(cherry picked from commit 93a9b1e)
  • Loading branch information
grindtildeath authored and Sylvain Van Hoof committed Jun 9, 2017
1 parent 8826b25 commit 75d69ef
Show file tree
Hide file tree
Showing 29 changed files with 135 additions and 400 deletions.
44 changes: 41 additions & 3 deletions account_credit_control/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@
Credit Control
==============

Installation
============

Just install it

Configuration
-------------
=============

Configure the policies and policy levels in ``Accounting > Configuration >
Credit Control > Credit Control Policies``.
Expand All @@ -19,9 +24,9 @@ applied on all partners in each company, under the Accounting tab.
You are able to specify a particular policy for one partner or one invoice.

Usage
-----
=====

Menu entries are located in ``Accounting > Report > Credit Control``.
Menu entries are located in ``Accounting > Adviser > Credit Control``.

Create a new "run" in the ``Credit Control Run`` menu with the controlling date.
Then, use the ``Compute Credit Lines`` button. All the credit control lines will
Expand All @@ -33,12 +38,45 @@ On each generated line, you have many choices:
* Change the state (so you can ignore or reopen lines)


.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
:alt: Try me on Runbot
:target: https://runbot.odoo-community.org/runbot/92/10.0

Bug Tracker
===========

Bugs are tracked on `GitHub Issues
<https://github.com/OCA/account-financial-tools/issues>`_. In case of trouble, please
check there if your issue has already been reported. If you spotted it first,
help us smash it by providing detailed and welcomed feedback.

Credits
=======

Images
------

* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.

Contributors
------------

* Nicolas Bessi (Camptocamp)
* Guewen Baconnier (Camptocamp)
* Sylvain Van Hoof (Okia SPRL) <[email protected]>
* Akim Juillerat (Camptocamp <[email protected]>

Maintainer
----------

.. image:: https://odoo-community.org/logo.png
:alt: Odoo Community Association
:target: https://odoo-community.org

This module is maintained by the OCA.

OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.

To contribute to this module, please visit https://odoo-community.org.
20 changes: 0 additions & 20 deletions account_credit_control/__init__.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,2 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Author: Nicolas Bessi, Guewen Baconnier
# Copyright 2012-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 <http://www.gnu.org/licenses/>.
#
##############################################################################
from . import models
from . import wizard
22 changes: 3 additions & 19 deletions account_credit_control/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Author: Nicolas Bessi, Guewen Baconnier
# Copyright 2012-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 <http://www.gnu.org/licenses/>.
#
##############################################################################
# Copyright 2012-2017 Camptocamp SA
# Copyright 2017 Okia SPRL (https://okia.be)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{'name': 'Account Credit Control',
'version': '10.0.1.0.0',
'author': "Camptocamp,Odoo Community Association (OCA),Okia",
Expand Down
67 changes: 22 additions & 45 deletions account_credit_control/data/data.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,10 @@
ref="email_template_credit_control_base"/>
<field name="policy_id" ref="credit_control_3_time"/>
<field name="channel">email</field>
<field name="custom_text">Our records indicate that we have not
received the payment of the above mentioned invoice.
If it has already been sent, please disregard this notice. If
not, please proceed with payment within 10 days.
<field name="custom_text">Our records indicate that we have not received the payment of the invoice mentioned below.
If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.

Thank you in advance for your anticipated cooperation in this
matter.
Thank you in advance for your anticipated cooperation in this matter.

Best regards
</field>
Expand All @@ -93,14 +90,10 @@
ref="email_template_credit_control_base"/>
<field name="policy_id" ref="credit_control_3_time"/>
<field name="channel">email</field>
<field name="custom_text">Our records indicate that we have not yet
received the payment of the above mentioned invoice despite our
first reminder.
If it has already been sent, please disregard this notice. If
not, please proceed with payment within 5 days.
<field name="custom_text">Our records indicate that we have not yet received the payment of the invoice mentioned below despite our first reminder.
If it has already been sent, please disregard this notice. If not, please proceed with payment within 5 days.

Thank you in advance for your anticipated cooperation in this
matter.
Thank you in advance for your anticipated cooperation in this matter.

Best regards
</field>
Expand All @@ -125,20 +118,14 @@
<field name="policy_id" ref="credit_control_3_time"/>
<field name="channel">letter</field>
<field name="custom_text">
Our records indicate that we still have not received the
payment of the above mentioned invoice despite our two
reminders.
If payment have already been sent, please disregard this
notice. If not, please proceed with payment.
If your payment has not been received in the next 5 days, your
file will be transfered to our debt collection agency.

Should you need us to arrange a payment plan for you, please
advise.
Our records indicate that we still have not received the payment of the invoice mentioned below despite our two reminders.
If payment have already been sent, please disregard this notice. If not, please proceed with payment.
If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.

Should you need us to arrange a payment plan for you, please advise.
A customer account statement is enclosed for you convenience.

Thank you in advance for your anticipated cooperation in this
matter.
Thank you in advance for your anticipated cooperation in this matter.

Best regards
</field>
Expand Down Expand Up @@ -173,13 +160,10 @@
ref="email_template_credit_control_base"/>
<field name="policy_id" ref="credit_control_2_time"/>
<field name="channel">email</field>
<field name="custom_text">Our records indicate that we have not
received the payment of the above mentioned invoice.
If it has already been sent, please disregard this notice. If
not, please proceed with payment within 10 days.
<field name="custom_text">Our records indicate that we have not received the payment of the invoice mentioned below.
If it has already been sent, please disregard this notice. If not, please proceed with payment within 10 days.

Thank you in advance for your anticipated cooperation in this
matter.
Thank you in advance for your anticipated cooperation in this matter.

Best regards
</field>
Expand All @@ -203,22 +187,15 @@
ref="email_template_credit_control_base"/>
<field name="policy_id" ref="credit_control_2_time"/>
<field name="channel">letter</field>
<field name="custom_text">Our records indicate that we still have
not received the payment of the above mentioned invoice despite
our reminder.

If payment have already been sent, please disregard this
notice. If not, please proceed with payment.
If your payment has not been received in the next 5 days, your
file will be transfered to our debt
collection agency.

Should you need us to arrange a payment plan for you, please
advise.
<field name="custom_text">Our records indicate that we still have not received the payment of the mentioned below invoice despite our reminder.

If payment have already been sent, please disregard this notice. If not, please proceed with payment.
If your payment has not been received in the next 5 days, your file will be transfered to our debt collection agency.

Should you need us to arrange a payment plan for you, please advise.
A customer account statement is enclosed for you convenience.

Thank you in advance for your anticipated cooperation in this
matter.
Thank you in advance for your anticipated cooperation in this matter.

Best regards
</field>
Expand Down
4 changes: 0 additions & 4 deletions account_credit_control/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2012-2014 Camptocamp SA
# Copyright 2017 Okia SPRL (https://okia.be)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from . import account_account
from . import account_invoice
from . import credit_control_line
Expand Down
22 changes: 3 additions & 19 deletions account_credit_control/models/account_account.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Author: Nicolas Bessi, Guewen Baconnier
# Copyright 2012-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 <http://www.gnu.org/licenses/>.
#
##############################################################################
# Copyright 2012-2017 Camptocamp SA
# Copyright 2017 Okia SPRL (https://okia.be)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import fields, models


Expand Down
22 changes: 3 additions & 19 deletions account_credit_control/models/account_invoice.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Author: Vincent Renaville
# Copyright 2013 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 <http://www.gnu.org/licenses/>.
#
##############################################################################
# Copyright 2012-2017 Camptocamp SA
# Copyright 2017 Okia SPRL (https://okia.be)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import _, api, fields, models
from odoo.exceptions import UserError

Expand Down
22 changes: 3 additions & 19 deletions account_credit_control/models/credit_control_line.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Author: Nicolas Bessi, Guewen Baconnier
# Copyright 2012-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 <http://www.gnu.org/licenses/>.
#
##############################################################################
# Copyright 2012-2017 Camptocamp SA
# Copyright 2017 Okia SPRL (https://okia.be)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
import logging

from odoo import _, api, fields, models
Expand Down
24 changes: 4 additions & 20 deletions account_credit_control/models/credit_control_policy.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Author: Nicolas Bessi, Guewen Baconnier
# Copyright 2012-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 <http://www.gnu.org/licenses/>.
#
##############################################################################
# Copyright 2012-2017 Camptocamp SA
# Copyright 2017 Okia SPRL (https://okia.be)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import _, api, fields, models
from odoo.exceptions import UserError

Expand Down Expand Up @@ -150,7 +134,7 @@ def _get_invoice_related_lines(self, controlling_date):
the process
"""
return self._move_lines_subset(controlling_date, 'account.invoice',
'invoice')
'invoice_id')

@api.multi
@api.returns('account.move.line')
Expand Down
22 changes: 3 additions & 19 deletions account_credit_control/models/credit_control_run.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Author: Nicolas Bessi, Guewen Baconnier
# Copyright 2012-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 <http://www.gnu.org/licenses/>.
#
##############################################################################
# Copyright 2012-2017 Camptocamp SA
# Copyright 2017 Okia SPRL (https://okia.be)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
import logging

from odoo import _, api, fields, models
Expand Down
Loading

0 comments on commit 75d69ef

Please sign in to comment.