Merge lp:~therp-nl/account-invoicing/7.0-account_cash_discount into lp:~account-core-editors/account-invoicing/7.0

[Holger Brunn (Therp)]

This started as a port of http://bazaar.launchpad.net/~camptocamp/c2c-rd-addons/7.0/files/head:/account_cash_discount_61

I've been unhappy with the way the original module did its work (too much SQL, deleting moves and recreating them), so by now, it's actually a rewrite.

[lp:~therp-nl/account-invoicing/7.0-account_cash_discount]

27. By Holger Brunn (Therp) on 2014-02-18

[ADD] cope with user configurable deviations from exact discount price
[ADD] use discount_{expense,income}_account_id
[RFR] make discount_{expense,income}_account_id regular fields

28. By Holger Brunn (Therp) on 2014-02-18

[ADD] translation

29. By Holger Brunn (Therp) on 2014-02-19

[ADD] handle refunds with cash discounts

[Erwin van der Ploeg (BAS Solutions) (erwin-bassolutions-deactivatedaccount)]

Hi Holger, good work. Question. Is there any integration between this cash discount and payment orders? When i make a payment order on time then discount can be extracted. When im passed my discount days it can't. Curious if this exists or is in planning. Thanks.

[Erwin van der Ploeg (BAS Solutions) (erwin-bassolutions-deactivatedaccount)]

Hi Holger. I did some testing on the sales site and it looks ok
- First of all you example is not correct, You say: "On 01/20/2014, you charged EUR 80 to a customer, with 20% tax, totalling in EUR 100". If the amount is 80 and tax is 20%, then the total is 96,-
- Second. In the Netherlands it is not allowed to make a correction on the tax. If you want to correct tax, you have to provide the customer with a new invoice.

Example: 100 + 20% vat = 120 (early payment discount = 5%). The to pay amount = (100-5%) + 20 = 115.

[lp:~therp-nl/account-invoicing/7.0-account_cash_discount]

30. By Holger Brunn (Therp) on 2014-05-26

[FIX] wrong numbers in example

[Holger Brunn (Therp) (hbrunn)]

Erwin, thanks a lot for having a look!

I corrected the example.

Support for payment orders will happen sooner or later, but currently I think it will be rather later than sooner.

This module is meant to deal with the situation in Austria and Germany, there you are legally required to jump through this hoops. For the Dutch situation, a simple write-off is enough I think.

[Pedro Manuel Baeza (pedro.baeza)]

This project is now hosted on https://github.com/OCA/account-invoicing. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

review: Needs Resubmitting

Unmerged revisions

30. By Holger Brunn (Therp) on 2014-05-26

[FIX] wrong numbers in example

29. By Holger Brunn (Therp) on 2014-02-19

[ADD] handle refunds with cash discounts

28. By Holger Brunn (Therp) on 2014-02-18

[ADD] translation

27. By Holger Brunn (Therp) on 2014-02-18

[ADD] cope with user configurable deviations from exact discount price
[ADD] use discount_{expense,income}_account_id
[RFR] make discount_{expense,income}_account_id regular fields

26. By Holger Brunn (Therp) on 2014-01-27

[ADD] account_cash_discount

=== added directory 'account_cash_discount'
=== added file 'account_cash_discount/__init__.py'
--- account_cash_discount/__init__.py	1970-01-01 00:00:00 +0000
+++ account_cash_discount/__init__.py	2014-05-26 08:47:02 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2010-2012 Camptocamp Austria (<http://www.camptocamp.at>)
+#    Copyright (C) 2014 Therp BV (<http://www.therp.nl>)
+#
+#    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/>.
+#
+##############################################################################
+import model
+import wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_cash_discount/__openerp__.py'
--- account_cash_discount/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_cash_discount/__openerp__.py	2014-05-26 08:47:02 +0000
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2010-2012 Camptocamp Austria (<http://www.camptocamp.at>)
+#    Copyright (C) 2014 Therp BV (<http://www.therp.nl>)
+#
+#    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/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Cash discount',
+    'version': '0.9',
+    'category': 'Accounting & Finance',
+    'description': """
+Cash Discount (Austria and Germany style)
+=========================================
+
+Usage
+-----
+
+Define your discounts as part of your payment terms. Keep in mind that other
+computation lines than 'balance' won't make much sense, so only fill in one
+computation line of type 'balance' indicating your payment date.
+
+When paying your invoice, fill in the exact amount for the discounted invoice.
+If the payment date and the amount matches a discount, the invoice will be
+marked as paid and some correction move lines will be created to reflect the
+invoice being paid with a discount.
+
+If you manually reconcile move lines, you'll be offered a button to book the
+writeoff amount as cash discount if a matching cash discount can be found.
+    
+Example
+-------
+
+On 01/20/2014, you charged EUR 80 to a customer, with 25% tax, totalling in
+EUR 100. Further, you set up a payment term for this invoice that includes
+5% discount if paid within a week.
+
+If you fill in EUR 95 and payment date 01/22/2014 when paying the invoice, the
+following happens:
+
+- the invoice is marked as paid
+- on the invoice's 'Other info' tag, you'll find a field 'Cash discount
+  correction' with the following lines:
+
+    - EUR 1 as debit on your tax account
+    - EUR 4 as debit on your income account
+    - EUR 5 as credit on your customer's account
+
+TODO
+----
+
+- cash discounts don't show up on invoice report
+- multi currency not tested
+- no automatic reconciliation
+""",
+    'author': 'Therp BV',
+    'depends': [ 'account_voucher' ],
+    'data': [
+        'view/account_move_line_reconcile.xml',
+        'view/account_payment_term.xml',
+        'view/account_invoice.xml',
+        'security/ir.model.access.csv',
+           ],
+    'installable': True,
+    'auto_install': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added directory 'account_cash_discount/i18n'
=== added file 'account_cash_discount/i18n/account_cash_discount.pot'
--- account_cash_discount/i18n/account_cash_discount.pot	1970-01-01 00:00:00 +0000
+++ account_cash_discount/i18n/account_cash_discount.pot	2014-05-26 08:47:02 +0000
@@ -0,0 +1,142 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_cash_discount
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-18 15:41+0000\n"
+"PO-Revision-Date: 2014-02-18 15:41+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_cash_discount
+#: code:addons/account_cash_discount/model/account_invoice.py:130
+#: code:addons/account_cash_discount/model/account_invoice.py:144
+#, python-format
+msgid "Cash discount writeoff"
+msgstr ""
+
+#. module: account_cash_discount
+#: view:account.invoice:0
+msgid "Note: This invoice was paid with a cash discount as detailed in the cash discount correction move on the 'Other info' tab"
+msgstr ""
+
+#. module: account_cash_discount
+#: field:account.payment.term.cash.discount,allowed_deviation:0
+msgid "Allowed deviation"
+msgstr ""
+
+#. module: account_cash_discount
+#: help:account.payment.term.cash.discount,discount_expense_account_id:0
+msgid "This account will be used to post the cash discount expense"
+msgstr ""
+
+#. module: account_cash_discount
+#: field:account.move.line.reconcile,invoice_has_cash_discount:0
+msgid "Cash discount on invoice"
+msgstr ""
+
+#. module: account_cash_discount
+#: model:ir.model,name:account_cash_discount.model_account_move_line_reconcile
+msgid "Account move line reconcile"
+msgstr ""
+
+#. module: account_cash_discount
+#: code:addons/account_cash_discount/model/account_payment_term.py:45
+#, python-format
+msgid "When working with cash discounts, you can only have one computation line of type \"balance\"!"
+msgstr ""
+
+#. module: account_cash_discount
+#: field:account.payment.term.cash.discount,discount_income_account_id:0
+msgid "Discount Income Account"
+msgstr ""
+
+#. module: account_cash_discount
+#: help:account.payment.term.cash.discount,discount_income_account_id:0
+msgid "This account will be used to post the cash discount income"
+msgstr ""
+
+#. module: account_cash_discount
+#: field:account.payment.term.cash.discount,discount:0
+msgid "Discount"
+msgstr ""
+
+#. module: account_cash_discount
+#: field:account.invoice,cash_discount_move_id:0
+msgid "Cash discount correction move"
+msgstr ""
+
+#. module: account_cash_discount
+#: view:account.move.line.reconcile:0
+msgid "Book difference as cash discount"
+msgstr ""
+
+#. module: account_cash_discount
+#: field:account.payment.term.cash.discount,payment_term_id:0
+msgid "Payment term"
+msgstr ""
+
+#. module: account_cash_discount
+#: field:account.payment.term.cash.discount,days:0
+msgid "Days"
+msgstr ""
+
+#. module: account_cash_discount
+#: code:addons/account_cash_discount/model/account_payment_term.py:45
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: account_cash_discount
+#: field:account.payment.term.cash.discount,discount_expense_account_id:0
+msgid "Discount Expense Account"
+msgstr ""
+
+#. module: account_cash_discount
+#: field:account.payment.term,cash_discount_ids:0
+#: model:ir.model,name:account_cash_discount.model_account_payment_term_cash_discount
+msgid "Cash discount"
+msgstr ""
+
+#. module: account_cash_discount
+#: view:account.move.line.reconcile:0
+msgid "Reconcile"
+msgstr ""
+
+#. module: account_cash_discount
+#: model:ir.model,name:account_cash_discount.model_account_voucher
+msgid "Accounting Voucher"
+msgstr ""
+
+#. module: account_cash_discount
+#: view:account.payment.term:0
+#: model:ir.model,name:account_cash_discount.model_account_payment_term
+msgid "Payment Term"
+msgstr ""
+
+#. module: account_cash_discount
+#: help:account.payment.term.cash.discount,allowed_deviation:0
+msgid "The amount a payment can deviate from the computed amount and still be accepted as payment within this discount.\n"
+"Think of rounding errors as use case for this"
+msgstr ""
+
+#. module: account_cash_discount
+#: code:addons/account_cash_discount/model/account_invoice.py:64
+#: code:addons/account_cash_discount/model/account_invoice.py:188
+#, python-format
+msgid "Cash discount for %s"
+msgstr ""
+
+#. module: account_cash_discount
+#: field:account.move.line.reconcile,invoice_id:0
+#: model:ir.model,name:account_cash_discount.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
 
=== added file 'account_cash_discount/i18n/de.po'
--- account_cash_discount/i18n/de.po	1970-01-01 00:00:00 +0000
+++ account_cash_discount/i18n/de.po	2014-05-26 08:47:02 +0000
@@ -0,0 +1,133 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_cash_discount
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-18 15:41+0000\n"
+"PO-Revision-Date: 2014-02-18 15:41+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_cash_discount
+#: code:addons/account_cash_discount/model/account_invoice.py:130
+#: code:addons/account_cash_discount/model/account_invoice.py:144
+#, python-format
+msgid "Cash discount writeoff"
+msgstr "Skontoabschreibung"
+
+#. module: account_cash_discount
+#: view:account.invoice:0
+msgid "Note: This invoice was paid with a cash discount as detailed in the cash discount correction move on the 'Other info' tab"
+msgstr "Achtung: Diese Rechnung wurde unter Einbehalt von Skonto bezahlt. Die ensprechenden Buchungen finden sich im 'Weitere Info'-Reiter."
+
+#. module: account_cash_discount
+#: field:account.payment.term.cash.discount,allowed_deviation:0
+msgid "Allowed deviation"
+msgstr "Erlaubte Abweichung"
+
+#. module: account_cash_discount
+#: help:account.payment.term.cash.discount,discount_expense_account_id:0
+msgid "This account will be used to post the cash discount expense"
+msgstr "Skontoausgaben werden auf dieses Konto gebucht"
+
+#. module: account_cash_discount
+#: field:account.move.line.reconcile,invoice_has_cash_discount:0
+msgid "Cash discount on invoice"
+msgstr "Rechnung mit Skonto"
+
+#. module: account_cash_discount
+#: model:ir.model,name:account_cash_discount.model_account_move_line_reconcile
+msgid "Account move line reconcile"
+msgstr "Buchen OP Ausgleich"
+
+#. module: account_cash_discount
+#: code:addons/account_cash_discount/model/account_payment_term.py:45
+#, python-format
+msgid "When working with cash discounts, you can only have one computation line of type \"balance\"!"
+msgstr "Skontobezahlungen können nur eine Berechnung vom Typ \"Saldo\" beinhalten!"
+
+#. module: account_cash_discount
+#: field:account.payment.term.cash.discount,discount_income_account_id:0
+msgid "Discount Income Account"
+msgstr "Skonto-Erlöskonto"
+
+#. module: account_cash_discount
+#: help:account.payment.term.cash.discount,discount_income_account_id:0
+msgid "This account will be used to post the cash discount income"
+msgstr "Skontoerlöse werden auf dieses Konto gebucht"
+
+#. module: account_cash_discount
+#: field:account.payment.term.cash.discount,discount:0
+msgid "Discount"
+msgstr "Skonto"
+
+#. module: account_cash_discount
+#: field:account.invoice,cash_discount_move_id:0
+msgid "Cash discount correction move"
+msgstr "Skonto-Buchungssatz"
+
+#. module: account_cash_discount
+#: view:account.move.line.reconcile:0
+msgid "Book difference as cash discount"
+msgstr "Differenz als Skonto buchen"
+
+#. module: account_cash_discount
+#: field:account.payment.term.cash.discount,payment_term_id:0
+msgid "Payment term"
+msgstr "Zahlungsbedingung"
+
+#. module: account_cash_discount
+#: field:account.payment.term.cash.discount,days:0
+msgid "Days"
+msgstr "Tage"
+
+#. module: account_cash_discount
+#: code:addons/account_cash_discount/model/account_payment_term.py:45
+#, python-format
+msgid "Error"
+msgstr "Fehler"
+
+#. module: account_cash_discount
+#: field:account.payment.term.cash.discount,discount_expense_account_id:0
+msgid "Discount Expense Account"
+msgstr "Skonto-Aufwandskonto"
+
+#. module: account_cash_discount
+#: field:account.payment.term,cash_discount_ids:0
+#: model:ir.model,name:account_cash_discount.model_account_payment_term_cash_discount
+msgid "Cash discount"
+msgstr "Skonto"
+
+#. module: account_cash_discount
+#: view:account.payment.term:0
+#: model:ir.model,name:account_cash_discount.model_account_payment_term
+msgid "Payment Term"
+msgstr "Zahlungsbedingung"
+
+#. module: account_cash_discount
+#: help:account.payment.term.cash.discount,allowed_deviation:0
+msgid "The amount a payment can deviate from the computed amount and still be accepted as payment within this discount.\n"
+"Think of rounding errors as use case for this"
+msgstr "Der Betrag um den eine Zahlung vom berechneten Betrag abweichen darf um noch als Zahlung innerhalb des Skontos angesehen zu werden.\n"
+"Dies vereinfact die Handhabung von Rundungsunterschieden."
+
+#. module: account_cash_discount
+#: code:addons/account_cash_discount/model/account_invoice.py:64
+#: code:addons/account_cash_discount/model/account_invoice.py:188
+#, python-format
+msgid "Cash discount for %s"
+msgstr "Skonto für %s"
+
+#. module: account_cash_discount
+#: field:account.move.line.reconcile,invoice_id:0
+#: model:ir.model,name:account_cash_discount.model_account_invoice
+msgid "Invoice"
+msgstr "Rechnung"
+
 
=== added directory 'account_cash_discount/model'
=== added file 'account_cash_discount/model/__init__.py'
--- account_cash_discount/model/__init__.py	1970-01-01 00:00:00 +0000
+++ account_cash_discount/model/__init__.py	2014-05-26 08:47:02 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2014 Therp BV (<http://therp.nl>).
+#
+#    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/>.
+#
+##############################################################################
+import account_voucher
+import account_invoice
+import account_payment_term
+import account_payment_term_cash_discount
 
=== added file 'account_cash_discount/model/account_invoice.py'
--- account_cash_discount/model/account_invoice.py	1970-01-01 00:00:00 +0000
+++ account_cash_discount/model/account_invoice.py	2014-05-26 08:47:02 +0000
@@ -0,0 +1,251 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2014 Therp BV (<http://therp.nl>).
+#
+#    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/>.
+#
+##############################################################################
+import datetime
+from openerp.osv import orm, fields
+from openerp.tools.translate import _
+from openerp.tools import float_round, float_is_zero, float_compare,\
+        DEFAULT_SERVER_DATE_FORMAT
+
+
+class AccountInvoice(orm.Model):
+    _inherit = 'account.invoice'
+
+    _columns = {
+            'cash_discount_move_id': fields.many2one(
+                'account.move', string='Cash discount correction move'),
+            }
+
+    def create_cash_discount_move_lines(
+            self, cr, uid, ids, discount, payment_move_lines, date=None,
+            post_move=True, context=None):
+        '''create correction entries for invoices eligible to a cash discount,
+        given by the appropriate payment.term.line
+        
+        :param discount: the discount
+        :type discount: browse_record('payment.term.line')
+        :param payment_move_lines: the payment move lines to create correction
+        entries for
+        :type payment_move_lines: browse_record_list('account.move.line')
+        :param date: the date to post the move to
+        :type date: string
+
+        :returns: list of created account.move.lines' ids
+        '''
+        if date is None:
+            date = datetime.datetime.now().strftime(DEFAULT_SERVER_DATE_FORMAT)
+
+        account_move_line = self.pool.get('account.move.line')
+        account_move = self.pool.get('account.move')
+        precision = self.pool.get('decimal.precision').precision_get(
+            cr, uid, 'Account')
+        result = []
+        for this in self.browse(cr, uid, ids, context=context):
+            discount_move_id = account_move.create(
+                    cr, uid,
+                    {
+                        'name': _('Cash discount for %s') % this.move_id.name,
+                        'period_id': self.pool.get('account.period').find(
+                            cr, uid, dt=date, context=context)[0],
+                        'journal_id': this.journal_id.id,
+                        'date': date,
+                    },
+                    context=context)
+
+            #prepare to correct potential rounding errors
+            total_debit_payment = total_credit_payment = 0
+            for payment_move_line in payment_move_lines:
+                total_debit_payment += payment_move_line.debit
+                total_credit_payment += payment_move_line.credit
+            total_debit_invoice = total_credit_invoice = 0
+            #create correction entries
+            total_debit_correction = total_credit_correction = 0
+            for move_line in this.move_id.line_id:
+                line_data = self.create_cash_discount_move_line_dict(
+                    discount_move_id, move_line, discount, precision)
+                line_id = account_move_line.create(cr, uid, line_data,
+                                                   context=context)
+                result.append(line_id)
+                total_debit_correction += line_data['debit']
+                total_credit_correction += line_data['credit']
+                total_debit_invoice += move_line.debit
+                total_credit_invoice += move_line.credit
+
+            #add rounding error to a matching correction entry
+            if not float_is_zero(
+                    total_debit_correction - total_credit_correction, 
+                    precision):
+                error_credit = max(0, float_round(
+                    total_debit_correction - total_credit_correction,
+                    precision))
+                error_debit = max(0, float_round(
+                    total_credit_correction - total_debit_correction,
+                    precision))
+
+                for correction_line in account_move_line.browse(
+                        cr, uid, result, context=context):
+                    if correction_line.credit and error_credit:
+                        correction_line.write(
+                            {'credit': correction_line.credit + error_credit})
+                        total_credit_correction += error_credit
+                        error_credit = 0
+                    if correction_line.debit and error_debit:
+                        correction_line.write(
+                            {'debit': correction_line.debit + error_debit})
+                        total_debit_correction += error_debit
+                        error_debit = 0
+                    if not error_credit and not error_debit:
+                        break
+
+            #write off differences within deviation margin
+            writeoff_debit = total_debit_correction + total_debit_payment\
+                    - total_debit_invoice
+            writeoff_credit = total_credit_correction + total_credit_payment\
+                    - total_credit_invoice
+
+            if float_compare(writeoff_debit, writeoff_credit, precision) == 0\
+               and float_compare(abs(writeoff_debit),
+                                 discount.allowed_deviation,
+                                 precision) == -1:
+                line_id = account_move_line.create(
+                    cr, uid,
+                    {
+                        'name': _('Cash discount writeoff'),
+                        'debit': abs(writeoff_debit),
+                        'move_id': discount_move_id,
+                        'partner_id': this.partner_id.id,
+                        'account_id': this.account_id.id
+                            if writeoff_debit > 0
+                            else discount.discount_expense_account_id.id,
+                    },
+                    context=context)
+                result.append(line_id)
+
+                line_id = account_move_line.create(
+                    cr, uid,
+                    {
+                        'name': _('Cash discount writeoff'),
+                        'credit': abs(writeoff_credit),
+                        'move_id': discount_move_id,
+                        'partner_id': this.partner_id.id,
+                        'account_id': this.account_id.id
+                            if writeoff_credit < 0
+                            else discount.discount_income_account_id.id,
+                    },
+                    context=context)
+                result.append(line_id)
+
+            this.write({'cash_discount_move_id': discount_move_id})
+            if post_move:
+                account_move.post(cr, uid, [discount_move_id], context=context)
+        return result
+
+    def create_cash_discount_move_line_dict(self, move_id, move_line,
+                                            discount, precision):
+        '''return a dict suitable to create a correction entry for specified
+        cash discount
+        
+        :param move_id: the move to append correction entries to
+        :type move: int
+        :param move_line: the move to append correction entries to
+        :type move_line: browse_record('account.move')
+        :param discount: the discount
+        :type discount: browse_record('payment.term.line')
+
+        :returns: dict that can be fed to account_move_line.create
+        '''
+
+        account_id = move_line.account_id.id
+        if move_line.account_id.id in [
+                l.account_id.id for l in move_line.invoice.invoice_line]:
+            if move_line.credit:
+                account_id = discount.discount_expense_account_id.id\
+                        or account_id
+            if move_line.debit:
+                account_id = discount.discount_income_account_id.id\
+                        or account_id
+
+        data = self.pool.get('account.move.line').copy_data(
+            move_line._cr, move_line._uid, move_line.id,
+            default={
+                'name': _('Cash discount for %s') % move_line.name,
+                'debit': float_round(
+                    move_line.credit * discount.discount / 100,
+                    precision),
+                'credit': float_round(
+                    move_line.debit * discount.discount / 100,
+                    precision),
+                'tax_amount': float_round(
+                    -move_line.tax_amount * discount.discount / 100,
+                    precision),
+                'amount_currency': float_round(
+                    -move_line.amount_currency * discount.discount / 100,
+                    precision),
+                'move_id': move_id,
+                'account_id': account_id,
+            },
+            context=move_line._context)
+        return data
+
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        '''reset cash_discount_move_id'''
+        if default is None:
+            default = {}
+        default.setdefault('cash_discount_move_id', False)
+
+        return super(AccountInvoice, self).copy_data(
+            cr, uid, id, default=default, context=None)
+
+    def get_matching_cash_discount(self, cr, uid, ids, amount, 
+                                   payment_date=None, context=None):
+        '''return a cash discount that matches the amount paid and payment
+        date'''
+        result = False
+        for this in self.browse(cr, uid, ids, context=context):
+            if not this.payment_term or\
+                    not this.payment_term.cash_discount_ids:
+                continue
+            for discount in this.payment_term.cash_discount_ids:
+                if discount.matches(amount, this.date_invoice,
+                                    this.amount_total,
+                                    payment_date=payment_date):
+                    return discount
+        return result
+
+    def _prepare_refund(self, cr, uid, invoice, date=None, period_id=None,
+                        description=None, journal_id=None, context=None):
+        result = super(AccountInvoice, self)._prepare_refund(
+            cr, uid, invoice, date=date, period_id=period_id,
+            description=description, journal_id=journal_id, context=context)
+        if invoice.cash_discount_move_id:
+            result['payment_term'] = False
+            for discount_move in invoice.cash_discount_move_id.line_id:
+                if not discount_move.account_id == invoice.account_id:
+                    continue
+                result['invoice_line'].append(
+                    (0, 0,
+                     {
+                         'name': discount_move.name,
+                         'account_id': discount_move.account_id.id,
+                         'price_unit': -(discount_move.credit or
+                                         -discount_move.debit),
+                     }))
+
+        return result
 
=== added file 'account_cash_discount/model/account_payment_term.py'
--- account_cash_discount/model/account_payment_term.py	1970-01-01 00:00:00 +0000
+++ account_cash_discount/model/account_payment_term.py	2014-05-26 08:47:02 +0000
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2012-2012 Camptocamp Austria (<http://www.camptocamp.at>)
+#    Copyright (C) 2014 Therp BV (<http://www.therp.nl>)
+#
+#    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 fields, orm
+from openerp.tools.translate import _
+
+
+class AccountPaymentTerm(orm.Model):
+    _inherit = "account.payment.term"
+    _columns = {
+        'cash_discount_ids': fields.one2many(
+            'account.payment.term.cash.discount', 'payment_term_id',
+            'Cash discount'),
+    }
+
+    def _check_validity(self, cr, uid, ids, context=None):
+        for this in self.browse(
+                cr, uid, ids if isinstance(ids, list) else [ids],
+                context=context):
+            if not this.cash_discount_ids:
+                continue
+            for payment_term_line in this.line_ids:
+                if payment_term_line.value == 'balance':
+                    continue
+                raise orm.except_orm(
+                    _('Error'), _('When working with cash discounts, you can '
+                                  'only have one computation line of type '
+                                  '"balance"!'))
+
+    def create(self, cr, uid, vals, context=None):
+        result = super(AccountPaymentTerm, self).create(
+            cr, uid, vals, context=context)
+        self._check_validity(cr, uid, result, context=context)
+        return result
+
+    def write(self, cr, uid, ids, vals, context=None):
+        result = super(AccountPaymentTerm, self).write(
+            cr, uid, ids, vals, context=context)
+        self._check_validity(cr, uid, ids, context=context)
+        return result
 
=== added file 'account_cash_discount/model/account_payment_term_cash_discount.py'
--- account_cash_discount/model/account_payment_term_cash_discount.py	1970-01-01 00:00:00 +0000
+++ account_cash_discount/model/account_payment_term_cash_discount.py	2014-05-26 08:47:02 +0000
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2014 Therp BV (<http://therp.nl>).
+#
+#    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/>.
+#
+##############################################################################
+import datetime
+from openerp.osv.orm import Model
+from openerp.osv import fields
+from openerp.tools import float_compare, DEFAULT_SERVER_DATE_FORMAT
+
+class AccountPaymentTermCashDiscount(Model):
+    _name = 'account.payment.term.cash.discount'
+    _description= 'Cash discount'
+    _rec_name = 'days'
+    _order = 'days'
+
+    _columns = {
+        'payment_term_id': fields.many2one(
+            'account.payment.term', 'Payment term', required=True),
+        'days': fields.integer('Days', required=True),
+        'discount': fields.float('Discount', required=True),
+        'allowed_deviation': fields.float(
+            'Allowed deviation',
+            help="The amount a payment can deviate from the computed amount "
+            "and still be accepted as payment within this discount.\n"
+            "Think of rounding errors as use case for this"),
+        'discount_income_account_id': fields.many2one(
+            'account.account', string='Discount Income Account',
+            help="This account will be used to post the cash discount income"),
+        'discount_expense_account_id': fields.many2one(
+            'account.account',
+            string='Discount Expense Account',
+            help="This account will be used to post the cash discount expense")
+    }
+
+    def matches(self, cr, uid, ids, amount, invoice_date, invoice_amount,
+                payment_date=None, context=None):
+        '''determine if an amount paid at a certain date matches an invoiced
+        amount from a certain date
+        
+        :param amount: the amount paid
+        :type amount: float
+        :param invoice_date: the invoice's date
+        :type invoice_date: string
+        :param invoice_amount: the invoiced amount
+        :type invoice_amount: float
+        :param payment_date: the date of payment, today if None
+        :type payment_date: string        
+        '''
+        precision = self.pool.get('decimal.precision').precision_get(
+            cr, uid, 'Account')
+
+        if not payment_date:
+            payment_date = datetime.datetime.now().strftime(
+                DEFAULT_SERVER_DATE_FORMAT)
+
+        for this in self.browse(cr, uid, ids, context=context):
+            date = (
+                datetime.datetime.strptime(
+                    invoice_date, DEFAULT_SERVER_DATE_FORMAT) +
+                datetime.timedelta(days=this.days))\
+                .strftime(DEFAULT_SERVER_DATE_FORMAT)
+
+            return date >= payment_date and float_compare(
+                amount,
+                (1 - this.discount / 100) * invoice_amount
+                    - this.allowed_deviation,
+                precision) == 1 and float_compare(
+                amount,
+                (1 - this.discount / 100) * invoice_amount
+                    + this.allowed_deviation,
+                precision) == -1
 
=== added file 'account_cash_discount/model/account_voucher.py'
--- account_cash_discount/model/account_voucher.py	1970-01-01 00:00:00 +0000
+++ account_cash_discount/model/account_voucher.py	2014-05-26 08:47:02 +0000
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2012-2012 Camptocamp Austria (<http://www.camptocamp.at>)
+#    Copyright (C) 2014 Therp BV (<http://www.therp.nl>)
+#
+#    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 fields, orm
+
+
+class AccountVoucher(orm.Model):
+    _inherit = 'account.voucher'
+
+    def voucher_move_line_create(
+            self, cr, uid, voucher_id, line_total, move_id, company_currency,
+            current_currency, context=None):
+        total, ids_list = super(AccountVoucher, self).voucher_move_line_create(
+                cr, uid, voucher_id, line_total, move_id, company_currency,
+                current_currency)
+        '''add correction entries to payment if the payment amount matches a
+        cash discount amount and is in time for that'''
+
+        account_move_line = self.pool.get('account.move.line')
+
+        precision = self.pool.get('decimal.precision').precision_get(
+                cr, uid, 'Account')
+        voucher = self.browse(cr, uid, voucher_id, context=context)
+        move = self.pool.get('account.move').browse(
+                cr, uid, move_id, context=context)
+
+        for ids in ids_list:
+            move_lines = account_move_line.browse(cr, uid, ids, 
+                                                  context=context)
+            for move_line in move_lines:
+                #only act on move liness with invoices whose payment term is a
+                #cash discount
+                if move_line.invoice and move_line.invoice.payment_term and\
+                        move_line.invoice.payment_term.cash_discount_ids:
+
+                    #find a cash discount that matches current payment
+                    discount = move_line.invoice.get_matching_cash_discount(
+                        voucher.amount, payment_date=voucher.date)
+                    if not discount:
+                        continue
+
+                    discount_move_line_ids = move_line.invoice\
+                            .create_cash_discount_move_lines(
+                                payment_move_lines=move.line_id,
+                                discount=discount, date=move.date)
+
+                    #put correction entries into list with matching
+                    #original ones to have them reconciled at once
+                    for discount_move_line in account_move_line.browse(
+                            cr, uid, discount_move_line_ids, context=context):
+                        if discount_move_line.account_id == \
+                                move_line.account_id:
+                            ids.append(discount_move_line.id)
+
+        return total, ids_list
 
=== added directory 'account_cash_discount/security'
=== added file 'account_cash_discount/security/ir.model.access.csv'
--- account_cash_discount/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ account_cash_discount/security/ir.model.access.csv	2014-05-26 08:47:02 +0000
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+crud_cash_discount_line,"CRUD cash discount",model_account_payment_term_cash_discount,account.group_account_manager,1,1,1,1
+r_cash_discount_line,"R cash discount",model_account_payment_term_cash_discount,account.group_account_user,1,0,0,0
 
=== added directory 'account_cash_discount/view'
=== added file 'account_cash_discount/view/account_invoice.xml'
--- account_cash_discount/view/account_invoice.xml	1970-01-01 00:00:00 +0000
+++ account_cash_discount/view/account_invoice.xml	2014-05-26 08:47:02 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="invoice_form" model="ir.ui.view">
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form" />
+            <field name="arch" type="xml">
+                <data>
+                    <field name="move_id" position="after">
+                        <field name="cash_discount_move_id"
+                            groups="account.group_account_user"
+                            readonly="1"
+                            attrs="{'invisible': [('cash_discount_move_id', '=', False)]}"/>
+                    </field>
+                    <field name="residual" position="after">
+                        <div attrs="{'invisible': [('cash_discount_move_id', '=', False)]}" colspan="2">
+                            Note: This invoice was paid with a cash discount as detailed in the cash discount correction move on the 'Other info' tab
+                        </div>
+                    </field>
+                </data>
+            </field>
+        </record>
+    </data>
+</openerp>
 
=== added file 'account_cash_discount/view/account_move_line_reconcile.xml'
--- account_cash_discount/view/account_move_line_reconcile.xml	1970-01-01 00:00:00 +0000
+++ account_cash_discount/view/account_move_line_reconcile.xml	2014-05-26 08:47:02 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="view_account_move_line_reconcile_full" model="ir.ui.view">
+            <field name="model">account.move.line.reconcile</field>
+            <field name="inherit_id" ref="account.view_account_move_line_reconcile_full" />
+            <field name="arch" type="xml">
+                <data>
+                    <footer position="before">
+                        <group attrs="{'invisible': [('invoice_has_cash_discount', '=', False)]}">
+                            <field name="invoice_id" readonly="1" />
+                            <field name="invoice_has_cash_discount" invisible="1" />
+                        </group>
+                    </footer>
+                    <button string="Reconcile" position="after">
+                        <button string="Book difference as cash discount"
+                            type="object"
+                            name="reconcile_with_cash_discount"
+                            attrs="{'invisible': [('invoice_has_cash_discount', '=', False)]}"
+                            />
+                    </button>
+                </data>
+            </field>
+        </record>
+    </data>
+</openerp>
 
=== added file 'account_cash_discount/view/account_payment_term.xml'
--- account_cash_discount/view/account_payment_term.xml	1970-01-01 00:00:00 +0000
+++ account_cash_discount/view/account_payment_term.xml	2014-05-26 08:47:02 +0000
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_payment_term_disc_tree" model="ir.ui.view">
+            <field name="name">account.payment.term.disc.tree</field>
+            <field name="model">account.payment.term</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Payment Term">
+                    <field name="name"/>
+                    <field name="active"/>
+                </tree>
+            </field>
+        </record>
+
+
+        <record id="view_payment_term_disc_form" model="ir.ui.view">
+            <field name="name">account.payment.term.disc.form</field>
+            <field name="model">account.payment.term</field>
+            <field name="inherit_id" ref="account.view_payment_term_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="line_ids" position="after">
+                    <div class="oe_horizontal_separator oe_clear"><label for="cash_discount_ids" /></div>
+                    <field name="cash_discount_ids">
+                        <tree>
+                            <field name="days" />
+                            <field name="discount" />
+                            <field name="allowed_deviation" />
+                        </tree>
+                        <form>
+                            <group>
+                                <field name="days" />
+                                <field name="discount" />
+                                <field name="allowed_deviation" />
+                            </group>
+                            <group>
+                                <field name="discount_expense_account_id" />
+                                <field name="discount_income_account_id" />
+                            </group>
+                        </form>
+                    </field>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>
+ 
 
=== added directory 'account_cash_discount/wizard'
=== added file 'account_cash_discount/wizard/__init__.py'
--- account_cash_discount/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ account_cash_discount/wizard/__init__.py	2014-05-26 08:47:02 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2014 Therp BV (<http://therp.nl>).
+#
+#    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/>.
+#
+##############################################################################
+import account_move_line_reconcile
+import account_move_line_reconcile
 
=== added file 'account_cash_discount/wizard/account_move_line_reconcile.py'
--- account_cash_discount/wizard/account_move_line_reconcile.py	1970-01-01 00:00:00 +0000
+++ account_cash_discount/wizard/account_move_line_reconcile.py	2014-05-26 08:47:02 +0000
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2014 Therp BV (<http://therp.nl>).
+#
+#    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.orm import Model
+from openerp.osv import fields
+
+class AccountMoveLineReconcile(Model):
+    _inherit = 'account.move.line.reconcile'
+
+    _columns = {
+        'invoice_id': fields.many2one('account.invoice', 'Invoice'),
+        'invoice_has_cash_discount': fields.boolean('Cash discount on invoice')
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        result = super(AccountMoveLineReconcile, self).default_get(
+            cr, uid, fields, context=context)
+        for move_line in self.pool.get('account.move.line').browse(
+                cr, uid, context.get('active_ids', []), context=context):
+            if move_line.invoice:
+                if move_line.invoice.id != result.get('invoice_id'):
+                    result['invoice_id'] = move_line.invoice.id
+                    result['invoice_has_cash_discount'] = bool(
+                        move_line.invoice.get_matching_cash_discount(
+                            result.get('credit')) or
+                        move_line.invoice.get_matching_cash_discount(
+                            result.get('debit')))
+                else:
+                    result['invoice_id'] = False
+                    result['invoice_has_cash_discount'] = False
+        return result
+
+    def reconcile_with_cash_discount(self, cr, uid, ids, context=None):
+        account_move_line = self.pool.get('account.move.line')
+        for this in self.browse(cr, uid, ids, context=context):
+            discount = this.invoice_id.get_matching_cash_discount(this.credit)\
+                    or this.invoice_id.get_matching_cash_discount(this.debit)
+            if not discount:
+                continue
+            payment_move_lines = [
+                l for ml in account_move_line.browse(
+                        cr, uid, context.get('active_ids', []),
+                    context=context)
+                  for l in ml.move_id.line_id
+                if not l.invoice]
+            correction_move_line_ids = this.invoice_id\
+                    .create_cash_discount_move_lines(discount,
+                                                     payment_move_lines)
+            reconcile_ids = context.get('active_ids', [])
+            for correction_move_line in account_move_line.browse(
+                    cr, uid, correction_move_line_ids, context=context):
+                for payment_move_line in payment_move_lines:
+                    if payment_move_line.account_id ==\
+                            correction_move_line.account_id:
+                        reconcile_ids.append(correction_move_line.id)
+                        break
+            return self.trans_rec_reconcile_full(
+                cr, uid, [this.id], dict(context, active_ids=reconcile_ids))
+        pass