From 4dfb95b46e7bdb0573a7631bf86c490e01039227 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 18 Oct 2012 10:49:27 +0200 Subject: [PATCH 01/10] [FIX] mail: attempt to fix crazy bug bzr revid: qdp-launchpad@openerp.com-20121018084927-yr1mp6svwq55eayn --- addons/mail/mail_group.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py index 3febe34be51..eb53cf96078 100644 --- a/addons/mail/mail_group.py +++ b/addons/mail/mail_group.py @@ -61,7 +61,7 @@ class mail_group(osv.Model): 'image_medium': fields.function(_get_image, fnct_inv=_set_image, string="Medium-sized photo", type="binary", multi="_get_image", store={ - 'mail.group': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10), + 'mail.group': (lambda self, cr, uid, ids, c={}: ids, ['image', 'image_medium'], 10), }, help="Medium-sized photo of the group. It is automatically "\ "resized as a 128x128px image, with aspect ratio preserved. "\ @@ -69,7 +69,7 @@ class mail_group(osv.Model): 'image_small': fields.function(_get_image, fnct_inv=_set_image, string="Small-sized photo", type="binary", multi="_get_image", store={ - 'mail.group': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10), + 'mail.group': (lambda self, cr, uid, ids, c={}: ids, ['image', 'image_small'], 10), }, help="Small-sized photo of the group. It is automatically "\ "resized as a 64x64px image, with aspect ratio preserved. "\ From 47bed5e14f717f36e35e89d7e56b39ac74c008c6 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 18 Oct 2012 12:02:22 +0200 Subject: [PATCH 02/10] [FIX] removing a cr.commit() bzr revid: qdp-launchpad@openerp.com-20121018100222-jttfkv4e8rq7a4pa --- addons/base_crypt/crypt.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py index 3accc2740e9..14e029eb988 100644 --- a/addons/base_crypt/crypt.py +++ b/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 ): From 5795a34ec4e65980e7229fbfeb274cb5428df149 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 18 Oct 2012 14:49:49 +0200 Subject: [PATCH 03/10] [FIX] project: state is not draft by default, but given by the stage bzr revid: qdp-launchpad@openerp.com-20121018124949-97x6tc5tlvskfh3f --- addons/project/project.py | 1 - addons/project/project_demo.xml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/project.py b/addons/project/project.py index 9a022fffa90..8aa09065705 100644 --- a/addons/project/project.py +++ b/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, diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml index cd22bad67d4..c9b6dce7cd8 100644 --- a/addons/project/project_demo.xml +++ b/addons/project/project_demo.xml @@ -129,6 +129,7 @@ Budget Planning + pending 4 From 3555be5c5630f5b29c6be925a0207a91b6ff4546 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 18 Oct 2012 14:54:23 +0200 Subject: [PATCH 04/10] [FIX] project: when delegating a task, do copy the task state too bzr revid: qdp-launchpad@openerp.com-20121018125423-8qj0j380j7odvaz0 --- addons/project/project.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/project/project.py b/addons/project/project.py index 8aa09065705..56d7fef0e49 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -1029,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': [] From ed7ea104b87bd767e6aee14d06a2a0024698844d Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 18 Oct 2012 15:00:26 +0200 Subject: [PATCH 05/10] [FIX] account, overdue report: fixed error 'partner has no attribute named partner_id' bzr revid: qdp-launchpad@openerp.com-20121018130026-m76e7xja21v1stbm --- addons/account/report/account_print_overdue.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml index 8b8238030fe..1755f0a334d 100644 --- a/addons/account/report/account_print_overdue.rml +++ b/addons/account/report/account_print_overdue.rml @@ -129,7 +129,7 @@ [[ o.title.name or '' ]] [[ o.name ]] - [[ display_address(o.partner_id) ]] + [[ display_address(o.id) ]] From e25d11022f24c76f9c9903bdc9572ead018de423 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 18 Oct 2012 15:42:12 +0200 Subject: [PATCH 06/10] [FIX] hr_recruitment: fixed yaml test that was creating records with inconsistent data (stage & state should be syncro as state is a fields.related) bzr revid: qdp-launchpad@openerp.com-20121018134212-z4o0qmuleubx70zt --- addons/hr_recruitment/hr_recruitment_demo.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/addons/hr_recruitment/hr_recruitment_demo.yml b/addons/hr_recruitment/hr_recruitment_demo.yml index 3f00c7e643b..2554c690c15 100644 --- a/addons/hr_recruitment/hr_recruitment_demo.yml +++ b/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' From a292f894ef68fbd8efac9b492635f91e607aef68 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 18 Oct 2012 15:57:28 +0200 Subject: [PATCH 07/10] [FIX] project_issue: fix inconsistent data (stage & state should be syncro as state is a fields.related) bzr revid: qdp-launchpad@openerp.com-20121018135728-jaynrxb88550ydgt --- addons/project_issue/project_issue.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 9e434078d2f..1cb5b20edbd 100644 --- a/addons/project_issue/project_issue.py +++ b/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) From e5ea70b4c26b9e7d45339c42ef391f41ac1ff1f0 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 18 Oct 2012 15:59:49 +0200 Subject: [PATCH 08/10] [FIX] point_of_sale: typo in report bzr revid: qdp-launchpad@openerp.com-20121018135949-b08zihsoo7s0km05 --- addons/point_of_sale/report/pos_payment_report_user.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml index 1d89d28c5f9..3671408b760 100644 --- a/addons/point_of_sale/report/pos_payment_report_user.rml +++ b/addons/point_of_sale/report/pos_payment_report_user.rml @@ -194,7 +194,7 @@ Total: - [[ formatLang(pos_payment_user_total(data['form'], currency_obj = company.currency_id)) or removeParentNode('blockTable')]] + [[ formatLang(pos_payment_user_total(data['form']), currency_obj = company.currency_id) or removeParentNode('blockTable')]] From b4fbe43de11dfc4801d34fd5f3bbfcf15b08b24f Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 18 Oct 2012 16:26:01 +0200 Subject: [PATCH 09/10] [REV] reverting some useless patches before merge in feature branch bzr revid: qdp-launchpad@openerp.com-20121018142601-trgb2kbgrvzl4jk2 --- addons/mail/mail_group.py | 4 ++-- addons/project/project_demo.xml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py index eb53cf96078..3febe34be51 100644 --- a/addons/mail/mail_group.py +++ b/addons/mail/mail_group.py @@ -61,7 +61,7 @@ class mail_group(osv.Model): 'image_medium': fields.function(_get_image, fnct_inv=_set_image, string="Medium-sized photo", type="binary", multi="_get_image", store={ - 'mail.group': (lambda self, cr, uid, ids, c={}: ids, ['image', 'image_medium'], 10), + 'mail.group': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10), }, help="Medium-sized photo of the group. It is automatically "\ "resized as a 128x128px image, with aspect ratio preserved. "\ @@ -69,7 +69,7 @@ class mail_group(osv.Model): 'image_small': fields.function(_get_image, fnct_inv=_set_image, string="Small-sized photo", type="binary", multi="_get_image", store={ - 'mail.group': (lambda self, cr, uid, ids, c={}: ids, ['image', 'image_small'], 10), + 'mail.group': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10), }, help="Small-sized photo of the group. It is automatically "\ "resized as a 64x64px image, with aspect ratio preserved. "\ diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml index c9b6dce7cd8..cd22bad67d4 100644 --- a/addons/project/project_demo.xml +++ b/addons/project/project_demo.xml @@ -129,7 +129,6 @@ Budget Planning - pending 4 From 4b426887fff69340bcd79e0e4d4a024f9b51dd06 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 18 Oct 2012 16:33:32 +0200 Subject: [PATCH 10/10] [FIX] account: print overdue report bzr revid: qdp-launchpad@openerp.com-20121018143332-rwbydw558m1jgp13 --- addons/account/report/account_print_overdue.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml index 1755f0a334d..3e8b9b04b62 100644 --- a/addons/account/report/account_print_overdue.rml +++ b/addons/account/report/account_print_overdue.rml @@ -129,7 +129,7 @@ [[ o.title.name or '' ]] [[ o.name ]] - [[ display_address(o.id) ]] + [[ display_address(o) ]]