Merge lp:~openerp-chinese-team/openobject-addons/joshua-bug-fix into lp:openobject-addons/6.1

Proposed by Joshua Jan(SHINEIT)
Status: Needs review
Proposed branch: lp:~openerp-chinese-team/openobject-addons/joshua-bug-fix
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
l10n_cn/base_data.xml (+1/-1)
To merge this branch: bzr merge lp:~openerp-chinese-team/openobject-addons/joshua-bug-fix
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email:

Description of the change

  There are two record in the same XML ID.

To post a comment you must log in.

Unmerged revisions

6949. By Joshua Jan(SHINEIT)

fixed duplication xml_id

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_cn/base_data.xml'
2--- l10n_cn/base_data.xml 2011-01-14 00:11:01 +0000
3+++ l10n_cn/base_data.xml 2012-08-20 06:28:23 +0000
4@@ -128,7 +128,7 @@
5 <field name="code">辽</field>
6 <field name="country_id" ref=""/>
7 </record>
8- <record id="state_SX" model="">
9+ <record id="state_SaX" model="">
10 <field name="name">陕西省</field>
11 <field name="code">陕</field>
12 <field name="country_id" ref=""/>