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

Proposed by Chandni Gandhi(OpenERP)
Status: Rejected
Rejected by: Martin Trigaux (OpenERP)
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1172149-cga
Merge into: lp:openobject-addons
Diff against target: 11 lines (+1/-1)
1 file modified
project/project_data.xml (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1172149-cga
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+160585@code.launchpad.net

Description of the change

Hello,

Add noupdate in data tag, of project_data.xml

Thanks.
CGA.

To post a comment you must log in.
Revision history for this message
Martin Trigaux (OpenERP) (mat-openerp) wrote :

Hi,

I have merged a fix in 7.0 so this is not required in trunk.

Regards

Unmerged revisions

8690. By Chandni Gandhi(OpenERP)

[FIX]:Add noupdate in project data

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'project/project_data.xml'
2--- project/project_data.xml 2013-03-21 16:29:39 +0000
3+++ project/project_data.xml 2013-04-24 09:40:33 +0000
4@@ -1,6 +1,6 @@
5 <?xml version="1.0" encoding="utf-8"?>
6 <openerp>
7- <data>
8+ <data noupdate="1">
9 <!-- This will set the unit of measure used in projects and tasks.-->
10 <record id="base.main_company" model="res.company">
11 <field name="project_time_mode_id" ref="product.product_uom_hour"></field>

Subscribers

People subscribed via source and target branches

to all changes: