Merge lp:~openerp-dev/openobject-addons/7.0-bug-1172149-cga into lp:openobject-addons/7.0

[Lorenzo Battistini]

[Alex Comba - Agile BG (tafaru)]

review: Approve

[Martin Trigaux (OpenERP) (mat-openerp)]

Thanks for your patch, merged in 7.0.
I have just changed the patch to exclude the mail.message.subtype data as we want it to be overwritten with update.

revno: 9620 [merge]
revision-id: <email address hidden>

review: Approve

[Stefan Rijnhart (Opener) (stefan-opener)]

@Martin, thanks for the merge. Just wanted to ask you if you are certain about the mail.message.subtype, as this is one of the things that I checked for the OCB-review of this patch. Mail.message.subtype data is noupdate in most cases. I just checked a couple of modules: the records are added with noupdate='1' in account_voucher, crm, mail, hr_expense, event, hr_holidays, hr_recruitement, purchase, analytic, sale, sale_crm, project_issue. Only one I found without noupdate is in the project module.

[Martin Trigaux (OpenERP) (mat-openerp)]

Hi Stefan,

Thanks for the remark, I explained the reason on the bug report

=== modified file 'project/project_data.xml'
--- project/project_data.xml	2013-03-21 16:29:39 +0000
+++ project/project_data.xml	2013-11-14 15:54:44 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
         <!-- This will set the unit of measure used in projects and tasks.-->
         <record id="base.main_company" model="res.company">
             <field name="project_time_mode_id" ref="product.product_uom_hour"></field>