[MERGE] Merge with main branch

bzr revid: mra@tinyerp.com-20100416143724-d55j0eergsuf5xy8

diff --cc addons/account/account_bank_statement.py
index b7154c2,789ae81..deb010c
--- 1/addons/account/account_bank_statement.py
--- 2/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@@ -372,7 -352,16 +372,16 @@@ class account_bank_statement(osv.osv)
                  raise osv.except_osv(_('Invalid action !'), _('Cannot delete bank statement which are already confirmed !'))
          osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
          return True
 -    
 +
+     def copy(self, cr, uid, id, default=None, context=None):
+         if default is None:
+             default = {}
+         if context is None:
 -            context = {}    
++            context = {}
+         default = default.copy()
+         default['move_line_ids'] = []
+         return super(account_bank_statement, self).copy(cr, uid, id, default, context)
 -    
++
  account_bank_statement()
  
  

diff --cc addons/account/account_invoice_view.xml
Simple merge

diff --cc addons/account/account_view.xml
Simple merge

diff --cc addons/hr_evaluation/hr_evaluation_view.xml
index 93dc5a1,da245c4..bf6e453
--- 1/addons/hr_evaluation/hr_evaluation_view.xml
--- 2/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@@ -338,13 -338,9 +338,12 @@@
              id="menu_open_hr_evaluation_interview_requests"
              action="action_hr_evaluation_interview_tree"/>
  
 -        <menuitem name="Evaluation Reminders" parent="menu_eval_hr"
 -            id="menu_eval_send_mail"
 -            action="action_hr_evaluation_send_mail"
 -            sequence="45"/>
 +      <menuitem name="Evaluation Reminders" parent="menu_eval_hr"
 +           id="menu_eval_send_mail"
 +           action="action_hr_evaluation_send_mail"
 +           sequence="45"/>
 +
 +      <!-- Evaluation Interviews Button on Employee Form -->
 +      <act_window domain="[('user_to_review_id', '=', active_id)]" id="act_hr_employee_2_hr__evaluation_interview" name="Evaluation Interviews" res_model="hr.evaluation.interview" src_model="hr.employee"/>
- 
      </data>
  </openerp>

diff --cc addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
Simple merge

diff --cc addons/project/project_view.xml
Simple merge

diff --cc addons/project_long_term/project_long_term_view.xml
Simple merge