Merge lp:~vauxoo/edima/edima-edima_fix_data-dev-yani into lp:edima

Proposed by Yanina Aular (Vauxoo)
Status: Merged
Merged at revision: 45
Proposed branch: lp:~vauxoo/edima/edima-edima_fix_data-dev-yani
Merge into: lp:edima
Diff against target: 171 lines (+28/-37)
4 files modified
edima_data/data/account_tax.xml (+16/-16)
edima_data/data/stock_location.xml (+1/-9)
tools/account_tax/account_tax.csv (+10/-10)
tools/stock_location/stock_location.csv (+1/-2)
To merge this branch: bzr merge lp:~vauxoo/edima/edima-edima_fix_data-dev-yani
Reviewer Review Type Date Requested Status
Yanina Aular (Vauxoo) Approve
Review via email: mp+204118@code.launchpad.net

Description of the change

Fix in account_tax, wh_vat_collected_account_id data and wh_vat_paid_account_id data is replaced with account_collected_id data and account_paid_id data. Plata de Concreto 2 is deleted

To post a comment you must log in.
Revision history for this message
Yanina Aular (Vauxoo) (yanina-aular) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'edima_data/data/account_tax.xml'
--- edima_data/data/account_tax.xml 2014-01-29 19:12:09 +0000
+++ edima_data/data/account_tax.xml 2014-01-30 22:36:52 +0000
@@ -2,80 +2,80 @@
2<openerp>2<openerp>
3 <data noupdate="1">3 <data noupdate="1">
4 <record id="at_edima_ivasale1" model="account.tax">4 <record id="at_edima_ivasale1" model="account.tax">
5 <field name="wh_vat_collected_account_id" search="[('code', '=', '240820')]"/>
6 <field name="wh_vat_paid_account_id" search="[('code', '=', '240820')]"/>
7 <field name="applicable_type">true</field>5 <field name="applicable_type">true</field>
6 <field name="account_collected_id" search="[('code', '=', '240820')]"/>
8 <field name="type_tax_use">sale</field>7 <field name="type_tax_use">sale</field>
8 <field name="account_paid_id" search="[('code', '=', '240820')]"/>
9 <field name="amount">0.12</field>9 <field name="amount">0.12</field>
10 <field name="appl_type">general</field>10 <field name="appl_type">general</field>
11 <field name="ret" eval="True"/>11 <field name="ret" eval="True"/>
12 <field name="name">IVA - Sale 12% - General</field>12 <field name="name">IVA - Sale 12% - General</field>
13 </record>13 </record>
14 <record id="at_edima_ivasale2" model="account.tax">14 <record id="at_edima_ivasale2" model="account.tax">
15 <field name="wh_vat_collected_account_id" search="[('code', '=', '240820')]"/>
16 <field name="wh_vat_paid_account_id" search="[('code', '=', '240820')]"/>
17 <field name="applicable_type">true</field>15 <field name="applicable_type">true</field>
16 <field name="account_collected_id" search="[('code', '=', '240820')]"/>
18 <field name="type_tax_use">sale</field>17 <field name="type_tax_use">sale</field>
18 <field name="account_paid_id" search="[('code', '=', '240820')]"/>
19 <field name="amount">0.22</field>19 <field name="amount">0.22</field>
20 <field name="appl_type">adicional</field>20 <field name="appl_type">adicional</field>
21 <field name="ret" eval="True"/>21 <field name="ret" eval="True"/>
22 <field name="name">IVA - Sale 22% - Additional</field>22 <field name="name">IVA - Sale 22% - Additional</field>
23 </record>23 </record>
24 <record id="at_edima_ivasale3" model="account.tax">24 <record id="at_edima_ivasale3" model="account.tax">
25 <field name="wh_vat_collected_account_id" search="[('code', '=', '240820')]"/>
26 <field name="wh_vat_paid_account_id" search="[('code', '=', '240820')]"/>
27 <field name="applicable_type">true</field>25 <field name="applicable_type">true</field>
26 <field name="account_collected_id" search="[('code', '=', '240820')]"/>
28 <field name="type_tax_use">sale</field>27 <field name="type_tax_use">sale</field>
28 <field name="account_paid_id" search="[('code', '=', '240820')]"/>
29 <field name="amount">0.0</field>29 <field name="amount">0.0</field>
30 <field name="appl_type">exento</field>30 <field name="appl_type">exento</field>
31 <field name="ret" eval="False"/>31 <field name="ret" eval="False"/>
32 <field name="name">IVA - Sale 0% - Exempt</field>32 <field name="name">IVA - Sale 0% - Exempt</field>
33 </record>33 </record>
34 <record id="at_edima_ivasale4" model="account.tax">34 <record id="at_edima_ivasale4" model="account.tax">
35 <field name="wh_vat_collected_account_id" search="[('code', '=', '240820')]"/>
36 <field name="wh_vat_paid_account_id" search="[('code', '=', '240820')]"/>
37 <field name="applicable_type">true</field>35 <field name="applicable_type">true</field>
36 <field name="account_collected_id" search="[('code', '=', '240820')]"/>
38 <field name="type_tax_use">sale</field>37 <field name="type_tax_use">sale</field>
38 <field name="account_paid_id" search="[('code', '=', '240820')]"/>
39 <field name="amount">0.08</field>39 <field name="amount">0.08</field>
40 <field name="appl_type">reducido</field>40 <field name="appl_type">reducido</field>
41 <field name="ret" eval="True"/>41 <field name="ret" eval="True"/>
42 <field name="name">IVA - Sale 8% - Reducted</field>42 <field name="name">IVA - Sale 8% - Reducted</field>
43 </record>43 </record>
44 <record id="at_edima_ivapurchase1" model="account.tax">44 <record id="at_edima_ivapurchase1" model="account.tax">
45 <field name="wh_vat_collected_account_id" search="[('code', '=', '135550')]"/>
46 <field name="wh_vat_paid_account_id" search="[('code', '=', '135550')]"/>
47 <field name="applicable_type">true</field>45 <field name="applicable_type">true</field>
46 <field name="account_collected_id" search="[('code', '=', '135550')]"/>
48 <field name="type_tax_use">purchase</field>47 <field name="type_tax_use">purchase</field>
48 <field name="account_paid_id" search="[('code', '=', '135550')]"/>
49 <field name="amount">0.12</field>49 <field name="amount">0.12</field>
50 <field name="appl_type">general</field>50 <field name="appl_type">general</field>
51 <field name="ret" eval="True"/>51 <field name="ret" eval="True"/>
52 <field name="name">IVA - Purchase 12% - General</field>52 <field name="name">IVA - Purchase 12% - General</field>
53 </record>53 </record>
54 <record id="at_edima_ivapurchase2" model="account.tax">54 <record id="at_edima_ivapurchase2" model="account.tax">
55 <field name="wh_vat_collected_account_id" search="[('code', '=', '135550')]"/>
56 <field name="wh_vat_paid_account_id" search="[('code', '=', '135550')]"/>
57 <field name="applicable_type">true</field>55 <field name="applicable_type">true</field>
56 <field name="account_collected_id" search="[('code', '=', '135550')]"/>
58 <field name="type_tax_use">purchase</field>57 <field name="type_tax_use">purchase</field>
58 <field name="account_paid_id" search="[('code', '=', '135550')]"/>
59 <field name="amount">0.22</field>59 <field name="amount">0.22</field>
60 <field name="appl_type">adicional</field>60 <field name="appl_type">adicional</field>
61 <field name="ret" eval="True"/>61 <field name="ret" eval="True"/>
62 <field name="name">IVA - Purchase 22% - Additional</field>62 <field name="name">IVA - Purchase 22% - Additional</field>
63 </record>63 </record>
64 <record id="at_edima_ivapurchase3" model="account.tax">64 <record id="at_edima_ivapurchase3" model="account.tax">
65 <field name="wh_vat_collected_account_id" search="[('code', '=', '135550')]"/>
66 <field name="wh_vat_paid_account_id" search="[('code', '=', '135550')]"/>
67 <field name="applicable_type">true</field>65 <field name="applicable_type">true</field>
66 <field name="account_collected_id" search="[('code', '=', '135550')]"/>
68 <field name="type_tax_use">purchase</field>67 <field name="type_tax_use">purchase</field>
68 <field name="account_paid_id" search="[('code', '=', '135550')]"/>
69 <field name="amount">0.08</field>69 <field name="amount">0.08</field>
70 <field name="appl_type">reducido</field>70 <field name="appl_type">reducido</field>
71 <field name="ret" eval="True"/>71 <field name="ret" eval="True"/>
72 <field name="name">IVA - Purchase 8% - Reducted</field>72 <field name="name">IVA - Purchase 8% - Reducted</field>
73 </record>73 </record>
74 <record id="at_edima_ivapurchase4" model="account.tax">74 <record id="at_edima_ivapurchase4" model="account.tax">
75 <field name="wh_vat_collected_account_id" search="[('code', '=', '135550')]"/>
76 <field name="wh_vat_paid_account_id" search="[('code', '=', '135550')]"/>
77 <field name="applicable_type">true</field>75 <field name="applicable_type">true</field>
76 <field name="account_collected_id" search="[('code', '=', '135550')]"/>
78 <field name="type_tax_use">purchase</field>77 <field name="type_tax_use">purchase</field>
78 <field name="account_paid_id" search="[('code', '=', '135550')]"/>
79 <field name="amount">0.0</field>79 <field name="amount">0.0</field>
80 <field name="appl_type">exento</field>80 <field name="appl_type">exento</field>
81 <field name="ret" eval="False"/>81 <field name="ret" eval="False"/>
8282
=== modified file 'edima_data/data/stock_location.xml'
--- edima_data/data/stock_location.xml 2014-01-29 19:12:09 +0000
+++ edima_data/data/stock_location.xml 2014-01-30 22:36:52 +0000
@@ -212,14 +212,6 @@
212 <field name="usage">internal</field>212 <field name="usage">internal</field>
213 <field name="chained_location_type">none</field>213 <field name="chained_location_type">none</field>
214 </record>214 </record>
215 <record id="sl_edima_006" model="stock.location">
216 <field name="name">Planta de Concreto 2</field>
217 <field name="location_id" ref="stock.stock_location_company"/>
218 <field name="company_id" ref="base.main_company"/>
219 <field name="chained_auto_packing">manual</field>
220 <field name="usage">internal</field>
221 <field name="chained_location_type">none</field>
222 </record>
223 <record id="sl_edima_004" model="stock.location">215 <record id="sl_edima_004" model="stock.location">
224 <field name="name">Planta Veguita</field>216 <field name="name">Planta Veguita</field>
225 <field name="location_id" ref="stock.stock_location_company"/>217 <field name="location_id" ref="stock.stock_location_company"/>
@@ -252,7 +244,7 @@
252 <field name="usage">internal</field>244 <field name="usage">internal</field>
253 <field name="chained_location_type">none</field>245 <field name="chained_location_type">none</field>
254 </record>246 </record>
255 <record id="sl_edima_035" model="stock.location">247 <record id="sl_edima_006" model="stock.location">
256 <field name="name">Tanques para almacenar Liquido asfáltico RC2 y Tanques para almacenar Mezcla de liquido asfáltico.</field>248 <field name="name">Tanques para almacenar Liquido asfáltico RC2 y Tanques para almacenar Mezcla de liquido asfáltico.</field>
257 <field name="location_id" ref="sl_edima_013"/>249 <field name="location_id" ref="sl_edima_013"/>
258 <field name="company_id" ref="base.main_company"/>250 <field name="company_id" ref="base.main_company"/>
259251
=== modified file 'tools/account_tax/account_tax.csv'
--- tools/account_tax/account_tax.csv 2014-01-29 19:12:09 +0000
+++ tools/account_tax/account_tax.csv 2014-01-30 22:36:52 +0000
@@ -1,10 +1,10 @@
1id,model,name,amount,type_tax_use,applicable_type,appl_type,ret,wh_vat_paid_account_id,wh_vat_collected_account_id1id,model,name,amount,type_tax_use,applicable_type,appl_type,ret,account_paid_id,account_collected_id,wh_vat_paid_account_id,wh_vat_collected_account_id
2str,str,str,str,str,str,str,evalc,search,search2str,str,str,str,str,str,str,evalc,search,search,str,str
3at_edima_ivasale1,account.tax,"IVA - Sale 12% - General",0.12,sale,true,general,True,240820,2408203at_edima_ivasale1,account.tax,"IVA - Sale 12% - General",0.12,sale,true,general,True,240820,240820,,
4at_edima_ivasale2,account.tax,"IVA - Sale 22% - Additional",0.22,sale,true,adicional,True,240820,2408204at_edima_ivasale2,account.tax,"IVA - Sale 22% - Additional",0.22,sale,true,adicional,True,240820,240820,,
5at_edima_ivasale3,account.tax,"IVA - Sale 0% - Exempt",0.0,sale,true,exento,False,240820,2408205at_edima_ivasale3,account.tax,"IVA - Sale 0% - Exempt",0.0,sale,true,exento,False,240820,240820,,
6at_edima_ivasale4,account.tax,"IVA - Sale 8% - Reducted",0.08,sale,true,reducido,True,240820,2408206at_edima_ivasale4,account.tax,"IVA - Sale 8% - Reducted",0.08,sale,true,reducido,True,240820,240820,,
7at_edima_ivapurchase1,account.tax,"IVA - Purchase 12% - General",0.12,purchase,true,general,True,135550,1355507at_edima_ivapurchase1,account.tax,"IVA - Purchase 12% - General",0.12,purchase,true,general,True,135550,135550,,
8at_edima_ivapurchase2,account.tax,"IVA - Purchase 22% - Additional",0.22,purchase,true,adicional,True,135550,1355508at_edima_ivapurchase2,account.tax,"IVA - Purchase 22% - Additional",0.22,purchase,true,adicional,True,135550,135550,,
9at_edima_ivapurchase3,account.tax,"IVA - Purchase 8% - Reducted",0.08,purchase,true,reducido,True,135550,1355509at_edima_ivapurchase3,account.tax,"IVA - Purchase 8% - Reducted",0.08,purchase,true,reducido,True,135550,135550,,
10at_edima_ivapurchase4,account.tax,"IVA - Purchase 0% - Exempt",0.0,purchase,true,exento,False,135550,13555010at_edima_ivapurchase4,account.tax,"IVA - Purchase 0% - Exempt",0.0,purchase,true,exento,False,135550,135550,,
1111
=== modified file 'tools/stock_location/stock_location.csv'
--- tools/stock_location/stock_location.csv 2014-01-24 20:59:39 +0000
+++ tools/stock_location/stock_location.csv 2014-01-30 22:36:52 +0000
@@ -27,12 +27,11 @@
27"sl_edima_025","stock.location","Tanque para almacenar Gas oil.","internal","none","manual","base.main_company","sl_edima_022"27"sl_edima_025","stock.location","Tanque para almacenar Gas oil.","internal","none","manual","base.main_company","sl_edima_022"
28"sl_edima_034","stock.location","Tanques para almacenar Liquido asfáltico RC2 y Tanques para almacenar Mezcla de liquido asfáltico.","internal","none","manual","base.main_company","sl_edima_022"28"sl_edima_034","stock.location","Tanques para almacenar Liquido asfáltico RC2 y Tanques para almacenar Mezcla de liquido asfáltico.","internal","none","manual","base.main_company","sl_edima_022"
29"sl_edima_005","stock.location","Planta de Concreto 1","internal","none","manual","base.main_company","stock.stock_location_company"29"sl_edima_005","stock.location","Planta de Concreto 1","internal","none","manual","base.main_company","stock.stock_location_company"
30"sl_edima_006","stock.location","Planta de Concreto 2","internal","none","manual","base.main_company","stock.stock_location_company"
31"sl_edima_004","stock.location","Planta Veguita","internal","none","manual","base.main_company","stock.stock_location_company"30"sl_edima_004","stock.location","Planta Veguita","internal","none","manual","base.main_company","stock.stock_location_company"
32"sl_edima_013","stock.location","Material extraído, procesado y productos terminados para el consumo en obras y para la venta de clientes.","internal","none","manual","base.main_company","sl_edima_004"31"sl_edima_013","stock.location","Material extraído, procesado y productos terminados para el consumo en obras y para la venta de clientes.","internal","none","manual","base.main_company","sl_edima_004"
33"sl_edima_032","stock.location","Patio que conforma el Almacén de material Bruto y procesado de Agregados (Arena, Piedra Picada y Arrocillo).","internal","none","manual","base.main_company","sl_edima_013"32"sl_edima_032","stock.location","Patio que conforma el Almacén de material Bruto y procesado de Agregados (Arena, Piedra Picada y Arrocillo).","internal","none","manual","base.main_company","sl_edima_013"
34"sl_edima_033","stock.location","Tanques de almacenamiento de combustible (Gas oil y Gasolina) Aceite.","internal","none","manual","base.main_company","sl_edima_013"33"sl_edima_033","stock.location","Tanques de almacenamiento de combustible (Gas oil y Gasolina) Aceite.","internal","none","manual","base.main_company","sl_edima_013"
35"sl_edima_035","stock.location","Tanques para almacenar Liquido asfáltico RC2 y Tanques para almacenar Mezcla de liquido asfáltico.","internal","none","manual","base.main_company","sl_edima_013"34"sl_edima_006","stock.location","Tanques para almacenar Liquido asfáltico RC2 y Tanques para almacenar Mezcla de liquido asfáltico.","internal","none","manual","base.main_company","sl_edima_013"
36"sl_edima_012","stock.location","Respuestos e insumos para maquinaria, equipos y materia prima para producción.","internal","none","manual","base.main_company","sl_edima_004"35"sl_edima_012","stock.location","Respuestos e insumos para maquinaria, equipos y materia prima para producción.","internal","none","manual","base.main_company","sl_edima_004"
37"sl_edima_018","stock.location","Almacén para Repuestos y consumibles para Maquinaria Pesada (Diesel) y automotriz.","internal","none","manual","base.main_company","sl_edima_012"36"sl_edima_018","stock.location","Almacén para Repuestos y consumibles para Maquinaria Pesada (Diesel) y automotriz.","internal","none","manual","base.main_company","sl_edima_012"
38"sl_edima_019","stock.location","Cuarto para el almacenamiento de articulo de limpieza de instalaciones y Dotación.","internal","none","manual","base.main_company","sl_edima_012"37"sl_edima_019","stock.location","Cuarto para el almacenamiento de articulo de limpieza de instalaciones y Dotación.","internal","none","manual","base.main_company","sl_edima_012"

Subscribers

People subscribed via source and target branches