Merge lp:~altegra/pepess/pepess_dev_carlos_demo into lp:pepess

Status: Merged
Merged at revision: 66
Proposed branch: lp:~altegra/pepess/pepess_dev_carlos_demo
Merge into: lp:pepess
Diff against target: 30 lines (+3/-3)
1 file modified
res_partner_pepess/demo/address_partners_company_demo.xml (+3/-3)
To merge this branch: bzr merge lp:~altegra/pepess/pepess_dev_carlos_demo
Reviewer Review Type Date Requested Status
Moisés López - http://www.vauxoo.com Approve
Carlos Blanco - http://www.grupoaltegra.com Pending
Review via email: mp+232459@code.launchpad.net

Description of the change

[FIX] Added xml_id to state_id field in data demo

To post a comment you must log in.
Revision history for this message
Moisés López - http://www.vauxoo.com (moylop260) wrote :

Aprobado!
Puedes por favor aplicar el merge.

review: Approve
66. By Carlos <email address hidden>

[MERGE] Added some changes to datat demo

Revision history for this message
Carlos Blanco - http://www.grupoaltegra.com (carlos-blanco) wrote :

Este cambio es a un modulo que se quiere instalar en pepess pero nos pidieron algunos cambios

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'res_partner_pepess/demo/address_partners_company_demo.xml'
--- res_partner_pepess/demo/address_partners_company_demo.xml 2014-08-25 18:19:46 +0000
+++ res_partner_pepess/demo/address_partners_company_demo.xml 2014-08-27 18:31:23 +0000
@@ -10,7 +10,7 @@
10 <field name="zip">10000</field>10 <field name="zip">10000</field>
11 <field name="l10n_mx_city2">Tu localidad</field>11 <field name="l10n_mx_city2">Tu localidad</field>
12 <field name="city">Tu ciudad</field>12 <field name="city">Tu ciudad</field>
13 <field name="state_id">1</field>13 <field name="state_id" ref="l10n_mx_states.res_country_state_mx_ags"/>
14 </record>14 </record>
15 15
16 <record id="base.res_partner_main2" model="res.partner">16 <record id="base.res_partner_main2" model="res.partner">
@@ -21,7 +21,7 @@
21 <field name="zip">10000</field>21 <field name="zip">10000</field>
22 <field name="l10n_mx_city2">Tu localidad</field>22 <field name="l10n_mx_city2">Tu localidad</field>
23 <field name="city">Tu ciudad</field>23 <field name="city">Tu ciudad</field>
24 <field name="state_id">1</field>24 <field name="state_id" ref="l10n_mx_states.res_country_state_mx_coah"/>
25 </record>25 </record>
26 26
27 <record id="base.main_partner" model="res.partner">27 <record id="base.main_partner" model="res.partner">
@@ -32,7 +32,7 @@
32 <field name="zip">10000</field>32 <field name="zip">10000</field>
33 <field name="l10n_mx_city2">Tu localidad</field>33 <field name="l10n_mx_city2">Tu localidad</field>
34 <field name="city">Tu ciudad</field>34 <field name="city">Tu ciudad</field>
35 <field name="state_id">1</field>35 <field name="state_id" ref="l10n_mx_states.res_country_state_mx_hgo"/>
36 </record>36 </record>
37 37
38 </data>38 </data>

Subscribers

People subscribed via source and target branches

to all changes: