[MERGE] with trunk

bzr revid: api@openerp.com-20121220121458-teqprsrz93ryz0x6

addons/account/__openerp__.py

@@ -133,7 +133,9 @@ for a particular financial year and for preparation of vouchers there is a modul
         "static/src/xml/account_move_reconciliation.xml",
         "static/src/xml/account_move_line_quickadd.xml",
     ],
-    'css':['static/src/css/account_move_reconciliation.css'
+    'css':[
+        'static/src/css/account_move_reconciliation.css',
+        'static/src/css/account_move_line_quickadd.css'
     ],
     'demo': [
         'demo/account_demo.xml',

addons/account/account_view.xml

@@ -1155,7 +1155,7 @@
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.line</field>
             <field name="view_id" ref="view_move_line_tree"/>
-            <field name="view_mode">tree_account_move_line_quickadd</field>
+            <field name="view_mode">tree_account_move_line_quickadd,form</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Select the period and the journal you want to fill.

addons/account/static/src/css/account_move_line_quickadd.css

@@ -0,0 +1,4 @@
+.openerp .oe_vm_switch_tree_account_move_line_quickadd:after {
+    padding: 2px;
+    content: "i";
+}

addons/anonymization/anonymization.py

@@ -543,7 +543,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
             fixes = group(fixes, ('model_name', 'field_name'))
 
             for line in data:
-                table_name = self.pool.get(line['model_id'])._table
+                table_name = self.pool.get(line['model_id'])._table if self.pool.get(line['model_id']) else None
 
                 # check if custom sql exists:
                 key = (line['model_id'], line['field_id'])

addons/portal_anonymous/security/ir.model.access.csv

@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mail_message_portal,mail.message.portal,mail.model_mail_message,portal.group_anonymous,1,0,1,0
+access_mail_message_portal,mail.message.portal,mail.model_mail_message,portal.group_anonymous,1,0,0,0
 access_res_partner,res.partner,base.model_res_partner,portal.group_anonymous,1,0,0,0

addons/portal_crm/contact.py

@@ -105,7 +105,7 @@ class crm_contact_us(osv.TransientModel):
         leads to a message_subscribe_user, that triggers access right issues.
         """
         empty_values = dict((k, False) if k != 'name' else (k, '') for k, v in values.iteritems())
-        return super(crm_contact_us, self).create(cr, uid, empty_values, {'mail_nosubscribe': True})
+        return super(crm_contact_us, self).create(cr, SUPERUSER_ID, empty_values, {'mail_nosubscribe': True})
 
     def submit(self, cr, uid, ids, context=None):
         """ When the form is submitted, redirect the user to a "Thanks" message """