From e4da848a9dc680046090a993046a6e1274c6fb29 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 16 Jul 2010 11:05:13 +0200
Subject: [PATCH 1/4] [IMP] marketing_campaign, email_template: first series of
 improvements during review of these modules for v6

bzr revid: odo@openerp.com-20100716090513-uvavs7wply3bpsfv
---
 addons/email_template/email_template.py       | 10 ++-
 .../email_template/email_template_account.py  | 20 ++---
 .../email_template_account_view.xml           |  2 +-
 .../marketing_campaign/marketing_campaign.py  | 79 +++++++++++--------
 .../marketing_campaign_view.xml               | 15 ++--
 5 files changed, 69 insertions(+), 57 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 07dce405c07..5aedea7ed72 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -133,11 +133,13 @@ class email_template(osv.osv):
                    string="Enforce From Account",
                    help="Emails will be sent only from this account(which are approved)."),
         'from_email' : fields.related('enforce_from_account', 'email_id',
-                                                type='char', string='From',),        
+                                                type='char', string='From',
+                                                help='From Email (select mail account)',
+                                                readonly=True),        
         'def_to':fields.char(
-                 'Recepient (To)',
+                 'Recipient (To)',
                  size=250,
-                 help="The default recepient of email." 
+                 help="The default recipient of email." 
                  "Placeholders can be used here."),
         'def_cc':fields.char(
                  'Default CC',
@@ -172,7 +174,7 @@ class email_template(osv.osv):
         'use_sign':fields.boolean(
                   'Signature',
                   help="the signature from the User details" 
-                  "will be appened to the mail"),
+                  " will be appended to the mail"),
         'file_name':fields.char(
                 'File Name Pattern',
                 size=200,
diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py
index e5bbe0f5e56..8c71ce05ddf 100644
--- a/addons/email_template/email_template_account.py
+++ b/addons/email_template/email_template_account.py
@@ -59,21 +59,23 @@ class email_template_account(osv.osv):
         'user':fields.many2one('res.users',
                         'Related User', required=True,
                         readonly=True, states={'draft':[('readonly', False)]}),
-        'email_id': fields.char('Email ID',
+        'email_id': fields.char('From Email',
                         size=120, required=True,
                         readonly=True, states={'draft':[('readonly', False)]} ,
-                        help=" eg:yourname@yourdomain.com "),
+                        help="eg: yourname@yourdomain.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 "),
+                        help="Enter name of outgoing server, eg:smtp.gmail.com "),
         'smtpport': fields.integer('SMTP Port ',
                         size=64, required=True,
                         readonly=True, states={'draft':[('readonly', False)]},
                         help="Enter port number,eg:SMTP-587 "),
         'smtpuname': fields.char('User Name',
                         size=120, required=False,
-                        readonly=True, states={'draft':[('readonly', False)]}),
+                        readonly=True, states={'draft':[('readonly', False)]},
+                        help="Specify the username if your SMTP server requires authentication, "
+                        "otherwise leave it empty."),
         'smtppass': fields.char('Password',
                         size=120, invisible=True,
                         required=False, readonly=True,
@@ -91,11 +93,11 @@ class email_template_account(osv.osv):
         'company':fields.selection([
                         ('yes', 'Yes'),
                         ('no', 'No')
-                        ], 'Company Mail A/c',
+                        ], 'Corporate',
                         readonly=True,
-                        help="Select if this mail account does not belong" \
-                        "to specific user but the organisation as a whole." \
-                        "eg:info@somedomain.com",
+                        help="Select if this mail account does not belong " \
+                        "to specific user but to the organization as a whole. " \
+                        "eg: info@companydomain.com",
                         required=True, states={
                                            'draft':[('readonly', False)]
                                            }),
@@ -316,8 +318,6 @@ class email_template_account(osv.osv):
                         msg['To'] = u','.join(addresses_l['To'])
                     if addresses_l['CC']:
                         msg['CC'] = u','.join(addresses_l['CC'])
-#                    if addresses_l['BCC']:
-#                        msg['BCC'] = u','.join(addresses_l['BCC'])
                     if body.get('text', False):
                         temp_body_text = body.get('text', '')
                         l = len(temp_body_text.replace(' ', '').replace('\r', '').replace('\n', ''))
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 4a35134bb41..d86b4187858 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -24,7 +24,7 @@
                                 <field name="smtpssl" select="2" colspan="2" />
                                 <field name="smtptls" select="2" colspan="2" />
                             </group>
-                            <button name="check_outgoing_connection" type="object" string="Check Outgoing Connection" />
+                            <button name="check_outgoing_connection" type="object" string="Test Outgoing Connection" />
                             <separator string="User Information" colspan="4" />
                             <group col="2" colspan="2">
                                 <field name="email_id" select="1" on_change="on_change_emailid(name,email_id)" colspan="2" />
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 83e5ed4f19f..b6d2bc72b94 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -26,6 +26,7 @@ from dateutil.relativedelta import relativedelta
 from operator import itemgetter
 from traceback import format_exception
 from sys import exc_info
+from tools.safe_eval import safe_eval as eval
 
 from osv import fields, osv
 import netsvc
@@ -82,6 +83,13 @@ class marketing_campaign(osv.osv):
     _name = "marketing.campaign"
     _description = "Marketing Campaign"
 
+
+    def _check_has_start(self, cr, uid, ids, context=None):
+        for campaign in self.browse(cr, uid, ids, context=context):
+            if not any(a.start for a in campaign.activity_ids):
+                return False
+        return True
+
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'object_id': fields.many2one('ir.model', 'Model', required=True,
@@ -90,15 +98,15 @@ this campaign to be run"),
         'partner_field_id': fields.many2one('ir.model.fields', 'Partner Field',
                                             domain="[('model_id', '=', object_id), ('ttype', '=', 'many2one'), ('relation', '=', 'res.partner')]",
                                             help="The generated workitems will be linked to the partner related to the record. If the record is the partner itself left this field empty."),
-        'mode':fields.selection([('test', 'Test Directly'),
+        'mode': fields.selection([('test', 'Test Directly'),
                                 ('test_realtime', 'Test in Realtime'),
                                 ('manual', 'With Manual Confirmation'),
                                 ('active', 'Normal')],
                                  'Mode', required=True, help= \
-"""Test - It creates and process all the activities directly (without waiting for the delay on transitions) but do not send emails or produce reports.
-Test in Realtime - It creates and process all the activities directly but do not send emails or produce reports.
+"""Test - It creates and process all the activities directly (without waiting for the delay on transitions) but does not send emails or produce reports.
+Test in Realtime - It creates and processes all the activities directly but does not send emails or produce reports.
 With Manual Confirmation - the campaigns runs normally, but the user has to validate all workitem manually.
-Normal - the campaign runs normally and automatically sends all emails and reports"""),
+Normal - the campaign runs normally and automatically sends all emails and reports (be very careful with this mode, you're live!)"""),
         'state': fields.selection([('draft', 'Draft'),
                                    ('running', 'Running'),
                                    ('done', 'Done'),
@@ -106,32 +114,34 @@ Normal - the campaign runs normally and automatically sends all emails and repor
                                    'State',),
         'activity_ids': fields.one2many('marketing.campaign.activity',
                                        'campaign_id', 'Activities'),
-        'fixed_cost': fields.float('Fixed Cost', help="The fixed cost is cost\
-you required for the campaign"),
+        'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for the campaign (used for campaign analysis), see also variable cost on activities"),
     }
+    
     _defaults = {
         'state': lambda *a: 'draft',
         'mode': lambda *a: 'test',
     }
+           
+    _constraints = [(_check_has_start, 'Please mark at least one activity as a start activity', ['Activities'])]
 
     def state_running_set(self, cr, uid, ids, *args):
         # TODO check that all subcampaigns are running
         campaign = self.browse(cr, uid, ids[0])
         if not campaign.activity_ids :
             raise osv.except_osv("Error", "There is no activitity in the campaign")
-        actvity_ids = [ act_id.id for act_id in campaign.activity_ids]
+        activity_ids = [ act_id.id for act_id in campaign.activity_ids]
+        
+        if not activity_ids:
+            raise osv.except_osv(_("Error"), _("The campaign cannot be started : there are no activities in it"))
+        
         act_obj = self.pool.get('marketing.campaign.activity')
-        act_ids  = act_obj.search(cr, uid, [('id', 'in', actvity_ids),
-                                                    ('start', '=', True)])
-        if not act_ids :
-            raise osv.except_osv("Error", "There is no starting activitity in the campaign")
-        act_ids = act_obj.search(cr, uid, [('id', 'in', actvity_ids),
+        act_ids = act_obj.search(cr, uid, [('id', 'in', activity_ids),
                                             ('type', '=', 'email')])
         for activity in act_obj.browse(cr, uid, act_ids):
             if not activity.email_template_id.enforce_from_account :
-                raise osv.except_osv("Error", "Campaign cannot be start : Email Account is missing in email activity")
+                raise osv.except_osv(_("Error"), _("The campaign cannot be started: an email account is missing in the email activity '%s'")%activity.name)
             if activity.email_template_id.enforce_from_account.state != 'approved' :
-                raise osv.except_osv("Error", "Campaign cannot be start : Email Account is not approved for email activity")
+                raise osv.except_osv(_("Error"), _("The campaign cannot be started: the email account is not approved in the email activity '%s'")%activity.name)
         self.write(cr, uid, ids, {'state': 'running'})
         return True
 
@@ -141,7 +151,7 @@ you required for the campaign"),
                                             [('campaign_id', 'in', ids),
                                             ('state', '=', 'running')])
         if segment_ids :
-            raise osv.except_osv("Error", "Campaign cannot be marked as done before all segments are done")
+            raise osv.except_osv(_("Error"), _("The campaign cannot be marked as done before all segments are done"))
         self.write(cr, uid, ids, {'state': 'done'})
         return True
 
@@ -187,7 +197,7 @@ you required for the campaign"),
         partner_field = campaign.partner_field_id.name
         if partner_field:
             return getattr(record, partner_field)
-        elif campaign.model_id.model == 'res.partner':
+        elif campaign.object_id.model == 'res.partner':
             return record
         return None
 
@@ -206,9 +216,10 @@ class marketing_campaign_segment(osv.osv):
                                       string='Object'),
         'ir_filter_id': fields.many2one('ir.filters', 'Filter', help=""),
         'sync_last_date': fields.datetime('Latest Synchronization'),
-        'sync_mode': fields.selection([('create_date', 'Sync only on creation'),
-                                      ('write_date', 'Sync at each modification')],
-                                      'Synchronization Mode'),
+        'sync_mode': fields.selection([('create_date', 'If record created after last sync'),
+                                      ('write_date', 'If record modified after last sync (no duplicates)')],
+                                      'Workitem creation mode',
+                                      help="Determines when new workitems should be created for records matching a segment."),
         'state': fields.selection([('draft', 'Draft'),
                                    ('running', 'Running'),
                                    ('done', 'Done'),
@@ -269,6 +280,7 @@ class marketing_campaign_segment(osv.osv):
                 criteria += eval(segment.ir_filter_id.domain)
             object_ids = model_obj.search(cr, uid, criteria, context=context)
 
+            # XXX TODO: rewrite this loop more efficiently without doing 1 search per record!
             for o_ids in model_obj.browse(cr, uid, object_ids, context=context):
                 # avoid duplicated workitem for the same resource
                 if segment.sync_mode == 'write_date':
@@ -318,9 +330,9 @@ class marketing_campaign_activity(osv.osv):
         'object_id': fields.related('campaign_id','object_id',
                                       type='many2one', relation='ir.model',
                                       string='Object', readonly=True),
-        'start': fields.boolean('Start',help= "This activity is launched when the campaign starts."),
+        'start': fields.boolean('Start', help= "This activity is launched when the campaign starts.", select=True),
         'condition': fields.char('Condition', size=256, required=True,
-                                 help="Python condition to know if the activity can be launched"),
+                                 help="Python condition to know if the activity can be executed, otherwise it will be deleted or cancelled."),
         'type': fields.selection(_action_types, 'Type', required=True,
                                   help="Describe type of action to be performed on the Activity.Eg : Send email,Send paper.."),
         'email_template_id': fields.many2one('email.template','Email Template'),
@@ -341,9 +353,9 @@ class marketing_campaign_activity(osv.osv):
         'variable_cost': fields.float('Variable Cost'),
         'revenue': fields.float('Revenue'),
         'signal': fields.char('Signal', size=128,
-                              help='An activity with a signal can be called programmatically. Attention, the workitem is always created when the signal is send'),
-        'keep_if_condition_not_met': fields.boolean('Keep if condition not met',
-                                                    help="By activating this option, the workitems that aren't processed because the condition is not met are marked as cancelled instead of being deleted.")
+                              help='An activity with a signal can be called programmatically. Be careful, the workitem is always created when a signal is sent'),
+        'keep_if_condition_not_met': fields.boolean('Keep as cancelled when condition not met',
+                                                    help="By activating this option, workitems that aren't executed because the condition is not met are marked as cancelled instead of being deleted.")
     }
 
     _defaults = {
@@ -460,7 +472,7 @@ class marketing_campaign_transition(osv.osv):
                                      ('cosmetic', 'Cosmetic'),  # fake plastic transition
                                     ],
                                     'Trigger', required=True,
-                                    help="How is triggered the destination workitem"),
+                                    help="How is the destination workitem triggered"),
     }
 
     _defaults = {
@@ -516,7 +528,7 @@ class marketing_campaign_workitem(osv.osv):
 
     def button_draft(self, cr, uid, workitem_ids, context={}):
         for wi in self.browse(cr, uid, workitem_ids, context=context):
-            if wi.state=='exception':
+            if wi.state in ('exception', 'cancelled'):
                 self.write(cr, uid, [wi.id], {'state':'todo'}, context=context)
         return True
 
@@ -531,13 +543,13 @@ class marketing_campaign_workitem(osv.osv):
             return
 
         activity = workitem.activity_id
+        proxy = self.pool.get(workitem.object_id.model)
+        object_id = proxy.browse(cr, uid, workitem.res_id, context=context)
 
         eval_context = {
-            'pool': self.pool,
-            'cr': cr,
-            'uid': uid,
-            'wi': workitem,
-            'object': activity,
+            'activity': activity,
+            'workitem': workitem,
+            'object': object_id,
             'transition': activity.to_ids
         }
         try:
@@ -585,7 +597,7 @@ class marketing_campaign_workitem(osv.osv):
                     wi_id = self.create(cr, uid, values, context=context)
 
                     # Now, depending of the trigger and the campaign mode 
-                    # we now if must run the newly created workitem.
+                    # we know if must run the newly created workitem.
                     #
                     # rows = transition trigger \ colums = campaign mode
                     #
@@ -675,6 +687,9 @@ class email_template(osv.osv):
     _defaults = {
         'object_name': lambda obj, cr, uid, context: context.get('object_id',False),
     }
+    
+    # TODO: add constraint to prevent disabling / disapproving an email account used in a running campaign
+     
 email_template()
 
 class report_xml(osv.osv):
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 1d07fc1e99c..289730a1531 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -236,20 +236,15 @@
                     </group>
                     <field name="type" width='100'/>
                     <group colspan='2' col='1'>
-                        <group attrs="{'invisible':[('type','!=','email')]}" >
-                            <field name="email_template_id" attrs="{'required':[('type','=','email')]}" />
-                        </group>
+                        <field name="email_template_id" attrs="{'required':[('type','=','email')], 'invisible':[('type','!=','email')]}"
+                               context="{'default_object_name':object_id}" />
                         <group attrs="{'invisible':[('type','!=','paper')]}" >
                             <field name="report_id" attrs="{'required':[('type','=','paper')]}" context="{'object_id':object_id}"/>
                             <field name="report_directory_id" attrs="{'required':[('type','=','paper')]}" />
                         </group>
-                        <group attrs="{'invisible':[('type','!=','action')]}" >
-                            <field name="server_action_id" attrs="{'required':[('type','=','action')]}" domain="[('model_id','=',object_id)]" />
-                        </group>
+                        <field name="server_action_id" attrs="{'required':[('type','=','action')],'invisible':[('type','!=','action')]}" domain="[('model_id','=',object_id)]" />
                         <!--
-                        <group attrs="{'invisible':[('type','!=','subcampaign')]}" >
-                            <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')]}" />
-                        </group>
+                         <field name="subcampaign_id" attrs="{'required':[('type','=','subcampaign')], 'invisible':[('type','!=','subcampaign')]}" />
                         -->
                     </group>
                 </group>
@@ -350,7 +345,7 @@
                 <separator string="Status" colspan="4"/>
                 <group colspan="4" col="11">
                     <field name="state" nolabel="1" readonly="True" select="1"/>
-                    <button string="Retry" states="exception" name="button_draft" type="object" icon="gtk-ok"/>
+                    <button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-ok"/>
                     <button string="Process" states="todo" name="process" type="object" icon="gtk-ok"/>
                     <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="gtk-cancel"/>
                 </group>

From e018cce62721e614c5be9486a2584276038a34a8 Mon Sep 17 00:00:00 2001
From: "psi(Openerp)" <>
Date: Fri, 16 Jul 2010 15:00:16 +0530
Subject: [PATCH 2/4] [FIX] scrum

bzr revid: mra@mra-laptop-20100716093016-3u0rq3w2z1hwfqz7
---
 addons/project_scrum/project_scrum.py       | 2 +-
 addons/project_scrum/project_scrum_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index 5fc873c40aa..11e1b785405 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -168,7 +168,7 @@ class project_scrum_product_backlog(osv.osv):
         if match:
             ids = self.search(cr, uid, [('sprint_id','=', int(match.group(1)))], limit=limit, context=context)
             return self.name_get(cr, uid, ids, context=context)
-        return super(scrum_product_backlog, self).name_search(cr, uid, name, args, operator,context, limit=limit)
+        return super(project_scrum_product_backlog, self).name_search(cr, uid, name, args, operator,context, limit=limit)
 
     def _calc_progress(self, cr, uid, ids, name, args, context):
         res = {}
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index fd044427869..007399c40a8 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -90,7 +90,7 @@
                                         <field name="total_hours" widget="float_time"/>
                                         <field name="remaining_hours" widget="float_time" sum="Remaining Hours" invisible="context.get('set_visible',False)"/>
                                         <field name="date_deadline" invisible="context.get('set_visible',False)"/>
-                                        <field name="type" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
+                                        <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
                                         <field name="date_start" invisible="1"/>
                                         <field name="date_end" invisible="1"/>
                                         <button name="next_type" invisible="context.get('set_visible',False)"

From 603d901247551bbd1d5637e10fe54b74f072d310 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 16 Jul 2010 15:46:51 +0530
Subject: [PATCH 3/4] [IMP] event: clean regarding start date, end date and
 improve calendar view

bzr revid: hmo@tinyerp.com-20100716101651-gvh1lcjl4d85ixml
---
 addons/event/event.py       | 34 +++++++---------------------------
 addons/event/event_view.xml | 34 +++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index f3402b047b7..6ed9ac62760 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -192,7 +192,7 @@ class event_event(osv.osv):
         return res
 
     _columns = {
-        'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
+        'name': fields.char('Summary', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
         'user_id': fields.many2one('res.users', 'Responsible User', readonly=False, states={'done': [('readonly', True)]}),
         'parent_id': fields.many2one('event.event', 'Parent Event', readonly=False, states={'done': [('readonly', True)]}),
         'section_id': fields.many2one('crm.case.section', 'Sale Team', readonly=False, states={'done': [('readonly', True)]}),
@@ -313,13 +313,14 @@ class event_registration(osv.osv):
         'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
         'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('history', '=', True),('model','=',_name)]),
         'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
+        'date_deadline': fields.related('event_id','date_end', type='datetime', string="End Date", readonly=True, store=True),
+        'date': fields.related('event_id', 'date_begin', type='datetime', string="Start Date", readonly=True, store=True),
         'section_id': fields.related('event_id', 'section_id', type='many2one', relation='crm.case.section', string='Sale Team', store=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.related('event_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
     }
     _defaults = {
         'nb_register': 1,
         'tobe_invoiced':  True,
-        'date': time.strftime('%Y-%m-%d %H:%M:%S')
     }
 
     def _make_invoice(self, cr, uid, reg, lines, context=None):
@@ -505,29 +506,7 @@ class event_registration(osv.osv):
         registrations = self.browse(cr, uid, ids)
         self._history(cr, uid, registrations, _('Cancel'))
         self.write(cr, uid, ids, {'state': 'cancel'})
-        return True
-
-    def create(self, cr, uid, values, context=None):
-        """ Overrides orm create method.
-        """
-        event_obj = self.pool.get('event.event')
-        event = event_obj.browse(cr, uid, values['event_id'], context=context)
-        values['date_deadline']= event.date_begin
-        values['description']= event.mail_confirm
-        res = super(event_registration, self).create(cr, uid, values, context=context)
-        registrations = self.browse(cr, uid, [res], context=context)
-        self._history(cr, uid, registrations, _('Created'))
-        return res
-
-    def write(self, cr, uid, ids, values, context=None):
-        """ Overrides orm write method.
-        """
-        event_obj = self.pool.get('event.event')
-        if 'event_id' in values:
-            event = event_obj.browse(cr, uid, values['event_id'], context=context)
-            values['date_deadline']= event.date_begin
-            values['description']= event.mail_confirm
-        return super(event_registration, self).write(cr, uid, ids, values, context=context)
+        return True    
 
     def mail_user(self, cr, uid, ids, confirm=False, context=None):
         """
@@ -618,10 +597,11 @@ class event_registration(osv.osv):
 
         event_obj = self.pool.get('event.event')
         prod_obj = self.pool.get('product.product')
-        res_obj = self.pool.get('res.partner')
+        res_obj = self.pool.get('res.partner') 
 
         data_event =  event_obj.browse(cr, uid, event_id)
-        res = {'value': {'unit_price': False, 'event_product': False, 'user_id': False}}
+        res = {'value': {'unit_price': False, 'event_product': False, 'user_id': False, 
+                        'date': data_event.date_begin, 'date_deadline': data_event.date_end, 'description': data_event.note, 'name': data_event.name}}
         if data_event.user_id.id:
             res['value'].update({'user_id':data_event.user_id.id})
         if data_event.product_id:
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index b199544345f..c1116af2611 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -45,7 +45,7 @@
             <field name="arch" type="xml">
                 <form string="Events">
                     <group col="6" colspan="4">
-                        <field name="name" string="Event"/>
+                        <field name="name"/>
                         <field name="date_begin"/>
                         <field name="date_end"/>
                         <field name="type" widget="selection"/>
@@ -54,7 +54,7 @@
                     </group>
                     <notebook colspan="4">
                     <page string="Event">
-                        <group colspan="4" col="4">
+                        <group colspan="4" col="4">                            
                             <separator string="Invoice Information" colspan="4"/>
                             <field name="product_id" on_change="onchange_product(product_id)" colspan="4"/>
                             <field name="unit_price"/>
@@ -72,6 +72,8 @@
                             <field name="address_id" domain="[('country_id','=',country_id)]"/>
 
                         </group>
+                        <separator string="Description" colspan="4"/>
+                        <field name="note" colspan="4" nolabel="1"/>
                         <field name="state" select="1"/>
                         <group col="4" colspan="2">
                            <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
@@ -91,7 +93,7 @@
                         <field name="register_max"/>
                         <field name="register_current"/>
                         <field name="register_prospect"/>
-                        <field name="registration_ids" colspan="4" nolabel="1">
+                        <field name="registration_ids" colspan="4" nolabel="1" readonly="1">
                             <form string="Registration">
                                 <field name="name"/>
                                 <field name="date" string="Date"/>
@@ -112,8 +114,8 @@
                                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                 </group>
                             </form>
-                            <tree string="Registration" editable="bottom">
-                                    <field name="date" string="Date"/>
+                            <tree string="Registration">
+                                    <field name="create_date" string="Registration Date"/>
                                     <field name="partner_id" required="1" string="Partner" on_change="onchange_partner_id(partner_id,event_id)"/>
                                     <field name="event_product"/>
                                     <field name="nb_register"/>
@@ -145,11 +147,7 @@
                             <separator string="Confirmation Email Body" colspan="2"/>
                             <field name="mail_confirm" colspan="2" nolabel="1" attrs="{'readonly':[('mail_auto_confirm','=',False)]}"/>
                         </group>
-                    </page>
-                    <page string="Notes">
-                        <separator string="Notes" colspan="4"/>
-                        <field name="note" colspan="4" nolabel="1"/>
-                    </page>
+                    </page>                   
                     </notebook>
             </form>
             </field>
@@ -308,7 +306,7 @@
                 <form string="Registration">
                     <group col="6" colspan="4">
                         <field name="event_id" on_change="onchange_event(event_id, partner_invoice_id)" domain="[('state','in',('draft','confirm'))]"/>
-                        <field name="date" string="Registration Date"/>
+                        <field name="create_date" string="Registration Date"/>
                         <field name="name"/>
                         <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id,event_id)" />
                         <field name="user_id"/>
@@ -316,6 +314,8 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Registration">
+                            <field name="date" />
+                            <field name="date_deadline" />
                             <group colspan="2" col="2">
                                 <separator string="Registration Cost" colspan="4"/>
                                 <field name="nb_register"/>
@@ -328,7 +328,8 @@
                                 <field name="partner_invoice_id" attrs="{'required':[('tobe_invoiced','=',True)]}" on_change="onchange_partner_invoice_id(event_id, partner_invoice_id)"/>
                                 <field name="invoice_id"/>                                
                            </group>
-                            
+                            <separator string="Description" colspan="4"/>
+                            <field name="description" colspan="4" nolabel="1"/>
                             <group col="8" colspan="4">
                                 <separator string="" colspan="4"/>
                                 <newline/>
@@ -354,12 +355,11 @@
                                     <field name="address_id"/>
                                 </form>
                             </field>
-                            <group col="2" colspan="2">
-                               <separator string="Dates" colspan="2"/>
-                               <field name="create_date"/>
+                            <group col="2" colspan="2" groups="base.group_extended">
+                               <separator string="Dates" colspan="2"/>                               
                                <field name="date_closed"/>
                             </group>
-                            <group col="2" colspan="2">
+                            <group col="2" colspan="2" groups="base.group_extended">
                                <separator string="Misc" colspan="2"/>
                                <field name="id"/>
                                <field name="active"/>
@@ -417,7 +417,7 @@
             <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <calendar color="event_id" date_start="create_date" string="Event Registration">
+                <calendar color="event_id" date_start="date" date_delay="duration" string="Event Registration">
                     <field name="event_id"/>
                     <field name="partner_invoice_id"/>
                 </calendar>

From 9230c1f5a4d5a67b24da565e7185006d09d3966b Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Fri, 16 Jul 2010 16:04:18 +0530
Subject: [PATCH 4/4] [REF] minor edit

bzr revid: jvo@tinyerp.com-20100716103418-a2di4gvf8k2r0ivv
---
 addons/account/report/general_ledger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py
index 32186c269f9..c7153e65921 100644
--- a/addons/account/report/general_ledger.py
+++ b/addons/account/report/general_ledger.py
@@ -266,7 +266,7 @@ class general_ledger(rml_parse.rml_parse):
             JOIN account_journal j on (l.journal_id=j.id)
             WHERE %s AND l.account_id = %%s AND l.date<=%%s AND l.date>=%%s ORDER by %s
         """ % (self.query, sql_sort)
-        self.cr.execute(sql, (account.id,  self.date_borne['max_date'], self.date_borne['min_date']))
+        self.cr.execute(sql, (account.id, self.date_borne['max_date'], self.date_borne['min_date']))
         res = self.cr.dictfetchall()
         account_sum = 0.0
         account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')