Merge lp:~vauxoo/edima/edima-edima_fix_data-dev-yani into lp:edima
- edima-edima_fix_data-dev-yani
- 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 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Yanina Aular (Vauxoo) | Approve | ||
|
Review via email:
|
|||
Commit message
Description of the change
Fix in account_tax, wh_vat_
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 | 2 | <openerp> | 2 | <openerp> |
| 6 | 3 | <data noupdate="1"> | 3 | <data noupdate="1"> |
| 7 | 4 | <record id="at_edima_ivasale1" model="account.tax"> | 4 | <record id="at_edima_ivasale1" model="account.tax"> |
| 8 | 5 | <field name="wh_vat_collected_account_id" search="[('code', '=', '240820')]"/> | ||
| 9 | 6 | <field name="wh_vat_paid_account_id" search="[('code', '=', '240820')]"/> | ||
| 10 | 7 | <field name="applicable_type">true</field> | 5 | <field name="applicable_type">true</field> |
| 11 | 6 | <field name="account_collected_id" search="[('code', '=', '240820')]"/> | ||
| 12 | 8 | <field name="type_tax_use">sale</field> | 7 | <field name="type_tax_use">sale</field> |
| 13 | 8 | <field name="account_paid_id" search="[('code', '=', '240820')]"/> | ||
| 14 | 9 | <field name="amount">0.12</field> | 9 | <field name="amount">0.12</field> |
| 15 | 10 | <field name="appl_type">general</field> | 10 | <field name="appl_type">general</field> |
| 16 | 11 | <field name="ret" eval="True"/> | 11 | <field name="ret" eval="True"/> |
| 17 | 12 | <field name="name">IVA - Sale 12% - General</field> | 12 | <field name="name">IVA - Sale 12% - General</field> |
| 18 | 13 | </record> | 13 | </record> |
| 19 | 14 | <record id="at_edima_ivasale2" model="account.tax"> | 14 | <record id="at_edima_ivasale2" model="account.tax"> |
| 20 | 15 | <field name="wh_vat_collected_account_id" search="[('code', '=', '240820')]"/> | ||
| 21 | 16 | <field name="wh_vat_paid_account_id" search="[('code', '=', '240820')]"/> | ||
| 22 | 17 | <field name="applicable_type">true</field> | 15 | <field name="applicable_type">true</field> |
| 23 | 16 | <field name="account_collected_id" search="[('code', '=', '240820')]"/> | ||
| 24 | 18 | <field name="type_tax_use">sale</field> | 17 | <field name="type_tax_use">sale</field> |
| 25 | 18 | <field name="account_paid_id" search="[('code', '=', '240820')]"/> | ||
| 26 | 19 | <field name="amount">0.22</field> | 19 | <field name="amount">0.22</field> |
| 27 | 20 | <field name="appl_type">adicional</field> | 20 | <field name="appl_type">adicional</field> |
| 28 | 21 | <field name="ret" eval="True"/> | 21 | <field name="ret" eval="True"/> |
| 29 | 22 | <field name="name">IVA - Sale 22% - Additional</field> | 22 | <field name="name">IVA - Sale 22% - Additional</field> |
| 30 | 23 | </record> | 23 | </record> |
| 31 | 24 | <record id="at_edima_ivasale3" model="account.tax"> | 24 | <record id="at_edima_ivasale3" model="account.tax"> |
| 32 | 25 | <field name="wh_vat_collected_account_id" search="[('code', '=', '240820')]"/> | ||
| 33 | 26 | <field name="wh_vat_paid_account_id" search="[('code', '=', '240820')]"/> | ||
| 34 | 27 | <field name="applicable_type">true</field> | 25 | <field name="applicable_type">true</field> |
| 35 | 26 | <field name="account_collected_id" search="[('code', '=', '240820')]"/> | ||
| 36 | 28 | <field name="type_tax_use">sale</field> | 27 | <field name="type_tax_use">sale</field> |
| 37 | 28 | <field name="account_paid_id" search="[('code', '=', '240820')]"/> | ||
| 38 | 29 | <field name="amount">0.0</field> | 29 | <field name="amount">0.0</field> |
| 39 | 30 | <field name="appl_type">exento</field> | 30 | <field name="appl_type">exento</field> |
| 40 | 31 | <field name="ret" eval="False"/> | 31 | <field name="ret" eval="False"/> |
| 41 | 32 | <field name="name">IVA - Sale 0% - Exempt</field> | 32 | <field name="name">IVA - Sale 0% - Exempt</field> |
| 42 | 33 | </record> | 33 | </record> |
| 43 | 34 | <record id="at_edima_ivasale4" model="account.tax"> | 34 | <record id="at_edima_ivasale4" model="account.tax"> |
| 44 | 35 | <field name="wh_vat_collected_account_id" search="[('code', '=', '240820')]"/> | ||
| 45 | 36 | <field name="wh_vat_paid_account_id" search="[('code', '=', '240820')]"/> | ||
| 46 | 37 | <field name="applicable_type">true</field> | 35 | <field name="applicable_type">true</field> |
| 47 | 36 | <field name="account_collected_id" search="[('code', '=', '240820')]"/> | ||
| 48 | 38 | <field name="type_tax_use">sale</field> | 37 | <field name="type_tax_use">sale</field> |
| 49 | 38 | <field name="account_paid_id" search="[('code', '=', '240820')]"/> | ||
| 50 | 39 | <field name="amount">0.08</field> | 39 | <field name="amount">0.08</field> |
| 51 | 40 | <field name="appl_type">reducido</field> | 40 | <field name="appl_type">reducido</field> |
| 52 | 41 | <field name="ret" eval="True"/> | 41 | <field name="ret" eval="True"/> |
| 53 | 42 | <field name="name">IVA - Sale 8% - Reducted</field> | 42 | <field name="name">IVA - Sale 8% - Reducted</field> |
| 54 | 43 | </record> | 43 | </record> |
| 55 | 44 | <record id="at_edima_ivapurchase1" model="account.tax"> | 44 | <record id="at_edima_ivapurchase1" model="account.tax"> |
| 56 | 45 | <field name="wh_vat_collected_account_id" search="[('code', '=', '135550')]"/> | ||
| 57 | 46 | <field name="wh_vat_paid_account_id" search="[('code', '=', '135550')]"/> | ||
| 58 | 47 | <field name="applicable_type">true</field> | 45 | <field name="applicable_type">true</field> |
| 59 | 46 | <field name="account_collected_id" search="[('code', '=', '135550')]"/> | ||
| 60 | 48 | <field name="type_tax_use">purchase</field> | 47 | <field name="type_tax_use">purchase</field> |
| 61 | 48 | <field name="account_paid_id" search="[('code', '=', '135550')]"/> | ||
| 62 | 49 | <field name="amount">0.12</field> | 49 | <field name="amount">0.12</field> |
| 63 | 50 | <field name="appl_type">general</field> | 50 | <field name="appl_type">general</field> |
| 64 | 51 | <field name="ret" eval="True"/> | 51 | <field name="ret" eval="True"/> |
| 65 | 52 | <field name="name">IVA - Purchase 12% - General</field> | 52 | <field name="name">IVA - Purchase 12% - General</field> |
| 66 | 53 | </record> | 53 | </record> |
| 67 | 54 | <record id="at_edima_ivapurchase2" model="account.tax"> | 54 | <record id="at_edima_ivapurchase2" model="account.tax"> |
| 68 | 55 | <field name="wh_vat_collected_account_id" search="[('code', '=', '135550')]"/> | ||
| 69 | 56 | <field name="wh_vat_paid_account_id" search="[('code', '=', '135550')]"/> | ||
| 70 | 57 | <field name="applicable_type">true</field> | 55 | <field name="applicable_type">true</field> |
| 71 | 56 | <field name="account_collected_id" search="[('code', '=', '135550')]"/> | ||
| 72 | 58 | <field name="type_tax_use">purchase</field> | 57 | <field name="type_tax_use">purchase</field> |
| 73 | 58 | <field name="account_paid_id" search="[('code', '=', '135550')]"/> | ||
| 74 | 59 | <field name="amount">0.22</field> | 59 | <field name="amount">0.22</field> |
| 75 | 60 | <field name="appl_type">adicional</field> | 60 | <field name="appl_type">adicional</field> |
| 76 | 61 | <field name="ret" eval="True"/> | 61 | <field name="ret" eval="True"/> |
| 77 | 62 | <field name="name">IVA - Purchase 22% - Additional</field> | 62 | <field name="name">IVA - Purchase 22% - Additional</field> |
| 78 | 63 | </record> | 63 | </record> |
| 79 | 64 | <record id="at_edima_ivapurchase3" model="account.tax"> | 64 | <record id="at_edima_ivapurchase3" model="account.tax"> |
| 80 | 65 | <field name="wh_vat_collected_account_id" search="[('code', '=', '135550')]"/> | ||
| 81 | 66 | <field name="wh_vat_paid_account_id" search="[('code', '=', '135550')]"/> | ||
| 82 | 67 | <field name="applicable_type">true</field> | 65 | <field name="applicable_type">true</field> |
| 83 | 66 | <field name="account_collected_id" search="[('code', '=', '135550')]"/> | ||
| 84 | 68 | <field name="type_tax_use">purchase</field> | 67 | <field name="type_tax_use">purchase</field> |
| 85 | 68 | <field name="account_paid_id" search="[('code', '=', '135550')]"/> | ||
| 86 | 69 | <field name="amount">0.08</field> | 69 | <field name="amount">0.08</field> |
| 87 | 70 | <field name="appl_type">reducido</field> | 70 | <field name="appl_type">reducido</field> |
| 88 | 71 | <field name="ret" eval="True"/> | 71 | <field name="ret" eval="True"/> |
| 89 | 72 | <field name="name">IVA - Purchase 8% - Reducted</field> | 72 | <field name="name">IVA - Purchase 8% - Reducted</field> |
| 90 | 73 | </record> | 73 | </record> |
| 91 | 74 | <record id="at_edima_ivapurchase4" model="account.tax"> | 74 | <record id="at_edima_ivapurchase4" model="account.tax"> |
| 92 | 75 | <field name="wh_vat_collected_account_id" search="[('code', '=', '135550')]"/> | ||
| 93 | 76 | <field name="wh_vat_paid_account_id" search="[('code', '=', '135550')]"/> | ||
| 94 | 77 | <field name="applicable_type">true</field> | 75 | <field name="applicable_type">true</field> |
| 95 | 76 | <field name="account_collected_id" search="[('code', '=', '135550')]"/> | ||
| 96 | 78 | <field name="type_tax_use">purchase</field> | 77 | <field name="type_tax_use">purchase</field> |
| 97 | 78 | <field name="account_paid_id" search="[('code', '=', '135550')]"/> | ||
| 98 | 79 | <field name="amount">0.0</field> | 79 | <field name="amount">0.0</field> |
| 99 | 80 | <field name="appl_type">exento</field> | 80 | <field name="appl_type">exento</field> |
| 100 | 81 | <field name="ret" eval="False"/> | 81 | <field name="ret" eval="False"/> |
| 101 | 82 | 82 | ||
| 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 | 212 | <field name="usage">internal</field> | 212 | <field name="usage">internal</field> |
| 107 | 213 | <field name="chained_location_type">none</field> | 213 | <field name="chained_location_type">none</field> |
| 108 | 214 | </record> | 214 | </record> |
| 109 | 215 | <record id="sl_edima_006" model="stock.location"> | ||
| 110 | 216 | <field name="name">Planta de Concreto 2</field> | ||
| 111 | 217 | <field name="location_id" ref="stock.stock_location_company"/> | ||
| 112 | 218 | <field name="company_id" ref="base.main_company"/> | ||
| 113 | 219 | <field name="chained_auto_packing">manual</field> | ||
| 114 | 220 | <field name="usage">internal</field> | ||
| 115 | 221 | <field name="chained_location_type">none</field> | ||
| 116 | 222 | </record> | ||
| 117 | 223 | <record id="sl_edima_004" model="stock.location"> | 215 | <record id="sl_edima_004" model="stock.location"> |
| 118 | 224 | <field name="name">Planta Veguita</field> | 216 | <field name="name">Planta Veguita</field> |
| 119 | 225 | <field name="location_id" ref="stock.stock_location_company"/> | 217 | <field name="location_id" ref="stock.stock_location_company"/> |
| 120 | @@ -252,7 +244,7 @@ | |||
| 121 | 252 | <field name="usage">internal</field> | 244 | <field name="usage">internal</field> |
| 122 | 253 | <field name="chained_location_type">none</field> | 245 | <field name="chained_location_type">none</field> |
| 123 | 254 | </record> | 246 | </record> |
| 125 | 255 | <record id="sl_edima_035" model="stock.location"> | 247 | <record id="sl_edima_006" model="stock.location"> |
| 126 | 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> |
| 127 | 257 | <field name="location_id" ref="sl_edima_013"/> | 249 | <field name="location_id" ref="sl_edima_013"/> |
| 128 | 258 | <field name="company_id" ref="base.main_company"/> | 250 | <field name="company_id" ref="base.main_company"/> |
| 129 | 259 | 251 | ||
| 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 @@ | |||
| 144 | 1 | id,model,name,amount,type_tax_use,applicable_type,appl_type,ret,wh_vat_paid_account_id,wh_vat_collected_account_id | 1 | 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 | 2 | str,str,str,str,str,str,str,evalc,search,search | 2 | str,str,str,str,str,str,str,evalc,search,search,str,str |
| 146 | 3 | at_edima_ivasale1,account.tax,"IVA - Sale 12% - General",0.12,sale,true,general,True,240820,240820 | 3 | at_edima_ivasale1,account.tax,"IVA - Sale 12% - General",0.12,sale,true,general,True,240820,240820,, |
| 147 | 4 | at_edima_ivasale2,account.tax,"IVA - Sale 22% - Additional",0.22,sale,true,adicional,True,240820,240820 | 4 | at_edima_ivasale2,account.tax,"IVA - Sale 22% - Additional",0.22,sale,true,adicional,True,240820,240820,, |
| 148 | 5 | at_edima_ivasale3,account.tax,"IVA - Sale 0% - Exempt",0.0,sale,true,exento,False,240820,240820 | 5 | at_edima_ivasale3,account.tax,"IVA - Sale 0% - Exempt",0.0,sale,true,exento,False,240820,240820,, |
| 149 | 6 | at_edima_ivasale4,account.tax,"IVA - Sale 8% - Reducted",0.08,sale,true,reducido,True,240820,240820 | 6 | at_edima_ivasale4,account.tax,"IVA - Sale 8% - Reducted",0.08,sale,true,reducido,True,240820,240820,, |
| 150 | 7 | at_edima_ivapurchase1,account.tax,"IVA - Purchase 12% - General",0.12,purchase,true,general,True,135550,135550 | 7 | at_edima_ivapurchase1,account.tax,"IVA - Purchase 12% - General",0.12,purchase,true,general,True,135550,135550,, |
| 151 | 8 | at_edima_ivapurchase2,account.tax,"IVA - Purchase 22% - Additional",0.22,purchase,true,adicional,True,135550,135550 | 8 | at_edima_ivapurchase2,account.tax,"IVA - Purchase 22% - Additional",0.22,purchase,true,adicional,True,135550,135550,, |
| 152 | 9 | at_edima_ivapurchase3,account.tax,"IVA - Purchase 8% - Reducted",0.08,purchase,true,reducido,True,135550,135550 | 9 | at_edima_ivapurchase3,account.tax,"IVA - Purchase 8% - Reducted",0.08,purchase,true,reducido,True,135550,135550,, |
| 153 | 10 | at_edima_ivapurchase4,account.tax,"IVA - Purchase 0% - Exempt",0.0,purchase,true,exento,False,135550,135550 | 10 | at_edima_ivapurchase4,account.tax,"IVA - Purchase 0% - Exempt",0.0,purchase,true,exento,False,135550,135550,, |
| 154 | 11 | 11 | ||
| 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 | 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" |
| 160 | 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" |
| 161 | 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" |
| 162 | 30 | "sl_edima_006","stock.location","Planta de Concreto 2","internal","none","manual","base.main_company","stock.stock_location_company" | ||
| 163 | 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" |
| 164 | 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" |
| 165 | 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" |
| 166 | 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" |
| 168 | 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" |
| 169 | 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" |
| 170 | 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" |
| 171 | 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" |
