openerp-chinese-team team mailing list archive

["Joshua Jan\(SHINEIT\)" <popkar77@xxxxxxxxx>]

Joshua Jan(SHINEIT) has proposed merging lp:~openerp-chinese-team/openobject-addons/joshua-bug-fix into lp:openobject-addons/6.1.

Requested reviews:
  OpenERP Core Team (openerp)

For more details, see:
https://code.launchpad.net/~openerp-chinese-team/openobject-addons/joshua-bug-fix/+merge/120334

Hello,
  There are two record in the same XML ID.
Joshua
-- 
https://code.launchpad.net/~openerp-chinese-team/openobject-addons/joshua-bug-fix/+merge/120334
Your team Open ERP Chinese is subscribed to branch lp:~openerp-chinese-team/openobject-addons/joshua-bug-fix.

=== modified file 'l10n_cn/base_data.xml'
--- l10n_cn/base_data.xml	2011-01-14 00:11:01 +0000
+++ l10n_cn/base_data.xml	2012-08-20 06:28:23 +0000
@@ -128,7 +128,7 @@
             <field name="code">辽</field>
             <field name="country_id" ref="base.cn"/>
         </record>
-        <record id="state_SX" model="res.country.state">
+        <record id="state_SaX" model="res.country.state">
             <field name="name">陕西省</field>
             <field name="code">陕</field>
             <field name="country_id" ref="base.cn"/>