Merge lp:~therp-nl/therp-addons/7.0_lp1215631 into lp:~therp-nl/therp-addons/7.0

[Ronald Portier (Therp)]

Resubmit to merge with 7.0 branch.

Prevent crash of fetchmail invoice, when trying to retrieve default invoice partner.

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

Thanks!

One thing: line 15 will never be reached, because get_object_references raises ValueError if the data reference can not be found. You should catch this if you want to raise a more user friendly error than 'No such external ID defined'.

review: Needs Fixing

[Ronald Portier (Therp) (rportier1962)]

Hello Stefan,

I am perfectly happy with the message 'No such external ID defined' (although it would help a lot if the exception included the actual ID).

Using an assert means that I EXPECT the code NOT to be reached, if all the rest of the code leading to the assert is correct. However, suppose get_object_reference no longer throws an exception, but ignores the error, or any other change in any other part of code means that my assumption that I will have a partner_id on line 15/16 is no longer true: at that moment the assert kicks in.

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

OK, thanks for the explanation

review: Approve

=== modified file 'fetchmail_invoice/model/fetchmail_invoice.py'
--- fetchmail_invoice/model/fetchmail_invoice.py	2013-07-23 12:24:57 +0000
+++ fetchmail_invoice/model/fetchmail_invoice.py	2013-08-23 19:19:27 +0000
@@ -63,10 +63,12 @@
         # Retrieve partner_id from the email address
         # and add related field values
         custom_values['partner_id'] = (
-            msg_dict.get(
-                'author_id',
-                data_pool.get_object_reference(
-                    cr, uid, 'fetchmail_invoice', 'default_partner')[1]))
+            ('author_id' in msg_dict and msg_dict['author_id'])
+            or (data_pool.get_object_reference(
+                    cr, uid, 'fetchmail_invoice', 'default_partner')[1])
+            or False)
+        assert custom_values['partner_id'], _(
+            'No partner found to link invoice to')
         custom_values.update(
             self.onchange_partner_id(
                 cr, uid, [], 'in_invoice',