Edima Project

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

  1. edima-edima_fix_data-dev-yani
  2. Merge into trunk
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
1=== modified file 'edima_data/data/account_tax.xml'
2--- edima_data/data/account_tax.xml 2014-01-29 19:12:09 +0000
3+++ edima_data/data/account_tax.xml 2014-01-30 22:36:52 +0000
4@@ -2,80 +2,80 @@
5 <openerp>
6 <data noupdate="1">
7 <record id="at_edima_ivasale1" model="account.tax">
8- <field name="wh_vat_collected_account_id" search="[('code', '=', '240820')]"/>
9- <field name="wh_vat_paid_account_id" search="[('code', '=', '240820')]"/>
10 <field name="applicable_type">true</field>
11+ <field name="account_collected_id" search="[('code', '=', '240820')]"/>
12 <field name="type_tax_use">sale</field>
13+ <field name="account_paid_id" search="[('code', '=', '240820')]"/>
14 <field name="amount">0.12</field>
15 <field name="appl_type">general</field>
16 <field name="ret" eval="True"/>
17 <field name="name">IVA - Sale 12% - General</field>
18 </record>
19 <record id="at_edima_ivasale2" model="account.tax">
20- <field name="wh_vat_collected_account_id" search="[('code', '=', '240820')]"/>
21- <field name="wh_vat_paid_account_id" search="[('code', '=', '240820')]"/>
22 <field name="applicable_type">true</field>
23+ <field name="account_collected_id" search="[('code', '=', '240820')]"/>
24 <field name="type_tax_use">sale</field>
25+ <field name="account_paid_id" search="[('code', '=', '240820')]"/>
26 <field name="amount">0.22</field>
27 <field name="appl_type">adicional</field>
28 <field name="ret" eval="True"/>
29 <field name="name">IVA - Sale 22% - Additional</field>
30 </record>
31 <record id="at_edima_ivasale3" model="account.tax">
32- <field name="wh_vat_collected_account_id" search="[('code', '=', '240820')]"/>
33- <field name="wh_vat_paid_account_id" search="[('code', '=', '240820')]"/>
34 <field name="applicable_type">true</field>
35+ <field name="account_collected_id" search="[('code', '=', '240820')]"/>
36 <field name="type_tax_use">sale</field>
37+ <field name="account_paid_id" search="[('code', '=', '240820')]"/>
38 <field name="amount">0.0</field>
39 <field name="appl_type">exento</field>
40 <field name="ret" eval="False"/>
41 <field name="name">IVA - Sale 0% - Exempt</field>
42 </record>
43 <record id="at_edima_ivasale4" model="account.tax">
44- <field name="wh_vat_collected_account_id" search="[('code', '=', '240820')]"/>
45- <field name="wh_vat_paid_account_id" search="[('code', '=', '240820')]"/>
46 <field name="applicable_type">true</field>
47+ <field name="account_collected_id" search="[('code', '=', '240820')]"/>
48 <field name="type_tax_use">sale</field>
49+ <field name="account_paid_id" search="[('code', '=', '240820')]"/>
50 <field name="amount">0.08</field>
51 <field name="appl_type">reducido</field>
52 <field name="ret" eval="True"/>
53 <field name="name">IVA - Sale 8% - Reducted</field>
54 </record>
55 <record id="at_edima_ivapurchase1" model="account.tax">
56- <field name="wh_vat_collected_account_id" search="[('code', '=', '135550')]"/>
57- <field name="wh_vat_paid_account_id" search="[('code', '=', '135550')]"/>
58 <field name="applicable_type">true</field>
59+ <field name="account_collected_id" search="[('code', '=', '135550')]"/>
60 <field name="type_tax_use">purchase</field>
61+ <field name="account_paid_id" search="[('code', '=', '135550')]"/>
62 <field name="amount">0.12</field>
63 <field name="appl_type">general</field>
64 <field name="ret" eval="True"/>
65 <field name="name">IVA - Purchase 12% - General</field>
66 </record>
67 <record id="at_edima_ivapurchase2" model="account.tax">
68- <field name="wh_vat_collected_account_id" search="[('code', '=', '135550')]"/>
69- <field name="wh_vat_paid_account_id" search="[('code', '=', '135550')]"/>
70 <field name="applicable_type">true</field>
71+ <field name="account_collected_id" search="[('code', '=', '135550')]"/>
72 <field name="type_tax_use">purchase</field>
73+ <field name="account_paid_id" search="[('code', '=', '135550')]"/>
74 <field name="amount">0.22</field>
75 <field name="appl_type">adicional</field>
76 <field name="ret" eval="True"/>
77 <field name="name">IVA - Purchase 22% - Additional</field>
78 </record>
79 <record id="at_edima_ivapurchase3" model="account.tax">
80- <field name="wh_vat_collected_account_id" search="[('code', '=', '135550')]"/>
81- <field name="wh_vat_paid_account_id" search="[('code', '=', '135550')]"/>
82 <field name="applicable_type">true</field>
83+ <field name="account_collected_id" search="[('code', '=', '135550')]"/>
84 <field name="type_tax_use">purchase</field>
85+ <field name="account_paid_id" search="[('code', '=', '135550')]"/>
86 <field name="amount">0.08</field>
87 <field name="appl_type">reducido</field>
88 <field name="ret" eval="True"/>
89 <field name="name">IVA - Purchase 8% - Reducted</field>
90 </record>
91 <record id="at_edima_ivapurchase4" model="account.tax">
92- <field name="wh_vat_collected_account_id" search="[('code', '=', '135550')]"/>
93- <field name="wh_vat_paid_account_id" search="[('code', '=', '135550')]"/>
94 <field name="applicable_type">true</field>
95+ <field name="account_collected_id" search="[('code', '=', '135550')]"/>
96 <field name="type_tax_use">purchase</field>
97+ <field name="account_paid_id" search="[('code', '=', '135550')]"/>
98 <field name="amount">0.0</field>
99 <field name="appl_type">exento</field>
100 <field name="ret" eval="False"/>
101
102=== modified file 'edima_data/data/stock_location.xml'
103--- edima_data/data/stock_location.xml 2014-01-29 19:12:09 +0000
104+++ edima_data/data/stock_location.xml 2014-01-30 22:36:52 +0000
105@@ -212,14 +212,6 @@
106 <field name="usage">internal</field>
107 <field name="chained_location_type">none</field>
108 </record>
109- <record id="sl_edima_006" model="stock.location">
110- <field name="name">Planta de Concreto 2</field>
111- <field name="location_id" ref="stock.stock_location_company"/>
112- <field name="company_id" ref="base.main_company"/>
113- <field name="chained_auto_packing">manual</field>
114- <field name="usage">internal</field>
115- <field name="chained_location_type">none</field>
116- </record>
117 <record id="sl_edima_004" model="stock.location">
118 <field name="name">Planta Veguita</field>
119 <field name="location_id" ref="stock.stock_location_company"/>
120@@ -252,7 +244,7 @@
121 <field name="usage">internal</field>
122 <field name="chained_location_type">none</field>
123 </record>
124- <record id="sl_edima_035" model="stock.location">
125+ <record id="sl_edima_006" model="stock.location">
126 <field name="name">Tanques para almacenar Liquido asfáltico RC2 y Tanques para almacenar Mezcla de liquido asfáltico.</field>
127 <field name="location_id" ref="sl_edima_013"/>
128 <field name="company_id" ref="base.main_company"/>
129
130=== modified file 'tools/account_tax/account_tax.csv'
131--- tools/account_tax/account_tax.csv 2014-01-29 19:12:09 +0000
132+++ tools/account_tax/account_tax.csv 2014-01-30 22:36:52 +0000
133@@ -1,10 +1,10 @@
134-id,model,name,amount,type_tax_use,applicable_type,appl_type,ret,wh_vat_paid_account_id,wh_vat_collected_account_id
135-str,str,str,str,str,str,str,evalc,search,search
136-at_edima_ivasale1,account.tax,"IVA - Sale 12% - General",0.12,sale,true,general,True,240820,240820
137-at_edima_ivasale2,account.tax,"IVA - Sale 22% - Additional",0.22,sale,true,adicional,True,240820,240820
138-at_edima_ivasale3,account.tax,"IVA - Sale 0% - Exempt",0.0,sale,true,exento,False,240820,240820
139-at_edima_ivasale4,account.tax,"IVA - Sale 8% - Reducted",0.08,sale,true,reducido,True,240820,240820
140-at_edima_ivapurchase1,account.tax,"IVA - Purchase 12% - General",0.12,purchase,true,general,True,135550,135550
141-at_edima_ivapurchase2,account.tax,"IVA - Purchase 22% - Additional",0.22,purchase,true,adicional,True,135550,135550
142-at_edima_ivapurchase3,account.tax,"IVA - Purchase 8% - Reducted",0.08,purchase,true,reducido,True,135550,135550
143-at_edima_ivapurchase4,account.tax,"IVA - Purchase 0% - Exempt",0.0,purchase,true,exento,False,135550,135550
144+id,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
145+str,str,str,str,str,str,str,evalc,search,search,str,str
146+at_edima_ivasale1,account.tax,"IVA - Sale 12% - General",0.12,sale,true,general,True,240820,240820,,
147+at_edima_ivasale2,account.tax,"IVA - Sale 22% - Additional",0.22,sale,true,adicional,True,240820,240820,,
148+at_edima_ivasale3,account.tax,"IVA - Sale 0% - Exempt",0.0,sale,true,exento,False,240820,240820,,
149+at_edima_ivasale4,account.tax,"IVA - Sale 8% - Reducted",0.08,sale,true,reducido,True,240820,240820,,
150+at_edima_ivapurchase1,account.tax,"IVA - Purchase 12% - General",0.12,purchase,true,general,True,135550,135550,,
151+at_edima_ivapurchase2,account.tax,"IVA - Purchase 22% - Additional",0.22,purchase,true,adicional,True,135550,135550,,
152+at_edima_ivapurchase3,account.tax,"IVA - Purchase 8% - Reducted",0.08,purchase,true,reducido,True,135550,135550,,
153+at_edima_ivapurchase4,account.tax,"IVA - Purchase 0% - Exempt",0.0,purchase,true,exento,False,135550,135550,,
154
155=== modified file 'tools/stock_location/stock_location.csv'
156--- tools/stock_location/stock_location.csv 2014-01-24 20:59:39 +0000
157+++ tools/stock_location/stock_location.csv 2014-01-30 22:36:52 +0000
158@@ -27,12 +27,11 @@
159 "sl_edima_025","stock.location","Tanque para almacenar Gas oil.","internal","none","manual","base.main_company","sl_edima_022"
160 "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"
161 "sl_edima_005","stock.location","Planta de Concreto 1","internal","none","manual","base.main_company","stock.stock_location_company"
162-"sl_edima_006","stock.location","Planta de Concreto 2","internal","none","manual","base.main_company","stock.stock_location_company"
163 "sl_edima_004","stock.location","Planta Veguita","internal","none","manual","base.main_company","stock.stock_location_company"
164 "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"
165 "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"
166 "sl_edima_033","stock.location","Tanques de almacenamiento de combustible (Gas oil y Gasolina) Aceite.","internal","none","manual","base.main_company","sl_edima_013"
167-"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"
168+"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"
169 "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"
170 "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"
171 "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