[MERGE] merge from lp:~openerp-commiter/openobject-addons/ergonomy-search-views

bzr revid: hmo@tinyerp.com-20091224110142-drqpn9il4e25v377

diff --cc addons/account/invoice.py
Simple merge

diff --cc addons/account_voucher/voucher.py
index 0f4a4e4,4a491e3..9b5d909
--- 1/addons/account_voucher/voucher.py
--- 2/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@@ -133,10 -137,10 +137,10 @@@ class account_voucher(osv.osv)
          'type': _get_type,
          'reference_type': lambda *a: 'none',
          'journal_id':_get_journal,
 -        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher', c),
 +        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher', context=c),
          'currency_id': _get_currency,
      }
-     
+ 
      def _get_analityc_lines(self, cr, uid, id):
          inv = self.browse(cr, uid, [id])[0]
          cur_obj = self.pool.get('res.currency')

diff --cc addons/hr_timesheet_sheet/hr_timesheet_sheet.py
Simple merge

diff --cc addons/mrp/mrp.py
index 1115150,f08c3c1..9a0d4f0
--- 1/addons/mrp/mrp.py
--- 2/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@@ -441,8 -441,8 +441,8 @@@ class mrp_production(osv.osv)
          'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),
          'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'),
  
-         'sale_name': fields.function(_sale_name_calc, method=True, type='char', string='Sale Name'),
-         'sale_ref': fields.function(_sale_ref_calc, method=True, type='char', string='Sale Reference'),
 -        'sale_name': fields.function(_sale_name_calc, method=True, type='char', string='Sale Name', help='Gives the name of sale order.'),
 -        'sale_ref': fields.function(_sale_ref_calc, method=True, type='char', string='Sale Reference', help='Gives the name of Customer Reference from sale order.'),
++        'sale_name': fields.function(_sale_name_calc, method=True, type='char', string='Sale Name', help='Indicate the name of sale order.'),
++        'sale_ref': fields.function(_sale_ref_calc, method=True, type='char', string='Sale Reference', help='Indicate the Customer Reference from sale order.'),
          'company_id': fields.many2one('res.company','Company',required=True),
      }
      _defaults = {
@@@ -793,7 -793,7 +793,7 @@@ class mrp_procurement(osv.osv)
      _description = "Procurement"
      _order = 'priority,date_planned'
      _columns = {
-         'name': fields.char('Name', size=64, required=True),
 -        'name': fields.char('Name', size=64, required=True, help='Requisition name. It differs when done by scheduler else same as origin name.'),
++        'name': fields.char('Name', size=64, required=True, help='Requisition name.'),
          'origin': fields.char('Origin', size=64,
              help="Reference of the document that created this Requisition.\n"
              "This is automatically completed by Open ERP."),