[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20101026131831-rygvcicz3vi3hk39

addons/account/account_view.xml

@@ -198,7 +198,7 @@
                 <search string="Accounts">
                     <group col="10" colspan="4">
                         <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
-                        <filter icon="terp-purchase" string="Purchase Accounts" domain="[('type','=','purchase')]"/>
+                        <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
                         <separator orientation="vertical"/>
                         <field name="code"/>
                         <field name="name"/>

addons/account/wizard/account_tax_chart.py

@@ -66,7 +66,8 @@ class account_tax_chart(osv.osv_memory):
             result['context'] = str({'state': data['target_move']})
 
         if data['period_id']:
-            result['name'] += ':' + self.pool.get('account.period').read(cr, uid, [data['period_id']], context=context)[0]['code']
+            period_code = period_obj.read(cr, uid, [data['period_id']], context=context)[0]['code']
+            result['name'] += period_code and (':' + period_code) or ''
         return result
 
     _defaults = {

addons/mrp/mrp.py

@@ -26,6 +26,7 @@ from osv import osv, fields
 from tools.translate import _
 import netsvc
 import time
+import tools
 
 
 #----------------------------------------------------------
@@ -311,7 +312,7 @@ class mrp_bom(osv.osv):
                     mult = (d + (m and 1.0 or 0.0))
                     cycle = mult * wc_use.cycle_nbr
                     result2.append({
-                        'name': bom.routing_id.name,
+                        'name': tools.ustr(wc_use.name) + ' - '  + tools.ustr(bom.product_id.name),
                         'workcenter_id': wc.id,
                         'sequence': level+(wc_use.sequence or 0),
                         'cycle': cycle,

addons/project/project_view.xml

@@ -85,7 +85,7 @@
                                 <label string="ID: %%(task_id)s"/>
                                 <label string="Status: %%(state)s"/>
                                 <label string="Date Start: %%(date_start)s"/>
-                                <label string="Date Stop: %%(date_stop)s"/>
+                                <label string="Date Stop: %%(date)s"/>
                             </group>
                         </page>
                         <page string="Tasks Stages" groups="base.group_extended">