Merge lp:~pedro.baeza/ocb-addons/ocb-addons-bug-1000776 into lp:ocb-addons/6.1

[Pedro Manuel Baeza]

Bug #1000776
[FIX] account: Add an ondelete=cascade on the payment term line

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

of course it should be "cascade"! well spotted!

review: Approve

[Stefan Rijnhart (Opener) (stefan-opener)]

A proper backport, as per http://bazaar.launchpad.net/~openerp/openobject-addons/7.0/revision/7364. Thanks!

review: Approve

[Cristian Salamea (ovnicraft)]

Thanks for fix it !

review: Approve

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

=== modified file 'account/account.py'
--- account/account.py	2013-04-26 13:10:17 +0000
+++ account/account.py	2013-06-12 16:28:23 +0000
@@ -107,7 +107,7 @@
         'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \
             "If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."),
         'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."),
-        'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True),
+        'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True, ondelete='cascade'),
     }
     _defaults = {
         'value': 'balance',