[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20120109132042-z1h8t2jgrc7mrfju

addons/crm/crm_lead_menu.xml

@@ -51,7 +51,7 @@
             name="Meetings"
             res_model="crm.meeting"
             src_model="crm.lead"
-            view_mode="tree,form,calendar,"
+            view_mode="tree,form,calendar"
             context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
             domain="[('opportunity_id', '=', active_id)]"
             view_type="form"/>

addons/crm/crm_phonecall_menu.xml

@@ -18,7 +18,7 @@
             name="Meetings"
             res_model="crm.meeting"
             src_model="crm.phonecall"
-            view_mode="tree,form,calendar,"
+            view_mode="tree,form,calendar"
             context="{'default_duration': 4.0, 'default_phonecall_id': active_id}"
             domain="[('phonecall_id', '=', active_id)]"
             view_type="form"/-->

addons/stock/stock_view.xml

@@ -682,7 +682,7 @@
                     <field name="invoice_state"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="action_process" states="confirmed,assigned" groups="stock.group_stock_user" string="Process" type="object" icon="gtk-go-forward"/>
+                    <button name="action_process" states="assigned" groups="stock.group_stock_user" string="Process" type="object" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>