Merge lp:~camptocamp/account-invoicing/7.0_fix_period_in_refund_mdh into lp:~account-core-editors/account-invoicing/7.0

[Matthieu Dietrich @ camptocamp]

[FIX] correctly retrieving period from form

Fixing an existing issue; if a period is filled out in the refund wizard, an issue is raised at validation: "Column 'period_id' is of type integer but expression is of type record".

I just fixed it as the journal above it; if it is present (aka. a record (id, name)), take the ID only instead of the tuple.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

This is surely nitpicking, but you can just write:

    if form.get('period'):

As get() will return a None if the key is not present.

I made this tiny change.

review: Approve

[lp:~camptocamp/account-invoicing/7.0_fix_period_in_refund_mdh]

25. By Guewen Baconnier @ Camptocamp on 2014-01-10

simplify statement

[Pedro Manuel Baeza (pedro.baeza)]

I was going to propose the same change ;)

Regards.

review: Approve (code review)

=== modified file 'invoice_validation_wkfl/invoice.py'
--- invoice_validation_wkfl/invoice.py	2013-05-13 08:30:34 +0000
+++ invoice_validation_wkfl/invoice.py	2014-01-10 13:21:26 +0000
@@ -93,8 +93,8 @@
                     raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
                 if inv.reconciled and mode in ('cancel', 'modify'):
                     raise osv.except_osv(_('Error !'), _('Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice') % (mode))
-                if form['period']:
-                    period = form['period']
+                if form.get('period'):
+                    period = form['period'][0]
                 else:
                     period = inv.period_id and inv.period_id.id or False