diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 9a4e948cbe1..01c35880fbb 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -186,6 +186,8 @@ def map_data(cr, uid, obj, context=None):
             if field_type == 'selection':
                 if not map_val:
                     continue
+                if type(map_val) == list and len(map_val): #TOFIX: why need to check this
+                    map_val = map_val[0]
                 mapping = obj.__attribute__[map_dict].get('mapping', False)
                 if mapping:
                     map_val = mapping.get(map_val.lower(), False)
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 078cbdc475c..85225505237 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -186,10 +186,9 @@ This is useful for CRM leads for example"),
                   help="the signature from the User details" 
                   " will be appended to the mail"),
         'file_name':fields.char(
-                'File Name Pattern',
+                'Report Filename',
                 size=200,
-                help="File name pattern can be specified with placeholders." 
-                "eg. 2009_SO003.pdf",
+                help="Name of the generated report file. Placeholders can be used in the filename. eg: 2009_SO003.pdf",
                 translate=True),
         'report_template':fields.many2one(
                   'ir.actions.report.xml',
@@ -646,8 +645,8 @@ This is useful for CRM leads for example"),
             # use provided message_id with placeholders
             mailbox_values.update({'message_id': get_value(cursor, user, record_id, template['message_id'], template, context)})
 
-        if template['track_campaign_item']:
-            # get appropriate message-id 
+        elif template['track_campaign_item']:
+            # get appropriate message-id
             mailbox_values.update({'message_id': tools.misc.generate_tracking_message_id(record_id)})
 
         if not mailbox_values['account_id']:
@@ -734,7 +733,7 @@ class email_template_preview(osv.osv_memory):
             context = {}
             #Fills up the selection box which allows records from the selected object to be displayed
         self.context = context
-        if 'template_id' in context.keys():
+        if 'template_id' in context:
             ref_obj_id = self.pool.get('email.template').read(cr, uid, context['template_id'], ['object_name'], context)
             ref_obj_name = self.pool.get('ir.model').read(cr, uid, ref_obj_id['object_name'][0], ['model'], context)['model']
             model_obj = self.pool.get(ref_obj_name)
@@ -746,6 +745,16 @@ class email_template_preview(osv.osv_memory):
                 ref_obj_ids.insert(0, default_id)
             return model_obj.name_get(cr, uid, ref_obj_ids, context)
 
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        result = super(email_template_preview, self).default_get(cr, uid, fields, context=context)
+        if (not fields or 'rel_model_ref' in fields) and 'template_id' in context \
+           and not result.get('rel_model_ref'):
+            selectables = self._get_model_recs(cr, uid, context=context)
+            result['rel_model_ref'] = selectables and selectables[0][0] or False
+        return result
+
     def _default_model(self, cursor, user, context=None):
         """
         Returns the default value for model field
@@ -786,7 +795,7 @@ class email_template_preview(osv.osv_memory):
     }
     _defaults = {
         'ref_template': lambda self, cr, uid, ctx:ctx['template_id'],
-        'rel_model': _default_model
+        'rel_model': _default_model,
     }
     def on_change_ref(self, cr, uid, ids, rel_model_ref, context=None):
         if context is None:
diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py
index fdbcaa703bc..24b7958276d 100644
--- a/addons/email_template/email_template_account.py
+++ b/addons/email_template/email_template_account.py
@@ -92,15 +92,15 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
         'email_id': fields.char('From Email',
                         size=120, required=True,
                         readonly=True, states={'draft':[('readonly', False)]} ,
-                        help="eg: yourname@yourdomain.com "),
+                        help="eg: 'john@doe.com' or 'John Doe <john@doe.com>'"),
         'smtpserver': fields.char('Server',
                         size=120, required=True,
                         readonly=True, states={'draft':[('readonly', False)]},
-                        help="Enter name of outgoing server, eg:smtp.gmail.com "),
-        'smtpport': fields.integer('SMTP Port ',
+                        help="Enter name of outgoing server, eg: smtp.yourdomain.com"),
+        'smtpport': fields.integer('SMTP Port',
                         size=64, required=True,
                         readonly=True, states={'draft':[('readonly', False)]},
-                        help="Enter port number,eg:SMTP-587 "),
+                        help="Enter port number, eg: 25 or 587"),
         'smtpuname': fields.char('User Name',
                         size=120, required=False,
                         readonly=True, states={'draft':[('readonly', False)]},
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 201f32db726..0c30d7d478f 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -20,12 +20,12 @@
                             <separator string="Server Information" colspan="4" />
                             <group colspan="4" col="4">
                                 <field name="smtpserver" select="1"/>
+                                <button name="check_outgoing_connection" type="object" string="Test Outgoing Connection" icon="gtk-network" colspan="2"/>
                                 <field name="smtpport" select="2" />
                                 <field name="smtpssl" select="2" />
                                 <field name="smtptls" select="2" />
                                 <field name="auto_delete" />
                             </group>
-                            <button name="check_outgoing_connection" type="object" string="Test Outgoing Connection" icon="gtk-network"/>
                             <separator string="User Information" colspan="4" />
                             <group col="2" colspan="2">
                                 <field name="email_id" select="1" colspan="2" />
@@ -55,14 +55,15 @@
             <field name="model">email_template.account</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree  colors="blue:state in ('draft');black:state in ('suspended','approved')" string="SMTP Server">
-                    <field name="name" select="2" />
-                    <field name="email_id" select="2" />
-                    <field name="smtpuname" select="2" />
-                    <field name="user" select="2" />
-                    <field name="smtpserver" select="2" />
-                    <field name="smtpport" select="2" />
-                    <field name="state" select="2" />
+                <tree colors="blue:state in ('draft');black:state in ('suspended','approved')" string="Email Accounts">
+                    <field name="name" />
+                    <field name="email_id" />
+                    <field name="smtpuname" />
+                    <field name="user" />
+                    <field name="smtpserver" />
+                    <field name="smtpport" />
+                    <field name="auto_delete" />
+                    <field name="state" />
                 </tree>
             </field>
         </record>
@@ -72,7 +73,7 @@
            <field name="model">email_template.account</field>
            <field name="type">search</field>
            <field name="arch" type="xml">
-               <search string="Accounts">
+               <search string="Email Accounts">
                     <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]"/>
                     <filter icon="terp-camera_test" string="Approved" domain="[('state','=','approved')]"/>
                     <filter icon="terp-emblem-important" string="Suspended" domain="[('state','=','suspended')]"/>
diff --git a/addons/email_template/email_template_mailbox_view.xml b/addons/email_template/email_template_mailbox_view.xml
index 586195155bd..38757ba7d68 100644
--- a/addons/email_template/email_template_mailbox_view.xml
+++ b/addons/email_template/email_template_mailbox_view.xml
@@ -89,7 +89,7 @@
                     <field name="email_from"/>
                     <field name="user">
                         <filter icon="terp-personal"
-                            string="My Emails" name="myemails"
+                            string="My Emails" help="My Emails" name="myemails"
                             domain="[('account_id.user','=', uid)]" />
                     </field>
                     <newline/>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 8d851f17641..36e7a5f9037 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -133,9 +133,9 @@
                                         <field name="attachment_ids" colspan="4" nolabel="1" height="350"/>
                                     </page>
                                     <page string="Report">
-                                        <field name="file_name" colspan="4" />
                                         <field name="report_template" colspan="4"
                                             domain="[('model','=',model_int_name)]" />
+                                        <field name="file_name" colspan="4" />
                                     </page>
                                 </notebook>
                             </group>
@@ -151,15 +151,17 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Email Templates">
-                    <field name="name" select="1" />
-                    <field name="object_name" required="1" select="1" />
-                    <field name="def_to" colspan="4" select="2" />
-                    <field name="def_cc" colspan="4" select="2" />
-                    <field name="def_bcc" colspan="4" select="2" />
-                    <field name="def_subject" colspan="4" select="2" />
-                    <field name="use_sign" colspan="4" select="2" />
-                    <field name="file_name" colspan="4" />
-                    <field name="from_account" />
+                    <field name="name"/>
+                    <field name="from_account"/>
+                    <field name="object_name"/>
+                    <field name="def_to"/>
+                    <field name="def_cc"/>
+                    <field name="def_bcc"/>
+                    <field name="def_subject"/>
+                    <field name="use_sign"/>
+                    <field name="file_name"/>
+                    <button name="%(wizard_email_template_preview)d" string="Preview Template"
+                            type="action" target="new" icon="gtk-zoom-fit"/>
                 </tree>
             </field>
         </record>
@@ -170,14 +172,21 @@
            <field name="type">search</field>
            <field name="arch" type="xml">
                <search string="Templates">
-                    <separator orientation="vertical"/>
-                    <field name="name" select="1"/>
-                    <field name="object_name" select="1"/>
-                    <field name="def_to" select="1"/>
-                    <separator orientation="vertical"/>
-                    <field name="lang" select="1"/>
-                    <field name="def_subject" select="1"/>
-                    <field name="file_name" select="1"/>
+                    <group col="13" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="object_name" select="1"/>
+                        <field name="def_to" select="1"/>
+                        <separator orientation="vertical"/>
+                        <field name="lang" select="1"/>
+                        <field name="def_subject" select="1"/>
+                        <field name="file_name" select="1"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group by..." colspan="4" col="10">
+                        <filter string="Account" domain="[]" context="{'group_by':'from_account'}" icon="terp-personal"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Resource" domain="[]" context="{'group_by':'object_name'}" icon="terp-accessories-archiver"/>
+                    </group>
                </search>
            </field>
         </record>
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index c9383b53b15..4fd4fda5253 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -135,12 +135,12 @@ Normal - the campaign runs normally and automatically sends all emails and repor
             if activity.type != 'email':
                 continue
             if not activity.email_template_id.from_account:
-                raise osv.except_osv(_("Error"), _("The campaign cannot be started: an email account is missing in the email activity '%s'")%activity.name)
+                raise osv.except_osv(_("Error"), _("The campaign cannot be started: the email account is missing in email activity '%s'")%activity.name)
             if activity.email_template_id.from_account.state != 'approved':
-                raise osv.except_osv(_("Error"), _("The campaign cannot be started: the email account is not approved in the email activity '%s'")%activity.name)
+                raise osv.except_osv(_("Error"), _("The campaign cannot be started: the email account is not approved in email activity '%s'")%activity.name)
 
         if not has_start and not has_signal_without_from:
-            raise osv.except_osv(_("Error"), _("The campaign hasn't any starting activity nor any activity with a signal and no previous activity."))
+            raise osv.except_osv(_("Error"), _("The campaign cannot be started: it doesn't have any starting activity (or any activity with a signal and no previous activity)"))
 
         return self.write(cr, uid, ids, {'state': 'running'})
 
@@ -213,27 +213,31 @@ class marketing_campaign_segment(osv.osv):
     _name = "marketing.campaign.segment"
     _description = "Campaign Segment"
 
+    def _get_next_sync(self, cr, uid, ids, fn, args, context=None):
+        # next auto sync date is same for all segments
+        sync_job = self.pool.get('ir.model.data').get_object(cr, uid, 'marketing_campaign', 'ir_cron_marketing_campaign_every_day', context=context)
+        next_sync = sync_job and sync_job.nextcall or False
+        return dict.fromkeys(ids, next_sync)
+
     _columns = {
         'name': fields.char('Name', size=64,required=True),
-        'campaign_id': fields.many2one('marketing.campaign', 'Campaign',
-             required=True, select=1, ondelete="cascade"),
-        'object_id': fields.related('campaign_id','object_id',
-                                      type='many2one', relation='ir.model',
-                                      string='Object'),
-        'ir_filter_id': fields.many2one('ir.filters', 'Filter', help="Filter to select the matching resource records that belong to this segment. New filters can be created and saved using the advanced search on the list view of the Resource"),
+        'campaign_id': fields.many2one('marketing.campaign', 'Campaign', required=True, select=1, ondelete="cascade"),
+        'object_id': fields.related('campaign_id','object_id', type='many2one', relation='ir.model', string='Resource'),
+        'ir_filter_id': fields.many2one('ir.filters', 'Filter', help="Filter to select the matching resource records that belong to this segment. New filters can be created and saved using the advanced search on the list view of the Resource. If no filter is set, all records are selected without filtering. The synchronization mode may also add a criterion to the filter."),
         'sync_last_date': fields.datetime('Last Synchronization', help="Date on which this segment was synchronized last time (automatically or manually)"),
-        'sync_mode': fields.selection([('create_date', 'If record created after last sync'),
-                                      ('write_date', 'If record modified after last sync (no duplicates)'),
+        'sync_mode': fields.selection([('create_date', 'Only records created after last sync'),
+                                      ('write_date', 'Only records modified after last sync (no duplicates)'),
                                       ('all', 'All records (no duplicates)')],
-                                      'Workitem creation mode',
-                                      help="Determines how new campaign workitems are created for resource records matching this segment. This is used when segments are synchronized manually, or automatically via the scheduled job."),
+                                      'Synchronization mode',
+                                      help="Determines an additional criterion to add to the filter when selecting new records to inject in the campaign."),
         'state': fields.selection([('draft', 'Draft'),
                                    ('running', 'Running'),
                                    ('done', 'Done'),
                                    ('cancelled', 'Cancelled')],
                                    'State',),
-        'date_run': fields.datetime('Launching Date', help="Initial start date of this segment."),
+        'date_run': fields.datetime('Launch Date', help="Initial start date of this segment."),
         'date_done': fields.datetime('End Date', help="Date this segment was last closed or cancelled."),
+        'date_next_sync': fields.function(_get_next_sync, method=True, string='Next Synchronization', type='datetime', help="Next time the synchronization job is scheduled to run automatically"),
     }
 
     _defaults = {
@@ -264,7 +268,6 @@ class marketing_campaign_segment(osv.osv):
             if model_name:
                 mod_name = model_name[0]['model']
                 res['domain'] = {'ir_filter_id': [('model_id', '=', mod_name)]}
-                res['context'] = {'default_model_id': model_name[0]['model']}
         else:
             res['value'] = {'ir_filter_id': False}
         return res
@@ -594,7 +597,7 @@ class marketing_campaign_workitem(osv.osv):
         'campaign_id': fields.related('activity_id', 'campaign_id',
              type='many2one', relation='marketing.campaign', string='Campaign', readonly=True, store=True),
         'object_id': fields.related('activity_id', 'campaign_id', 'object_id',
-             type='many2one', relation='ir.model', string='Resource', select=1, readonly=True),
+             type='many2one', relation='ir.model', string='Resource', select=1, readonly=True, store=True),
         'res_id': fields.integer('Resource ID', select=1, readonly=True),
         'res_name': fields.function(_res_name_get, method=True, string='Resource Name', fnct_search=_resource_search, type="char", size=64),
         'date': fields.datetime('Execution Date', help='If date is not set, this workitem has to be run manually', readonly=True),
diff --git a/addons/marketing_campaign/marketing_campaign_data.xml b/addons/marketing_campaign/marketing_campaign_data.xml
index 42ed4d12118..4f337b1d60e 100644
--- a/addons/marketing_campaign/marketing_campaign_data.xml
+++ b/addons/marketing_campaign/marketing_campaign_data.xml
@@ -5,7 +5,7 @@
     <!-- Cron -->
 
         <record model="ir.cron" id="ir_cron_marketing_campaign_every_hour">
-            <field name="name">Check Marketing Campaign Activities</field>
+            <field name="name">Marketing Campaign: Campaign workitems processing</field>
             <field name="interval_number">1</field>
             <field name="interval_type">hours</field>
             <field name="numbercall">-1</field>
@@ -14,9 +14,9 @@
             <field name="function" eval="'process_all'"/>
             <field name="args" eval="'()'"/>
         </record>
-        
+
         <record model="ir.cron" id="ir_cron_marketing_campaign_every_day">
-            <field name="name">Check Segment</field>
+            <field name="name">Marketing Campaign: Segment Sync</field>
             <field name="interval_number">1</field>
             <field name="interval_type">days</field><!-- it s every day -->
             <field name="numbercall">-1</field>
@@ -25,6 +25,6 @@
             <field name="function" eval="'process_segment'"/>
             <field name="args" eval="'()'"/>
         </record>
-                
+
     </data>
 </openerp>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index cbcb7fe1b76..7d1c8d3d2bf 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -32,14 +32,14 @@
                         <field name="fixed_cost"/>
                     </group>
                 </group>
-                <field name="activity_ids" nolabel = "1" colspan="4" default_get="{'default_object_id': object_id}" />
+                <field name="activity_ids" nolabel = "1" colspan="4" context="{'default_object_id': object_id, 'default_campaign_id': active_id}" />
                 <separator string="" colspan="4" />
                 <group col="10" colspan="4">
                     <field name="state" readonly="1" />
                     <button name="state_running_set" string="Run" states="draft,done,cancelled" icon="gtk-apply"/>
                     <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
                     <button name="state_done_set" string="Close" states="running" icon="terp-dialog-close"/>
-                    <button name="state_cancel_set" string="Cancelled" states="running" icon="terp-gtk-stop"/>
+                    <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
                 </group>
               </form>
         </field>
@@ -139,18 +139,19 @@
                     <separator string="Segment" colspan="4"/>
                     <field name="name"/>
                     <field name="campaign_id" select="1" on_change="onchange_campaign_id(campaign_id)"/>
+                    <field name="object_id" invisible="1"/>
                 </group>
                 <group colspan="2" col="2">
                     <separator string="Filter" colspan="4"/>
-                    <field name="ir_filter_id" select="1"/>
+                    <field name="ir_filter_id" domain="[('model_id', '=', object_id)]"/>
                 </group>
                 <newline/>
-                <group colspan="2" col="2">
+                <group colspan="2" col="4">
                    <separator string="Synchronization" colspan="4"/>
-                   <field name="sync_mode" required="True"/>
-                   <field name="sync_last_date"/>
-                   <label string="" colspan="1"/>
-                   <button string="Synchronize" states="running" name="synchroniz" icon="terp-project" type="object"/>
+                   <field name="sync_mode" required="True" colspan="4"/>
+                   <field name="sync_last_date" colspan="3"/>
+                   <button string="Synchronize Manually" states="running" name="synchroniz" icon="terp-project" type="object"/>
+                   <field name="date_next_sync" colspan="3"/>
                 </group>
                 <group colspan="2" col="2">
                     <separator string="History" colspan="2"/>
@@ -179,6 +180,7 @@
                 <field name="campaign_id"/>
                 <field name="date_run"/>
                 <field name="sync_last_date"/>
+                <button string="Synchronize Manually" states="running" name="synchroniz" icon="terp-project" type="object"/>
                 <field name="state" />
             </tree>
         </field>
@@ -193,9 +195,9 @@
                <filter icon="terp-check" string="Running" name="running" domain="[('state','=','running')]"/>
                <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]"/>
                <separator orientation="vertical"/>
-               <filter icon="terp-project" string="Newly Created" domain="[('sync_mode','=','create_date')]"/>
-               <filter icon="terp-project" string="Newly Modified" domain="[('sync_mode','=','write_date')]"/>
-               <filter icon="terp-project" string="All" domain="[('sync_mode','=','all')]"/>
+               <filter icon="terp-project" string="Newly Created" help="Sync mode: only records created after last sync" domain="[('sync_mode','=','create_date')]"/>
+               <filter icon="terp-project" string="Newly Modified" help="Sync mode: only records updated after last sync" domain="[('sync_mode','=','write_date')]"/>
+               <filter icon="terp-project" string="All" help="Sync mode: all records" domain="[('sync_mode','=','all')]"/>
                <separator orientation="vertical"/>
                <field name="name" select="1"/>
                <field name="campaign_id" select="1"/>
@@ -207,7 +209,7 @@
                    <separator orientation="vertical"/>
                    <filter string="State" name="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
                    <separator orientation="vertical"/>
-                   <filter string="Run Date" name="Date Run" icon="terp-go-month" context="{'group_by':'date_run'}" />
+                   <filter string="Launch Date" name="Launch Date" icon="terp-go-month" context="{'group_by':'date_run'}" />
                </group>
            </search>
        </field>
@@ -246,6 +248,7 @@
                     <field name="signal" groups="base.group_extended"/>
                     <field name="start"/>
                     <field name="object_id" invisible="1"/>
+                    <field name="campaign_id" invisible="1"/>
                 </group>
                 <group colspan='2' col='2'>
                     <separator string="Cost / Revenue" colspan="4"/>
@@ -271,37 +274,35 @@
                         <field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]" />
                     </group>
                 </group>
-                <group colspan="4" col="2">
-                    <separator string="Transitions" colspan="2"/>
-                    <field name="from_ids" nolabel="1" mode="tree,form" default_get="{'default_activity_to_id': active_id}">
-                        <tree string="Incoming Transitions" editable="bottom">
-                            <field name="activity_from_id"/>
-                            <field name='trigger'/>
-                            <field name="interval_nbr"/>
-                            <field name="interval_type"/>
-                        </tree>
-                        <form string="Incoming Transitions">
-                            <field name="activity_from_id"/>
-                            <field name='trigger'/>
-                            <field name="interval_nbr"/>
-                            <field name="interval_type"/>
-                        </form>
-                    </field>
-                    <field name="to_ids" nolabel="1" mode="tree,form" default_get="{'default_activity_from_id': active_id}">
-                        <tree string="Outgoing Transitions" editable="bottom">
-                            <field name="activity_to_id"/>
-                            <field name='trigger'/>
-                            <field name="interval_nbr"/>
-                            <field name="interval_type"/>
-                        </tree>
-                        <form string="Outgoing Transitions">
-                            <field name="activity_to_id"/>
-                            <field name='trigger'/>
-                            <field name="interval_nbr"/>
-                            <field name="interval_type"/>
-                        </form>
-                     </field>
-                </group>
+                <separator string="Transitions" colspan="4"/>
+                <field name="from_ids" nolabel="1" mode="tree,form" context="{'default_activity_to_id': active_id}" colspan="2">
+                    <tree string="Incoming Transitions" editable="bottom">
+                        <field name="activity_from_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
+                        <field name='trigger'/>
+                        <field name="interval_nbr"/>
+                        <field name="interval_type"/>
+                    </tree>
+                    <form string="Incoming Transitions">
+                        <field name="activity_from_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
+                        <field name='trigger'/>
+                        <field name="interval_nbr"/>
+                        <field name="interval_type"/>
+                    </form>
+                </field>
+                <field name="to_ids" nolabel="1" mode="tree,form" context="{'default_activity_from_id': active_id}" colspan="2">
+                    <tree string="Outgoing Transitions" editable="bottom">
+                        <field name="activity_to_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
+                        <field name='trigger'/>
+                        <field name="interval_nbr"/>
+                        <field name="interval_type"/>
+                    </tree>
+                    <form string="Outgoing Transitions">
+                        <field name="activity_to_id" domain="[('campaign_id', '=', parent.campaign_id)]"/>
+                        <field name='trigger'/>
+                        <field name="interval_nbr"/>
+                        <field name="interval_type"/>
+                    </form>
+                </field>
             </form>
         </field>
     </record>
@@ -333,14 +334,15 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree colors="red:state in ('exception');black:state in ('todo');gray:state in ('cancelled')" string="Marketing Campaign Activities">
+                <field name="campaign_id"/>
                 <field name="segment_id"/>
                 <field name="activity_id" />
+                <field name="object_id" invisible="1"/>
+                <field name="res_id" invisible="1"/>
                 <field name="res_name" />
                 <field name="partner_id"/>
                 <field name="date"/>
                 <field name="state"/>
-                <field name="res_id" invisible="1"/>
-                <field name="campaign_id" invisible="1"/>
                 <button string="Preview" states="todo" name="preview" icon="gtk-zoom-fit" type="object"/>
                 <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
                 <button string="Cancel" states="todo" name="button_cancel" type="object" icon="terp-gtk-stop"/>
@@ -394,21 +396,28 @@
        <field name="type">search</field>
        <field name="arch" type="xml">
            <search string="Marketing Campaign Activities">
-               <filter icon="terp-go-today" string="Today" name="today" domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/>
-               <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
-               <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
-               <separator orientation="vertical"/>
-               <field name="segment_id" select="1"/>
-               <field name="res_name" select="1"/>
-               <field name="res_id" select="1"/>
-               <field name="partner_id" select="1"/>
-               <field name="date" select="1"/>
+               <group colspan="4" col="10">
+                <filter icon="terp-go-today" string="Today" name="today" domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')), ('date','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]"/>
+                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','todo')]"/>
+                <filter icon="terp-emblem-important" string="Exception" domain="[('state','=','exception')]"/>
+                <separator orientation="vertical"/>
+                <field name="campaign_id"/>
+                <field name="segment_id"/>
+                <field name="date"/>
+                <newline/>
+                <field name="object_id"/>
+                <field name="res_name"/>
+                <field name="res_id"/>
+                <field name="partner_id"/>
+               </group>
                <newline/>
                <group expand="0" string="Group By..." colspan="10" col="12">
                    <filter string="Campaign" name="campaign" icon="terp-gtk-jump-to-rtl" context="{'group_by':'campaign_id'}" />
                    <filter string="Segment" name="segment" icon="terp-stock_symbol-selection" context="{'group_by':'segment_id'}" />
                    <filter string="Activity" name="activity" icon="terp-stock_align_left_24" context="{'group_by':'activity_id'}" />
-                   <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'res_id'}" />
+                   <separator orientation="vertical"/>
+                   <filter string="Resource" name="resource" icon="terp-accessories-archiver" context="{'group_by':'object_id'}" />
+                   <filter string="Resource ID" name="res_id" icon="terp-accessories-archiver" context="{'group_by':'res_id'}" />
                    <separator orientation="vertical"/>
                    <filter string="State" name="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" />
                    <separator orientation="vertical"/>
@@ -426,7 +435,7 @@
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_marketing_campaign_workitem_tree"/>
         <field name="search_view_id" ref="view_marketing_campaign_workitem_search"/>
-        <field name="context">{'group_by': [], 'search_default_todo': 1}</field>
+        <field name="context">{'group_by': [], 'search_default_todo': 1, 'search_default_today': 1}</field>
     </record>
 
     <menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing_campaign" action="action_marketing_campaign_workitem" sequence="30"/>
@@ -443,7 +452,7 @@
     <!-- Campaign Followups -->
     <act_window domain="[('campaign_id', '=', active_id)]"
         id="act_marketing_campaing_followup"
-        name="Campaign Follow-ups" res_model="marketing.campaign.workitem"
+        name="Campaign Follow-up" res_model="marketing.campaign.workitem"
         src_model="marketing.campaign" view_mode="tree,form"
         view_type="form" />
 
diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py
index aa0e0e01a22..066423c546c 100644
--- a/addons/marketing_campaign/report/campaign_analysis.py
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -44,11 +44,12 @@ class campaign_analysis(osv.osv):
     _columns = {
         'res_id' : fields.integer('Resource', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'),
-                    ('03','March'), ('04','April'),('05','May'), ('06','June'),
-                    ('07','July'), ('08','August'), ('09','September'),
-                    ('10','October'), ('11','November'), ('12','December')],
-                    'Month', readonly=True),
+        'month': fields.selection([('01','January'), ('02','February'),
+                                     ('03','March'), ('04','April'),('05','May'), ('06','June'),
+                                     ('07','July'), ('08','August'), ('09','September'),
+                                     ('10','October'), ('11','November'), ('12','December')],
+                                  'Month', readonly=True),
+        'day': fields.char('Day', size=10, readonly=True),
         'date': fields.date('Date', readonly=True),
         'campaign_id': fields.many2one('marketing.campaign', 'Campaign',
                                                                 readonly=True),
@@ -63,6 +64,9 @@ class campaign_analysis(osv.osv):
                                     type="float" ),
         'revenue': fields.float('Revenue',digits=(16,2),readonly=True),
         'count' : fields.integer('# of Actions', readonly=True),
+        'state': fields.selection([('todo', 'To Do'),
+                                   ('exception', 'Exception'), ('done', 'Done'),
+                                   ('cancelled', 'Cancelled')], 'State', readonly=True),
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'campaign_analysis')
@@ -73,6 +77,7 @@ class campaign_analysis(osv.osv):
                 min(wi.res_id) as res_id,
                 to_char(wi.date::date, 'YYYY') as year,
                 to_char(wi.date::date, 'MM') as month,
+                to_char(wi.date::date, 'YYYY-MM-DD') as day,
                 wi.date::date as date,
                 s.campaign_id as campaign_id,
                 wi.activity_id as activity_id,
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index d88be86d01e..aa994fcfc48 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -9,6 +9,7 @@
             <tree string="Marketing Reports">
                 <field name="year" invisible="1"/>
                 <field name="month" invisible="1"/>
+                <field name="day" invisible="1"/>
                 <field name="date" invisible="1"/>
                 <field name="campaign_id" invisible="1"/>
                 <field name="activity_id" invisible="1"/>
@@ -28,7 +29,7 @@
         <field name="model">campaign.analysis</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Marketing Reports">
+            <search string="Campaign Analysis">
                    <group>
                     <filter icon="terp-go-year"
                             string="This Year"
@@ -66,7 +67,7 @@
                     <separator orientation="vertical"/>
                     <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Date" icon="terp-go-today" context="{'group_by':'date'}"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                 </group>
@@ -75,7 +76,7 @@
     </record>
 
     <record id="action_campaign_analysis_all" model="ir.actions.act_window">
-        <field name="name">Campaigns</field>
+        <field name="name">Campaign Analysis</field>
         <field name="res_model">campaign.analysis</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree</field>
diff --git a/addons/project_mailgate/project_mailgate.py b/addons/project_mailgate/project_mailgate.py
index d402374b5ea..9b6b7d77f7b 100644
--- a/addons/project_mailgate/project_mailgate.py
+++ b/addons/project_mailgate/project_mailgate.py
@@ -120,34 +120,34 @@ class project_tasks(osv.osv):
                                        message_id=message_id, attach=attach, \
                                        context=context)
         
-    def do_draft(self, cr, uid, ids, *args):
-        res = super(project_tasks, self).do_draft(cr, uid, ids, *args)
+    def do_draft(self, cr, uid, ids, *args, **kwargs):
+        res = super(project_tasks, self).do_draft(cr, uid, ids, *args, **kwargs)
         tasks = self.browse(cr, uid, ids)
         self._history(cr, uid, tasks, _('Draft'))
         return res
     
-    def do_open(self, cr, uid, ids, *args):
-        res = super(project_tasks, self).do_open(cr, uid, ids, *args)
+    def do_open(self, cr, uid, ids, *args, **kwargs):
+        res = super(project_tasks, self).do_open(cr, uid, ids, *args, **kwargs)
         tasks = self.browse(cr, uid, ids)
         self._history(cr, uid, tasks, _('Open'))
         return res
     
-    def do_pending(self, cr, uid, ids, *args):
-        res = super(project_tasks, self).do_pending(cr, uid, ids, *args)
+    def do_pending(self, cr, uid, ids, *args, **kwargs):
+        res = super(project_tasks, self).do_pending(cr, uid, ids, *args, **kwargs)
         tasks = self.browse(cr, uid, ids)
         self._history(cr, uid, tasks, _('Pending'))
         return res
     
-    def do_close(self, cr, uid, ids, *args):
-        res = super(project_tasks, self).do_close(cr, uid, ids, *args)
+    def do_close(self, cr, uid, ids, *args, **kwargs):
+        res = super(project_tasks, self).do_close(cr, uid, ids, *args, **kwargs)
         tasks = self.browse(cr, uid, ids)
         for task in tasks:
             if task.state == 'done':
                 self._history(cr, uid, tasks, _('Done'))
         return res
     
-    def do_cancel(self, cr, uid, ids, *args):
-        res = super(project_tasks, self).do_cancel(cr, uid, ids, *args)
+    def do_cancel(self, cr, uid, ids, *args, **kwargs):
+        res = super(project_tasks, self).do_cancel(cr, uid, ids, *args, **kwargs)
         tasks = self.browse(cr, uid, ids)
         self._history(cr, uid, tasks, _('Cancel'))
         return res
diff --git a/addons/project_mrp/project_mrp.py b/addons/project_mrp/project_mrp.py
index 4e99ee0b281..5f3eb4616be 100644
--- a/addons/project_mrp/project_mrp.py
+++ b/addons/project_mrp/project_mrp.py
@@ -29,22 +29,20 @@ class project_task(osv.osv):
         'procurement_id': fields.many2one('procurement.order', 'Procurement', ondelete='set null')
     }
 
-    def do_close(self, cr, uid, ids, *args):
-        res = super(project_task, self).do_close(cr, uid, ids, *args)
-        tasks = self.browse(cr, uid, ids)
-        for task in tasks:
+    def _validate_subflows(self, cr, uid, ids):
+        for task in self.browse(cr, uid, ids):
             if task.procurement_id:
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'procurement.order', task.procurement_id.id, 'subflow.done', cr)
+
+    def do_close(self, cr, uid, ids, *args, **kwargs):
+        res = super(project_task, self).do_close(cr, uid, ids, *args, **kwargs)
+        self._validate_subflows(cr, uid, ids)
         return res
 
-    def do_cancel(self, cr, uid, ids, *args):
-        res = super(project_task, self).do_cancel(cr, uid, ids, *args)
-        tasks = self.browse(cr, uid, ids)
-        for task in tasks:
-            if task.procurement_id:
-                wf_service = netsvc.LocalService("workflow")
-                wf_service.trg_validate(uid, 'procurement.order', task.procurement_id.id, 'subflow.cancel', cr)
+    def do_cancel(self, cr, uid, ids, *args, **kwargs):
+        res = super(project_task, self).do_cancel(cr, uid, ids, *args, **kwargs)
+        self._validate_subflows(cr, uid, ids)
         return True
 
 project_task()
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index ceab22fd98a..2bcb2f2d88f 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -69,19 +69,20 @@
     ],
     'demo_xml': ['sale_demo.xml'],
     'test': [
-             'test/data_test.yml',
-             'test/manual_order_policy.yml',
-             'test/prepaid_order_policy.yml',
-             'test/picking_order_policy.yml',
-             'test/postpaid_order_policy.yml',
-             'test/advance_invoice.yml',
-             'test/so_make_line_invoice.yml',
-             'test/sale_procurement.yml',
-             'test/invoice_on_ordered_qty.yml',
-             'test/invoice_on_shipped_qty.yml',
-            ],
+        'test/data_test.yml',
+        'test/manual_order_policy.yml',
+        'test/prepaid_order_policy.yml',
+        'test/picking_order_policy.yml',
+        'test/postpaid_order_policy.yml',
+        'test/advance_invoice.yml',
+        'test/so_make_line_invoice.yml',
+        'test/sale_procurement.yml',
+        'test/invoice_on_ordered_qty.yml',
+        'test/invoice_on_shipped_qty.yml',
+        'test/sale_order_print.yml',
+    ],
     'installable': True,
     'active': False,
     'certificate': '0058103601429',
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/test/sale_order_print.yml b/addons/sale/test/sale_order_print.yml
new file mode 100644
index 00000000000..def94d8c27e
--- /dev/null
+++ b/addons/sale/test/sale_order_print.yml
@@ -0,0 +1,8 @@
+-
+  In order to test the PDF reports defined on a sale order, we will print a sale order
+- 
+  !python {model: sale.order}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.sale.order').create(cr, uid, [ref('sale.order'),ref('sale.order2')], {}, {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'sale-sale_order.'+format), 'wb+').write(data)