[MERGE] fixes related to stored fields.function with a fnct_inv defined

bzr revid: qdp-launchpad@openerp.com-20121018150628-etdj3smsxud9nnjv

addons/account/report/account_print_overdue.rml

@@ -129,7 +129,7 @@
         </td>
         <td>
           <para style="terp_default_9">[[ o.title.name or '' ]] [[ o.name ]]</para>
-          <para style="terp_default_9">[[ display_address(o.partner_id) ]]</para>
+          <para style="terp_default_9">[[ display_address(o) ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>

addons/base_crypt/crypt.py

@@ -154,7 +154,6 @@ class users(osv.osv):
             encrypted = ''
         cr.execute('update res_users set password=%s where id=%s',
             (encrypted.encode('utf-8'), int(id)))
-        cr.commit()
         del value
 
     def get_pw( self, cr, uid, ids, name, args, context ):

addons/hr_recruitment/hr_recruitment_demo.yml

@@ -17,7 +17,6 @@
     priority: '3'
     user_id: base.user_demo
     partner_name: 'Marie Justine'
-    state: 'open'
     partner_mobile: '9988774455'
     job_id: hr.job_developer
     stage_id: stage_job4
@@ -41,7 +40,6 @@
     type_id: degree_bac5
     user_id: base.user_root
     partner_name: 'Sandra Elvis'
-    state: 'cancel'
     stage_id: stage_job6
     name: 'More than 5 yrs Experience in PHP'
 -
@@ -50,7 +48,6 @@
     type_id: degree_licenced
     user_id: base.user_demo
     partner_name: 'John Bruno'
-    state: 'done'
     job_id: hr.job_developer
     color: 5
     stage_id: stage_job5
@@ -61,8 +58,6 @@
     type_id: degree_licenced
     priority: '4'
     partner_name: 'David Armstrong'
-    state: 'pending'
-    state: open
     partner_mobile: '9966332214'
     job_id: hr.job_developer
     stage_id: stage_job2
@@ -73,7 +68,6 @@
     date: !eval time.strftime('%Y-%m-12 17:49:19')
     type_id: degree_bac5
     partner_name: 'Tina Augustie'
-    state: 'open'
     partner_mobile: '9898745745'
     job_id: hr.job_developer
     stage_id: stage_job4
@@ -85,7 +79,6 @@
     date: !eval time.strftime('%Y-%m-12 17:49:19')
     type_id: degree_bac5
     partner_name: 'Shane Williams'
-    state: 'open'
     partner_mobile: '9812398524'
     stage_id: stage_job4
     name: 'Programmer'

addons/point_of_sale/report/pos_payment_report_user.rml

@@ -194,7 +194,7 @@
           <para style="terp_tblheader_General_Right">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form'], currency_obj = company.currency_id)) or removeParentNode('blockTable')]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form']), currency_obj = company.currency_id) or removeParentNode('blockTable')]]</para>
         </td>
       </tr>
     </blockTable>

addons/project/project.py

@@ -777,7 +777,6 @@ class task(base_stage, osv.osv):
     _defaults = {
         'stage_id': _get_default_stage_id,
         'project_id': _get_default_project_id,
-        'state': 'draft',
         'kanban_state': 'normal',
         'priority': '2',
         'progress': 0,
@@ -1030,7 +1029,6 @@ class task(base_stage, osv.osv):
                 'user_id': delegate_data['user_id'] and delegate_data['user_id'][0] or False,
                 'planned_hours': delegate_data['planned_hours'] or 0.0,
                 'parent_ids': [(6, 0, [task.id])],
-                'state': 'draft',
                 'description': delegate_data['new_task_description'] or '',
                 'child_ids': [],
                 'work_ids': []

addons/project_issue/project_issue.py

@@ -275,7 +275,6 @@ class project_issue(base_stage, osv.osv):
         'active': 1,
         'partner_id': lambda s, cr, uid, c: s._get_default_partner(cr, uid, c),
         'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
-        'state': 'draft',
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
         'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
@@ -332,7 +331,7 @@ class project_issue(base_stage, osv.osv):
             })
             vals = {
                 'task_id': new_task_id,
-                'state':'pending'
+                'stage_id': self.stage_find(cr, uid, [bug], bug.project_id.id, [('state', '=', 'pending')], context=context),
             }
             self.convert_to_task_send_note(cr, uid, [bug.id], context=context)
             case_obj.write(cr, uid, [bug.id], vals, context=context)