[IMP] remove print + innecessary diff on merge

addons/gamification/models/goal.py

@@ -282,7 +282,7 @@ class gamification_goal(osv.Model):
                         _logger.exception(_('Invalid return content from the evaluation of code for definition %s' % definition.name))
 
             else:  # count or sum
-                
+
                 obj = self.pool.get(definition.model_id.model)
                 field_date_name = definition.field_date_id and definition.field_date_id.name or False
 
@@ -349,7 +349,7 @@ class gamification_goal(osv.Model):
             if not value:
                 continue
             goal = all_goals[goal_id]
-            
+            #
             # check goal target reached
             if (goal.definition_condition == 'higher' and value.get('current', goal.current) >= goal.target_goal) \
               or (goal.definition_condition == 'lower' and value.get('current', goal.current) <= goal.target_goal):

addons/gamification_sale_crm/sale_crm_goals_demo.xml

@@ -7,15 +7,5 @@
             <field name="state">inprogress</field>
         </record>
 
-        <!-- goals -->
-        <record model="gamification.goal" id="goal_crm_sale1">
-            <field name="definition_id" eval="ref('definition_crm_tot_invoices')" />
-            <field name="user_id" eval="ref('base.user_demo')" />
-            <field name="line_id" eval="ref('line_crm_sale1')" />
-            <field name="start_date" eval="time.strftime('%Y-%m-01')" />
-            <field name="end_date" eval="(DateTime.today().replace(day=1)+relativedelta(months=1, days=-1)).strftime('%Y-%m-%d')" />
-            <field name="target_goal">2000</field>
-        </record>
-        
     </data>
 </openerp>

addons/mail/mail_alias.py

@@ -204,7 +204,6 @@ class mail_alias(osv.Model):
             alias_vals['alias_defaults'] = dict((k, obj_data[v]) for k, v in alias_defaults.iteritems())
             alias_vals['alias_parent_thread_id'] = obj_data['id']
             alias_create_ctx = dict(context, alias_model_name=alias_model_name, alias_parent_model_name=child_model_name)
-            print 'EEEEEEEEEEEe',alias_vals, alias_create_ctx
             alias_id = mail_alias.create(cr, SUPERUSER_ID, alias_vals, context=alias_create_ctx)
             child_class_model.write(cr, SUPERUSER_ID, obj_data['id'], {'alias_id': alias_id}, context={'mail_notrack': True})
             _logger.info('Mail alias created for %s %s (id %s)', child_model_name, obj_data[alias_key], obj_data['id'])