[MERGE] addons 24

bzr revid: fp@openerp.com-20121127212322-soubdlrcgqx4cz88

diff --cc addons/account_analytic_analysis/account_analytic_analysis_view.xml
index fd32edb,a2431b7..be2a504
--- 1/addons/account_analytic_analysis/account_analytic_analysis_view.xml
--- 2/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@@ -60,10 -60,9 +60,9 @@@
                                      or view
                                  </span>
  
-                                 <span attrs="{'invisible': [('fix_price_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
+                                 <span attrs="{'invisible': ['|',('fix_price_to_invoice','&lt;&gt;',0.0 ),('partner_id','=',False)]}" class="oe_grey">
                                      No order to invoice, create
-                                 </span>
 -                                <button name="%(action_sales_order)d" string="Sale Orders" 
 +                                <button name="%(action_sales_order)d" string="Sale Orders"
                                      type="action"
                                      class="oe_link"
                                      context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}"

diff --cc addons/hr/hr_view.xml
Simple merge

diff --cc addons/hr_holidays/hr_holidays.py
index 0f11743,7612552..09936d0
--- 1/addons/hr_holidays/hr_holidays.py
--- 2/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@@ -143,10 -143,10 +143,10 @@@ class hr_holidays(osv.osv)
          'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, select=True),
          'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
          'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
-         'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
+         'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
          'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
          'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
 -        'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
 +        'number_of_days_temp': fields.float('Allocation', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
          'number_of_days': fields.function(_compute_number_of_days, string='Number of Days', store=True),
          'meeting_id': fields.many2one('crm.meeting', 'Meeting'),
          'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone", select=True),

diff --cc addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 3fd7cca,5c75e27..ac799f4
--- 1/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
--- 2/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@@ -67,7 -71,7 +67,7 @@@ class account_analytic_line(osv.osv)
              partner = account.partner_id
              if (not partner) or not (account.pricelist_id):
                  raise osv.except_osv(_('Analytic Account incomplete !'),
-                         _('Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n%s.') % (account.name,))
 -                        _('Contract form incomplete. Please fill in the Customer and Pricelist fields the contract form'))
++                        _('Contract incomplete. Please fill in the Customer and Pricelist fields.'))
  
  
  

diff --cc addons/lunch/lunch_view.xml
Simple merge

diff --cc addons/mail/mail_thread_view.xml
Simple merge