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

[Stefan Rijnhart (Opener)]

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

=== modified file 'fetchmail_invoice/__openerp__.py'
--- fetchmail_invoice/__openerp__.py	2012-12-28 14:10:30 +0000
+++ fetchmail_invoice/__openerp__.py	2013-07-23 12:28:23 +0000
@@ -35,17 +35,18 @@
 The actual emails can be inspected on a dedicated tab on the invoice
 form which is otherwise invisible.
 
-This module is compatible with OpenERP 6.1
+This module is compatible with OpenERP 7.0.
+
+Known issues: not safe for use within a multicompany database.
 """,
     "depends": [
         'fetchmail',
         'account'
         ],
     "data": [
-        'view/invoice.xml',
         'data/partner_data.xml',
         'data/installer.xml',
         ],
-    'installable': False,
+    'installable': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'fetchmail_invoice/data/installer.xml'
--- fetchmail_invoice/data/installer.xml	2012-07-27 15:17:16 +0000
+++ fetchmail_invoice/data/installer.xml	2013-07-23 12:28:23 +0000
@@ -15,9 +15,9 @@
             </field>
         </record>
 
-        <record model="ir.actions.todo" id="config_wizard_action_link_invoice_to_email_account">
+        <record model="ir.actions.todo" id="base.open_menu">
             <field name="action_id" ref="action_link_invoice_to_email_account" />
-            <field name="category_id" ref="account.category_accounting_configuration" />
+            <field name="state">open</field>
         </record>
     </data>
 </openerp>
 
=== modified file 'fetchmail_invoice/data/partner_data.xml'
--- fetchmail_invoice/data/partner_data.xml	2012-07-27 15:17:16 +0000
+++ fetchmail_invoice/data/partner_data.xml	2013-07-23 12:28:23 +0000
@@ -3,14 +3,9 @@
     <data noupdate="1">
         <record id="default_partner" model="res.partner">
             <field name="name">Default partner for incoming invoices by email</field>
-            <field name="address" eval="[]"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="customer" eval="False"/>
-        </record>
-        <record id="default_partner_address" model="res.partner.address">
-            <field name="partner_id" ref="default_partner"/>
-            <field name="type">default</field>
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-    </data>
+            <field name="is_company" eval="False"/>
+        </record>
+   </data>
 </openerp>
 
=== modified file 'fetchmail_invoice/model/fetchmail_invoice.py'
--- fetchmail_invoice/model/fetchmail_invoice.py	2012-07-27 15:17:16 +0000
+++ fetchmail_invoice/model/fetchmail_invoice.py	2013-07-23 12:28:23 +0000
@@ -19,12 +19,12 @@
 #
 ##############################################################################
 import base64
-from osv import osv, fields
+from openerp.osv import orm, fields
 from tools.translate import _
 
-class account_invoice(osv.osv):
+class account_invoice(orm.Model):
     _name = 'account.invoice'
-    _inherit = ['mail.thread', 'account.invoice']
+    _inherit = 'account.invoice'
 
     def message_new(
         self, cr, uid, msg_dict, custom_values=None, context=None):
@@ -63,10 +63,10 @@
         # Retrieve partner_id from the email address
         # and add related field values
         custom_values['partner_id'] = (
-            self.message_partner_by_email(
-                cr, uid, email_from, context=None)['partner_id']
-            or data_pool.get_object_reference(
-                cr, uid, 'fetchmail_invoice', 'default_partner')[1])
+            msg_dict.get(
+                'author_id',
+                data_pool.get_object_reference(
+                    cr, uid, 'fetchmail_invoice', 'default_partner')[1]))
         custom_values.update(
             self.onchange_partner_id(
                 cr, uid, [], 'in_invoice',
 
=== removed file 'fetchmail_invoice/view/invoice.xml'
--- fetchmail_invoice/view/invoice.xml	2012-07-27 15:17:16 +0000
+++ fetchmail_invoice/view/invoice.xml	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="invoice_supplier_form" model="ir.ui.view">
-            <field name="name">account.invoice.supplier.form</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form"/>
-            <field name="arch" type="xml">
-                <page string="Payments" position="after">
-                    <page string="Emails" attrs="{
-                        'invisible': [('message_ids', '=', False)]
-                        }">
-                        <field name="message_ids" nolabel="1" colspan="4"/>
-                    </page>
-                </page>
-            </field>
-        </record>
-    </data>
-</openerp>
-
-                        
-                        
 \ No newline at end of file