Merge lp:~camptocamp/openobject-addons/l10n_fr_trunk_improved_nv into lp:openobject-addons
- l10n_fr_trunk_improved_nv
- Merge into trunk
Proposed by
Vincent Renaville@camptocamp
| Status: | Rejected |
|---|---|
| Rejected by: | Cedric Snauwaert (OpenERP) |
| Proposed branch: | lp:~camptocamp/openobject-addons/l10n_fr_trunk_improved_nv |
| Merge into: | lp:openobject-addons |
| Diff against target: |
558 lines (+63/-96) 2 files modified
l10n_fr/fr_tax.xml (+63/-83) l10n_fr/plan_comptable_general.xml (+0/-13) |
| To merge this branch: | bzr merge lp:~camptocamp/openobject-addons/l10n_fr_trunk_improved_nv |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenERP Core Team | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2012-12-07.
Commit message
Description of the change
shorten taxes codes due to new invoices layout, reverse VAT correction, remove reconcile=true on vat accounts, renamed some taxes to match legal terms
To post a comment you must log in.
Revision history for this message
| Cedric Snauwaert (OpenERP) (csn-openerp) wrote : | # |
Unmerged revisions
- 8173. By Vincent Renaville@camptocamp
-
[FIX] l10n_fr : shorten taxe codes due to new invoices layout, reverse VAT correction, remove reconcile=true on vat accounts, remamed some taxes to match legal terms
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'l10n_fr/fr_tax.xml' | |||
| 2 | --- l10n_fr/fr_tax.xml 2012-11-29 22:26:45 +0000 | |||
| 3 | +++ l10n_fr/fr_tax.xml 2012-12-13 15:05:41 +0000 | |||
| 4 | @@ -11,7 +11,7 @@ | |||
| 5 | 11 | <record model="account.tax.template" id="tva_normale"> | 11 | <record model="account.tax.template" id="tva_normale"> |
| 6 | 12 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 12 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 7 | 13 | <field name="name">TVA collectée (vente) 19,6%</field> | 13 | <field name="name">TVA collectée (vente) 19,6%</field> |
| 9 | 14 | <field name="description">TVA-VT-19.6</field> | 14 | <field name="description">19.6</field> |
| 10 | 15 | <field name="amount" eval="0.196"/> | 15 | <field name="amount" eval="0.196"/> |
| 11 | 16 | <field name="type">percent</field> | 16 | <field name="type">percent</field> |
| 12 | 17 | <field name="base_code_id" ref="tax_col_196_ht"/> | 17 | <field name="base_code_id" ref="tax_col_196_ht"/> |
| 13 | @@ -33,7 +33,7 @@ | |||
| 14 | 33 | <record model="account.tax.template" id="tva_specifique"> | 33 | <record model="account.tax.template" id="tva_specifique"> |
| 15 | 34 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 34 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 16 | 35 | <field name="name">TVA collectée (vente) 8,5%</field> | 35 | <field name="name">TVA collectée (vente) 8,5%</field> |
| 18 | 36 | <field name="description">TVA-VT-8.5</field> | 36 | <field name="description">8.5</field> |
| 19 | 37 | <field name="amount" eval="0.085"/> | 37 | <field name="amount" eval="0.085"/> |
| 20 | 38 | <field name="type">percent</field> | 38 | <field name="type">percent</field> |
| 21 | 39 | <field name="base_code_id" ref="tax_col_85_ht"/> | 39 | <field name="base_code_id" ref="tax_col_85_ht"/> |
| 22 | @@ -55,7 +55,7 @@ | |||
| 23 | 55 | <record model="account.tax.template" id="tva_specifique_1"> | 55 | <record model="account.tax.template" id="tva_specifique_1"> |
| 24 | 56 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 56 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 25 | 57 | <field name="name">TVA collectée (vente) 7,0%</field> | 57 | <field name="name">TVA collectée (vente) 7,0%</field> |
| 27 | 58 | <field name="description">TVA-VT-7.0</field> | 58 | <field name="description">7.0</field> |
| 28 | 59 | <field name="amount" eval="0.07"/> | 59 | <field name="amount" eval="0.07"/> |
| 29 | 60 | <field name="type">percent</field> | 60 | <field name="type">percent</field> |
| 30 | 61 | <field name="base_code_id" ref="tax_col_70_ht"/> | 61 | <field name="base_code_id" ref="tax_col_70_ht"/> |
| 31 | @@ -77,7 +77,7 @@ | |||
| 32 | 77 | <record model="account.tax.template" id="tva_reduite"> | 77 | <record model="account.tax.template" id="tva_reduite"> |
| 33 | 78 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 78 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 34 | 79 | <field name="name">TVA collectée (vente) 5,5%</field> | 79 | <field name="name">TVA collectée (vente) 5,5%</field> |
| 36 | 80 | <field name="description">TVA-VT-5.5</field> | 80 | <field name="description">5.5</field> |
| 37 | 81 | <field name="amount" eval="0.055"/> | 81 | <field name="amount" eval="0.055"/> |
| 38 | 82 | <field name="type">percent</field> | 82 | <field name="type">percent</field> |
| 39 | 83 | <field name="base_code_id" ref="tax_col_55_ht"/> | 83 | <field name="base_code_id" ref="tax_col_55_ht"/> |
| 40 | @@ -99,7 +99,7 @@ | |||
| 41 | 99 | <record model="account.tax.template" id="tva_super_reduite"> | 99 | <record model="account.tax.template" id="tva_super_reduite"> |
| 42 | 100 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 100 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 43 | 101 | <field name="name">TVA collectée (vente) 2,1%</field> | 101 | <field name="name">TVA collectée (vente) 2,1%</field> |
| 45 | 102 | <field name="description">TVA-VT-2.1</field> | 102 | <field name="description">2.1</field> |
| 46 | 103 | <field name="amount" eval="0.021"/> | 103 | <field name="amount" eval="0.021"/> |
| 47 | 104 | <field name="type">percent</field> | 104 | <field name="type">percent</field> |
| 48 | 105 | <field name="base_code_id" ref="tax_col_21_ht"/> | 105 | <field name="base_code_id" ref="tax_col_21_ht"/> |
| 49 | @@ -122,8 +122,8 @@ | |||
| 50 | 122 | <!-- ACHATS Tax excluded from price --> | 122 | <!-- ACHATS Tax excluded from price --> |
| 51 | 123 | <record model="account.tax.template" id="tva_acq_normale"> | 123 | <record model="account.tax.template" id="tva_acq_normale"> |
| 52 | 124 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 124 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 55 | 125 | <field name="name">TVA acquittée (achat) 19,6%</field> | 125 | <field name="name">TVA déductible (achat) 19,6%</field> |
| 56 | 126 | <field name="description">TVA-HA-19.6</field> | 126 | <field name="description">ACH-19.6</field> |
| 57 | 127 | <field name="amount" eval="0.196"/> | 127 | <field name="amount" eval="0.196"/> |
| 58 | 128 | <field name="type">percent</field> | 128 | <field name="type">percent</field> |
| 59 | 129 | <field name="base_code_id" ref="tax_acq_196_ht"/> | 129 | <field name="base_code_id" ref="tax_acq_196_ht"/> |
| 60 | @@ -144,8 +144,8 @@ | |||
| 61 | 144 | 144 | ||
| 62 | 145 | <record model="account.tax.template" id="tva_acq_specifique"> | 145 | <record model="account.tax.template" id="tva_acq_specifique"> |
| 63 | 146 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 146 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 66 | 147 | <field name="name">TVA acquittée (achat) 8,5%</field> | 147 | <field name="name">TVA déductible (achat) 8,5%</field> |
| 67 | 148 | <field name="description">TVA-HA-8.5</field> | 148 | <field name="description">ACH-8.5</field> |
| 68 | 149 | <field name="amount" eval="0.085"/> | 149 | <field name="amount" eval="0.085"/> |
| 69 | 150 | <field name="type">percent</field> | 150 | <field name="type">percent</field> |
| 70 | 151 | <field name="base_code_id" ref="tax_acq_85_ht"/> | 151 | <field name="base_code_id" ref="tax_acq_85_ht"/> |
| 71 | @@ -166,8 +166,8 @@ | |||
| 72 | 166 | 166 | ||
| 73 | 167 | <record model="account.tax.template" id="tva_acq_specifique_1"> | 167 | <record model="account.tax.template" id="tva_acq_specifique_1"> |
| 74 | 168 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 168 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 77 | 169 | <field name="name">TVA acquittée (achat) 7,0%</field> | 169 | <field name="name">TVA déductible (achat) 7,0%</field> |
| 78 | 170 | <field name="description">TVA-HA-7.0</field> | 170 | <field name="description">ACH-7.0</field> |
| 79 | 171 | <field name="amount" eval="0.07"/> | 171 | <field name="amount" eval="0.07"/> |
| 80 | 172 | <field name="type">percent</field> | 172 | <field name="type">percent</field> |
| 81 | 173 | <field name="base_code_id" ref="tax_acq_70_ht"/> | 173 | <field name="base_code_id" ref="tax_acq_70_ht"/> |
| 82 | @@ -188,8 +188,8 @@ | |||
| 83 | 188 | 188 | ||
| 84 | 189 | <record model="account.tax.template" id="tva_acq_reduite"> | 189 | <record model="account.tax.template" id="tva_acq_reduite"> |
| 85 | 190 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 190 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 88 | 191 | <field name="name">TVA acquittée (achat) 5,5%</field> | 191 | <field name="name">TVA déductible (achat) 5,5%</field> |
| 89 | 192 | <field name="description">TVA-HA-5.5</field> | 192 | <field name="description">ACH-5.5</field> |
| 90 | 193 | <field name="amount" eval="0.055"/> | 193 | <field name="amount" eval="0.055"/> |
| 91 | 194 | <field name="type">percent</field> | 194 | <field name="type">percent</field> |
| 92 | 195 | <field name="base_code_id" ref="tax_acq_55_ht"/> | 195 | <field name="base_code_id" ref="tax_acq_55_ht"/> |
| 93 | @@ -210,8 +210,8 @@ | |||
| 94 | 210 | 210 | ||
| 95 | 211 | <record model="account.tax.template" id="tva_acq_super_reduite"> | 211 | <record model="account.tax.template" id="tva_acq_super_reduite"> |
| 96 | 212 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 212 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 99 | 213 | <field name="name">TVA acquittée (achat) 2,1%</field> | 213 | <field name="name">TVA déductible (achat) 2,1%</field> |
| 100 | 214 | <field name="description">TVA-HA-2.1</field> | 214 | <field name="description">ACH-2.1</field> |
| 101 | 215 | <field name="amount" eval="0.021"/> | 215 | <field name="amount" eval="0.021"/> |
| 102 | 216 | <field name="type">percent</field> | 216 | <field name="type">percent</field> |
| 103 | 217 | <field name="base_code_id" ref="tax_acq_21_ht"/> | 217 | <field name="base_code_id" ref="tax_acq_21_ht"/> |
| 104 | @@ -234,8 +234,8 @@ | |||
| 105 | 234 | <!-- ACHATS Tax included in price --> | 234 | <!-- ACHATS Tax included in price --> |
| 106 | 235 | <record model="account.tax.template" id="tva_acq_normale_inclue"> | 235 | <record model="account.tax.template" id="tva_acq_normale_inclue"> |
| 107 | 236 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 236 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 110 | 237 | <field name="name">TVA acquittée (achat) 19,6% inclue</field> | 237 | <field name="name">TVA déductible (achat) 19,6% TTC</field> |
| 111 | 238 | <field name="description">TVA-HA-19.6-inclue</field> | 238 | <field name="description">ACH-19.6-TTC</field> |
| 112 | 239 | <field name="price_include" eval="1"/> | 239 | <field name="price_include" eval="1"/> |
| 113 | 240 | <field name="amount" eval="0.196"/> | 240 | <field name="amount" eval="0.196"/> |
| 114 | 241 | <field name="type">percent</field> | 241 | <field name="type">percent</field> |
| 115 | @@ -257,8 +257,8 @@ | |||
| 116 | 257 | 257 | ||
| 117 | 258 | <record model="account.tax.template" id="tva_acq_specifique_inclue"> | 258 | <record model="account.tax.template" id="tva_acq_specifique_inclue"> |
| 118 | 259 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 259 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 121 | 260 | <field name="name">TVA acquittée (achat) 8,5% inclue</field> | 260 | <field name="name">TVA déductible (achat) 8,5% TTC</field> |
| 122 | 261 | <field name="description">TVA-HA-8.5-inclue</field> | 261 | <field name="description">ACH-8.5-TTC</field> |
| 123 | 262 | <field name="price_include" eval="1"/> | 262 | <field name="price_include" eval="1"/> |
| 124 | 263 | <field name="amount" eval="0.085"/> | 263 | <field name="amount" eval="0.085"/> |
| 125 | 264 | <field name="type">percent</field> | 264 | <field name="type">percent</field> |
| 126 | @@ -280,8 +280,8 @@ | |||
| 127 | 280 | 280 | ||
| 128 | 281 | <record model="account.tax.template" id="tva_acq_specifique_1_inclue"> | 281 | <record model="account.tax.template" id="tva_acq_specifique_1_inclue"> |
| 129 | 282 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 282 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 132 | 283 | <field name="name">TVA acquittée (achat) 7,0% inclue</field> | 283 | <field name="name">TVA déductible (achat) 7,0% TTC</field> |
| 133 | 284 | <field name="description">TVA-HA-7.0-inclue</field> | 284 | <field name="description">ACH-7.0-TTC</field> |
| 134 | 285 | <field name="price_include" eval="1"/> | 285 | <field name="price_include" eval="1"/> |
| 135 | 286 | <field name="amount" eval="0.07"/> | 286 | <field name="amount" eval="0.07"/> |
| 136 | 287 | <field name="type">percent</field> | 287 | <field name="type">percent</field> |
| 137 | @@ -303,8 +303,8 @@ | |||
| 138 | 303 | 303 | ||
| 139 | 304 | <record model="account.tax.template" id="tva_acq_reduite_inclue"> | 304 | <record model="account.tax.template" id="tva_acq_reduite_inclue"> |
| 140 | 305 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 305 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 143 | 306 | <field name="name">TVA acquittée (achat) 5,5% inclue</field> | 306 | <field name="name">TVA déductible (achat) 5,5% TTC</field> |
| 144 | 307 | <field name="description">TVA-HA-5.5-inclue</field> | 307 | <field name="description">ACH-5.5-TTC</field> |
| 145 | 308 | <field name="price_include" eval="1"/> | 308 | <field name="price_include" eval="1"/> |
| 146 | 309 | <field name="amount" eval="0.055"/> | 309 | <field name="amount" eval="0.055"/> |
| 147 | 310 | <field name="type">percent</field> | 310 | <field name="type">percent</field> |
| 148 | @@ -326,8 +326,8 @@ | |||
| 149 | 326 | 326 | ||
| 150 | 327 | <record model="account.tax.template" id="tva_acq_super_reduite_inclue"> | 327 | <record model="account.tax.template" id="tva_acq_super_reduite_inclue"> |
| 151 | 328 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 328 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 154 | 329 | <field name="name">TVA acquittée (achat) 2,1% inclue</field> | 329 | <field name="name">TVA déductible (achat) 2,1% TTC</field> |
| 155 | 330 | <field name="description">TVA-HA-2.1-inclue</field> | 330 | <field name="description">ACH-2.1-TTC</field> |
| 156 | 331 | <field name="price_include" eval="1"/> | 331 | <field name="price_include" eval="1"/> |
| 157 | 332 | <field name="amount" eval="0.021"/> | 332 | <field name="amount" eval="0.021"/> |
| 158 | 333 | <field name="type">percent</field> | 333 | <field name="type">percent</field> |
| 159 | @@ -349,11 +349,11 @@ | |||
| 160 | 349 | 349 | ||
| 161 | 350 | 350 | ||
| 162 | 351 | 351 | ||
| 164 | 352 | <!-- IMMOBILISATIONS (achats) --> | 352 | <!-- ImmoBILISATIONS (achats) --> |
| 165 | 353 | <record model="account.tax.template" id="tva_imm_normale"> | 353 | <record model="account.tax.template" id="tva_imm_normale"> |
| 166 | 354 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 354 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 169 | 355 | <field name="name">TVA immobilisation (achat) 19,6%</field> | 355 | <field name="name">TVA déd./immobilisation (achat) 19,6%</field> |
| 170 | 356 | <field name="description">TVA-immo-19.6</field> | 356 | <field name="description">IMMO-19.6</field> |
| 171 | 357 | <field name="amount" eval="0.196"/> | 357 | <field name="amount" eval="0.196"/> |
| 172 | 358 | <field name="type">percent</field> | 358 | <field name="type">percent</field> |
| 173 | 359 | <field name="base_code_id" ref="tax_imm_196_ht"/> | 359 | <field name="base_code_id" ref="tax_imm_196_ht"/> |
| 174 | @@ -374,8 +374,8 @@ | |||
| 175 | 374 | 374 | ||
| 176 | 375 | <record model="account.tax.template" id="tva_imm_specifique"> | 375 | <record model="account.tax.template" id="tva_imm_specifique"> |
| 177 | 376 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 376 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 180 | 377 | <field name="name">TVA immobilisation (achat) 8,5%</field> | 377 | <field name="name">TVA déd./immobilisation (achat) 8,5%</field> |
| 181 | 378 | <field name="description">TVA-immo-8.5</field> | 378 | <field name="description">IMMO-8.5</field> |
| 182 | 379 | <field name="amount" eval="0.085"/> | 379 | <field name="amount" eval="0.085"/> |
| 183 | 380 | <field name="type">percent</field> | 380 | <field name="type">percent</field> |
| 184 | 381 | <field name="base_code_id" ref="tax_imm_85_ht"/> | 381 | <field name="base_code_id" ref="tax_imm_85_ht"/> |
| 185 | @@ -396,8 +396,8 @@ | |||
| 186 | 396 | 396 | ||
| 187 | 397 | <record model="account.tax.template" id="tva_imm_specifique_1"> | 397 | <record model="account.tax.template" id="tva_imm_specifique_1"> |
| 188 | 398 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 398 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 191 | 399 | <field name="name">TVA immobilisation (achat) 7,0%</field> | 399 | <field name="name">TVA déd./immobilisation (achat) 7,0%</field> |
| 192 | 400 | <field name="description">TVA-immo-7.0</field> | 400 | <field name="description">IMMO-7.0</field> |
| 193 | 401 | <field name="amount" eval="0.07"/> | 401 | <field name="amount" eval="0.07"/> |
| 194 | 402 | <field name="type">percent</field> | 402 | <field name="type">percent</field> |
| 195 | 403 | <field name="base_code_id" ref="tax_imm_70_ht"/> | 403 | <field name="base_code_id" ref="tax_imm_70_ht"/> |
| 196 | @@ -418,8 +418,8 @@ | |||
| 197 | 418 | 418 | ||
| 198 | 419 | <record model="account.tax.template" id="tva_imm_reduite"> | 419 | <record model="account.tax.template" id="tva_imm_reduite"> |
| 199 | 420 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 420 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 202 | 421 | <field name="name">TVA immobilisation (achat) 5,5%</field> | 421 | <field name="name">TVA déd./immobilisation (achat) 5,5%</field> |
| 203 | 422 | <field name="description">TVA-immo-5.5</field> | 422 | <field name="description">IMMO-5.5</field> |
| 204 | 423 | <field name="amount" eval="0.055"/> | 423 | <field name="amount" eval="0.055"/> |
| 205 | 424 | <field name="type">percent</field> | 424 | <field name="type">percent</field> |
| 206 | 425 | <field name="base_code_id" ref="tax_imm_55_ht"/> | 425 | <field name="base_code_id" ref="tax_imm_55_ht"/> |
| 207 | @@ -440,8 +440,8 @@ | |||
| 208 | 440 | 440 | ||
| 209 | 441 | <record model="account.tax.template" id="tva_imm_super_reduite"> | 441 | <record model="account.tax.template" id="tva_imm_super_reduite"> |
| 210 | 442 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 442 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 213 | 443 | <field name="name">TVA immobilisation (achat) 2,1%</field> | 443 | <field name="name">TVA déd./immobilisation (achat) 2,1%</field> |
| 214 | 444 | <field name="description">TVA-immo-2.1</field> | 444 | <field name="description">IMMO-2.1</field> |
| 215 | 445 | <field name="amount" eval="0.021"/> | 445 | <field name="amount" eval="0.021"/> |
| 216 | 446 | <field name="type">percent</field> | 446 | <field name="type">percent</field> |
| 217 | 447 | <field name="base_code_id" ref="tax_imm_21_ht"/> | 447 | <field name="base_code_id" ref="tax_imm_21_ht"/> |
| 218 | @@ -464,8 +464,8 @@ | |||
| 219 | 464 | <!-- VENTES INTRACOMMUNAUTAIRE --> | 464 | <!-- VENTES INTRACOMMUNAUTAIRE --> |
| 220 | 465 | <record model="account.tax.template" id="tva_intra_normale"> | 465 | <record model="account.tax.template" id="tva_intra_normale"> |
| 221 | 466 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 466 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 224 | 467 | <field name="name">TVA due intracommunautaire (achat) 19,6%</field> <!-- ventes --> | 467 | <field name="name">TVA due s/ acq. intracommunautaire (achat) 19,6%</field> <!-- ventes --> |
| 225 | 468 | <field name="description">TVA-HA_UE_due-19.6</field> | 468 | <field name="description">ACH_UE_due-19.6</field> |
| 226 | 469 | <field name="amount" eval="-0.196"/> | 469 | <field name="amount" eval="-0.196"/> |
| 227 | 470 | <field name="type">percent</field> | 470 | <field name="type">percent</field> |
| 228 | 471 | <field name="base_code_id" ref="tax_intra_196_ht"/> | 471 | <field name="base_code_id" ref="tax_intra_196_ht"/> |
| 229 | @@ -486,8 +486,8 @@ | |||
| 230 | 486 | 486 | ||
| 231 | 487 | <record model="account.tax.template" id="tva_intra_specifique"> | 487 | <record model="account.tax.template" id="tva_intra_specifique"> |
| 232 | 488 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 488 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 235 | 489 | <field name="name">TVA due intracommunautaire (achat) 8,5%</field> | 489 | <field name="name">TVA due s/ acq. intracommunautaire (achat) 8,5%</field> |
| 236 | 490 | <field name="description">TVA-HA_UE_due-8.5</field> | 490 | <field name="description">ACH_UE_due-8.5</field> |
| 237 | 491 | <field name="amount" eval="-0.085"/> | 491 | <field name="amount" eval="-0.085"/> |
| 238 | 492 | <field name="type">percent</field> | 492 | <field name="type">percent</field> |
| 239 | 493 | <field name="base_code_id" ref="tax_intra_85_ht"/> | 493 | <field name="base_code_id" ref="tax_intra_85_ht"/> |
| 240 | @@ -508,8 +508,8 @@ | |||
| 241 | 508 | 508 | ||
| 242 | 509 | <record model="account.tax.template" id="tva_intra_specifique_1"> | 509 | <record model="account.tax.template" id="tva_intra_specifique_1"> |
| 243 | 510 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 510 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 246 | 511 | <field name="name">TVA due intracommunautaire (achat) 7,0%</field> | 511 | <field name="name">TVA due s/ acq. intracommunautaire (achat) 7,0%</field> |
| 247 | 512 | <field name="description">TVA-HA_UE_due-7.0</field> | 512 | <field name="description">ACH_UE_due-7.0</field> |
| 248 | 513 | <field name="amount" eval="-0.07"/> | 513 | <field name="amount" eval="-0.07"/> |
| 249 | 514 | <field name="type">percent</field> | 514 | <field name="type">percent</field> |
| 250 | 515 | <field name="base_code_id" ref="tax_intra_70_ht"/> | 515 | <field name="base_code_id" ref="tax_intra_70_ht"/> |
| 251 | @@ -530,8 +530,8 @@ | |||
| 252 | 530 | 530 | ||
| 253 | 531 | <record model="account.tax.template" id="tva_intra_reduite"> | 531 | <record model="account.tax.template" id="tva_intra_reduite"> |
| 254 | 532 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 532 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 257 | 533 | <field name="name">TVA due intracommunautaire (achat) 5,5%</field> | 533 | <field name="name">TVA due s/ acq. intracommunautaire (achat) 5,5%</field> |
| 258 | 534 | <field name="description">TVA-HA_UE_due-5.5</field> | 534 | <field name="description">ACH_UE_due-5.5</field> |
| 259 | 535 | <field name="amount" eval="-0.055"/> | 535 | <field name="amount" eval="-0.055"/> |
| 260 | 536 | <field name="type">percent</field> | 536 | <field name="type">percent</field> |
| 261 | 537 | <field name="base_code_id" ref="tax_intra_55_ht"/> | 537 | <field name="base_code_id" ref="tax_intra_55_ht"/> |
| 262 | @@ -552,8 +552,8 @@ | |||
| 263 | 552 | 552 | ||
| 264 | 553 | <record model="account.tax.template" id="tva_intra_super_reduite"> | 553 | <record model="account.tax.template" id="tva_intra_super_reduite"> |
| 265 | 554 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 554 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 268 | 555 | <field name="name">TVA due intracommunautaire (achat) 2,1%</field> | 555 | <field name="name">TVA due s/ acq. intracommunautaire (achat) 2,1%</field> |
| 269 | 556 | <field name="description">TVA-HA_UE_due-2.1</field> | 556 | <field name="description">ACH_UE_due-2.1</field> |
| 270 | 557 | <field name="amount" eval="-0.021"/> | 557 | <field name="amount" eval="-0.021"/> |
| 271 | 558 | <field name="type">percent</field> | 558 | <field name="type">percent</field> |
| 272 | 559 | <field name="base_code_id" ref="tax_intra_21_ht"/> | 559 | <field name="base_code_id" ref="tax_intra_21_ht"/> |
| 273 | @@ -576,20 +576,16 @@ | |||
| 274 | 576 | <!-- ACHATS INTRACOMMUNAUTAIRE --> | 576 | <!-- ACHATS INTRACOMMUNAUTAIRE --> |
| 275 | 577 | <record model="account.tax.template" id="tva_acq_intra_normale"> | 577 | <record model="account.tax.template" id="tva_acq_intra_normale"> |
| 276 | 578 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 578 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 279 | 579 | <field name="name">TVA déductible intracommunautaire (achat) 19,6%</field> | 579 | <field name="name">TVA déd. s/ acq. intracommunautaire (achat) 19,6%</field> |
| 280 | 580 | <field name="description">TVA-HA_UE_déduc-19.6</field> | 580 | <field name="description">ACH_UE_ded.-19.6</field> |
| 281 | 581 | <field name="amount" eval="0.196"/> | 581 | <field name="amount" eval="0.196"/> |
| 282 | 582 | <field name="type">percent</field> | 582 | <field name="type">percent</field> |
| 283 | 583 | <field name="base_code_id" ref="tax_intra_acq_196_ht"/> | ||
| 284 | 584 | <field name="base_sign" eval="-1"/> | ||
| 285 | 585 | <field name="tax_code_id" ref="tax_intra_acq_196"/> | 583 | <field name="tax_code_id" ref="tax_intra_acq_196"/> |
| 286 | 586 | <field name="tax_sign" eval="-1"/> | 584 | <field name="tax_sign" eval="-1"/> |
| 287 | 587 | 585 | ||
| 288 | 588 | <field name="account_collected_id" ref="pcg_445662"/> | 586 | <field name="account_collected_id" ref="pcg_445662"/> |
| 289 | 589 | <field name="account_paid_id" ref="pcg_445662"/> | 587 | <field name="account_paid_id" ref="pcg_445662"/> |
| 290 | 590 | 588 | ||
| 291 | 591 | <field name="ref_base_code_id" ref="tax_intra_acq_196_ht"/> | ||
| 292 | 592 | <field name="ref_base_sign" eval="1"/> | ||
| 293 | 593 | <field name="ref_tax_code_id" ref="tax_intra_acq_196"/> | 589 | <field name="ref_tax_code_id" ref="tax_intra_acq_196"/> |
| 294 | 594 | <field name="ref_tax_sign" eval="1"/> | 590 | <field name="ref_tax_sign" eval="1"/> |
| 295 | 595 | <field name="sequence" eval="10"/> | 591 | <field name="sequence" eval="10"/> |
| 296 | @@ -598,20 +594,16 @@ | |||
| 297 | 598 | 594 | ||
| 298 | 599 | <record model="account.tax.template" id="tva_acq_intra_specifique"> | 595 | <record model="account.tax.template" id="tva_acq_intra_specifique"> |
| 299 | 600 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 596 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 302 | 601 | <field name="name">TVA déductible intracommunautaire (achat) 8,5%</field> | 597 | <field name="name">TVA déd. s/ acq. intracommunautaire (achat) 8,5%</field> |
| 303 | 602 | <field name="description">TVA-HA_UE_déduc-8.5</field> | 598 | <field name="description">ACH_UE_ded.-8.5</field> |
| 304 | 603 | <field name="amount" eval="0.085"/> | 599 | <field name="amount" eval="0.085"/> |
| 305 | 604 | <field name="type">percent</field> | 600 | <field name="type">percent</field> |
| 306 | 605 | <field name="base_code_id" ref="tax_intra_acq_85_ht"/> | ||
| 307 | 606 | <field name="base_sign" eval="-1"/> | ||
| 308 | 607 | <field name="tax_code_id" ref="tax_intra_acq_85"/> | 601 | <field name="tax_code_id" ref="tax_intra_acq_85"/> |
| 309 | 608 | <field name="tax_sign" eval="-1"/> | 602 | <field name="tax_sign" eval="-1"/> |
| 310 | 609 | 603 | ||
| 311 | 610 | <field name="account_collected_id" ref="pcg_445662"/> | 604 | <field name="account_collected_id" ref="pcg_445662"/> |
| 312 | 611 | <field name="account_paid_id" ref="pcg_445662"/> | 605 | <field name="account_paid_id" ref="pcg_445662"/> |
| 313 | 612 | 606 | ||
| 314 | 613 | <field name="ref_base_code_id" ref="tax_intra_acq_85_ht"/> | ||
| 315 | 614 | <field name="ref_base_sign" eval="1"/> | ||
| 316 | 615 | <field name="ref_tax_code_id" ref="tax_intra_acq_85"/> | 607 | <field name="ref_tax_code_id" ref="tax_intra_acq_85"/> |
| 317 | 616 | <field name="ref_tax_sign" eval="1"/> | 608 | <field name="ref_tax_sign" eval="1"/> |
| 318 | 617 | <field name="sequence" eval="10"/> | 609 | <field name="sequence" eval="10"/> |
| 319 | @@ -620,20 +612,16 @@ | |||
| 320 | 620 | 612 | ||
| 321 | 621 | <record model="account.tax.template" id="tva_acq_intra_specifique_1"> | 613 | <record model="account.tax.template" id="tva_acq_intra_specifique_1"> |
| 322 | 622 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 614 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 325 | 623 | <field name="name">TVA déductible intracommunautaire (achat) 7,0%</field> | 615 | <field name="name">TVA déd. s/ acq. intracommunautaire (achat) 7,0%</field> |
| 326 | 624 | <field name="description">TVA-HA_UE_déduc-7.0</field> | 616 | <field name="description">ACH_UE_ded.-7.0</field> |
| 327 | 625 | <field name="amount" eval="0.07"/> | 617 | <field name="amount" eval="0.07"/> |
| 328 | 626 | <field name="type">percent</field> | 618 | <field name="type">percent</field> |
| 329 | 627 | <field name="base_code_id" ref="tax_intra_acq_70_ht"/> | ||
| 330 | 628 | <field name="base_sign" eval="-1"/> | ||
| 331 | 629 | <field name="tax_code_id" ref="tax_intra_acq_70"/> | 619 | <field name="tax_code_id" ref="tax_intra_acq_70"/> |
| 332 | 630 | <field name="tax_sign" eval="-1"/> | 620 | <field name="tax_sign" eval="-1"/> |
| 333 | 631 | 621 | ||
| 334 | 632 | <field name="account_collected_id" ref="pcg_445662"/> | 622 | <field name="account_collected_id" ref="pcg_445662"/> |
| 335 | 633 | <field name="account_paid_id" ref="pcg_445662"/> | 623 | <field name="account_paid_id" ref="pcg_445662"/> |
| 336 | 634 | 624 | ||
| 337 | 635 | <field name="ref_base_code_id" ref="tax_intra_acq_70_ht"/> | ||
| 338 | 636 | <field name="ref_base_sign" eval="1"/> | ||
| 339 | 637 | <field name="ref_tax_code_id" ref="tax_intra_acq_70"/> | 625 | <field name="ref_tax_code_id" ref="tax_intra_acq_70"/> |
| 340 | 638 | <field name="ref_tax_sign" eval="1"/> | 626 | <field name="ref_tax_sign" eval="1"/> |
| 341 | 639 | <field name="sequence" eval="10"/> | 627 | <field name="sequence" eval="10"/> |
| 342 | @@ -642,20 +630,16 @@ | |||
| 343 | 642 | 630 | ||
| 344 | 643 | <record model="account.tax.template" id="tva_acq_intra_reduite"> | 631 | <record model="account.tax.template" id="tva_acq_intra_reduite"> |
| 345 | 644 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 632 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 348 | 645 | <field name="name">TVA déductible intracommunautaire (achat) 5,5%</field> | 633 | <field name="name">TVA déd. s/ acq. intracommunautaire (achat) 5,5%</field> |
| 349 | 646 | <field name="description">TVA-HA_UE_déduc-5.5</field> | 634 | <field name="description">ACH_UE_ded.-5.5</field> |
| 350 | 647 | <field name="amount" eval="0.055"/> | 635 | <field name="amount" eval="0.055"/> |
| 351 | 648 | <field name="type">percent</field> | 636 | <field name="type">percent</field> |
| 352 | 649 | <field name="base_code_id" ref="tax_intra_acq_55_ht"/> | ||
| 353 | 650 | <field name="base_sign" eval="-1"/> | ||
| 354 | 651 | <field name="tax_code_id" ref="tax_intra_acq_55"/> | 637 | <field name="tax_code_id" ref="tax_intra_acq_55"/> |
| 355 | 652 | <field name="tax_sign" eval="-1"/> | 638 | <field name="tax_sign" eval="-1"/> |
| 356 | 653 | 639 | ||
| 357 | 654 | <field name="account_collected_id" ref="pcg_445662"/> | 640 | <field name="account_collected_id" ref="pcg_445662"/> |
| 358 | 655 | <field name="account_paid_id" ref="pcg_445662"/> | 641 | <field name="account_paid_id" ref="pcg_445662"/> |
| 359 | 656 | 642 | ||
| 360 | 657 | <field name="ref_base_code_id" ref="tax_intra_acq_55_ht"/> | ||
| 361 | 658 | <field name="ref_base_sign" eval="1"/> | ||
| 362 | 659 | <field name="ref_tax_code_id" ref="tax_intra_acq_55"/> | 643 | <field name="ref_tax_code_id" ref="tax_intra_acq_55"/> |
| 363 | 660 | <field name="ref_tax_sign" eval="1"/> | 644 | <field name="ref_tax_sign" eval="1"/> |
| 364 | 661 | <field name="sequence" eval="10"/> | 645 | <field name="sequence" eval="10"/> |
| 365 | @@ -664,20 +648,16 @@ | |||
| 366 | 664 | 648 | ||
| 367 | 665 | <record model="account.tax.template" id="tva_acq_intra_super_reduite"> | 649 | <record model="account.tax.template" id="tva_acq_intra_super_reduite"> |
| 368 | 666 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 650 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 371 | 667 | <field name="name">TVA déductible intracommunautaire (achat) 2,1%</field> | 651 | <field name="name">TVA déd. s/ acq. intracommunautaire (achat) 2,1%</field> |
| 372 | 668 | <field name="description">TVA-HA_UE_déduc-2.1</field> | 652 | <field name="description">ACH_UE_ded.-2.1</field> |
| 373 | 669 | <field name="amount" eval="0.021"/> | 653 | <field name="amount" eval="0.021"/> |
| 374 | 670 | <field name="type">percent</field> | 654 | <field name="type">percent</field> |
| 375 | 671 | <field name="base_code_id" ref="tax_intra_acq_21_ht"/> | ||
| 376 | 672 | <field name="base_sign" eval="-1"/> | ||
| 377 | 673 | <field name="tax_code_id" ref="tax_intra_acq_21"/> | 655 | <field name="tax_code_id" ref="tax_intra_acq_21"/> |
| 378 | 674 | <field name="tax_sign" eval="-1"/> | 656 | <field name="tax_sign" eval="-1"/> |
| 379 | 675 | 657 | ||
| 380 | 676 | <field name="account_collected_id" ref="pcg_445662"/> | 658 | <field name="account_collected_id" ref="pcg_445662"/> |
| 381 | 677 | <field name="account_paid_id" ref="pcg_445662"/> | 659 | <field name="account_paid_id" ref="pcg_445662"/> |
| 382 | 678 | 660 | ||
| 383 | 679 | <field name="ref_base_code_id" ref="tax_intra_acq_21_ht"/> | ||
| 384 | 680 | <field name="ref_base_sign" eval="1"/> | ||
| 385 | 681 | <field name="ref_tax_code_id" ref="tax_intra_acq_21"/> | 661 | <field name="ref_tax_code_id" ref="tax_intra_acq_21"/> |
| 386 | 682 | <field name="ref_tax_sign" eval="1"/> | 662 | <field name="ref_tax_sign" eval="1"/> |
| 387 | 683 | <field name="sequence" eval="10"/> | 663 | <field name="sequence" eval="10"/> |
| 388 | @@ -689,7 +669,7 @@ | |||
| 389 | 689 | <record model="account.tax.template" id="tva_0"> | 669 | <record model="account.tax.template" id="tva_0"> |
| 390 | 690 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 670 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 391 | 691 | <field name="name">TVA 0% autres opérations non imposables (vente)</field> | 671 | <field name="name">TVA 0% autres opérations non imposables (vente)</field> |
| 393 | 692 | <field name="description">TVA-VT-autre-0</field> | 672 | <field name="description">EXO-0</field> |
| 394 | 693 | <field name="amount" eval="0.00"/> | 673 | <field name="amount" eval="0.00"/> |
| 395 | 694 | <field name="type">percent</field> | 674 | <field name="type">percent</field> |
| 396 | 695 | <field name="base_code_id" ref="tax_misc_0_ht"/> | 675 | <field name="base_code_id" ref="tax_misc_0_ht"/> |
| 397 | @@ -707,7 +687,7 @@ | |||
| 398 | 707 | <record model="account.tax.template" id="tva_export_0"> | 687 | <record model="account.tax.template" id="tva_export_0"> |
| 399 | 708 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 688 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 400 | 709 | <field name="name">TVA 0% export (vente)</field> | 689 | <field name="name">TVA 0% export (vente)</field> |
| 402 | 710 | <field name="description">TVA-export-0</field> | 690 | <field name="description">EXPORT-0</field> |
| 403 | 711 | <field name="amount" eval="0.00"/> | 691 | <field name="amount" eval="0.00"/> |
| 404 | 712 | <field name="type">percent</field> | 692 | <field name="type">percent</field> |
| 405 | 713 | <field name="base_code_id" ref="tax_export_0_ht"/> | 693 | <field name="base_code_id" ref="tax_export_0_ht"/> |
| 406 | @@ -725,7 +705,7 @@ | |||
| 407 | 725 | <record model="account.tax.template" id="tva_intra_0"> | 705 | <record model="account.tax.template" id="tva_intra_0"> |
| 408 | 726 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 706 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 409 | 727 | <field name="name">TVA 0% livraisons intracommunautaires (vente)</field> | 707 | <field name="name">TVA 0% livraisons intracommunautaires (vente)</field> |
| 411 | 728 | <field name="description">TVA-VT-UE-0</field> | 708 | <field name="description">UE-0</field> |
| 412 | 729 | <field name="amount" eval="0.00"/> | 709 | <field name="amount" eval="0.00"/> |
| 413 | 730 | <field name="type">percent</field> | 710 | <field name="type">percent</field> |
| 414 | 731 | <field name="base_code_id" ref="tax_intra_0_ht"/> | 711 | <field name="base_code_id" ref="tax_intra_0_ht"/> |
| 415 | @@ -743,7 +723,7 @@ | |||
| 416 | 743 | <record model="account.tax.template" id="tva_import_0"> | 723 | <record model="account.tax.template" id="tva_import_0"> |
| 417 | 744 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> | 724 | <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/> |
| 418 | 745 | <field name="name">TVA 0% import (achat)</field> | 725 | <field name="name">TVA 0% import (achat)</field> |
| 420 | 746 | <field name="description">TVA-import-0</field> | 726 | <field name="description">IMPORT-0</field> |
| 421 | 747 | <field name="amount" eval="0.00"/> | 727 | <field name="amount" eval="0.00"/> |
| 422 | 748 | <field name="type">percent</field> | 728 | <field name="type">percent</field> |
| 423 | 749 | <field name="base_code_id" ref="tax_import_0_ht"/> | 729 | <field name="base_code_id" ref="tax_import_0_ht"/> |
| 424 | @@ -796,7 +776,7 @@ | |||
| 425 | 796 | </record> | 776 | </record> |
| 426 | 797 | 777 | ||
| 427 | 798 | <record id="pcg_60221" model="account.account.template"> | 778 | <record id="pcg_60221" model="account.account.template"> |
| 429 | 799 | <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/> | 779 | <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/> |
| 430 | 800 | </record> | 780 | </record> |
| 431 | 801 | 781 | ||
| 432 | 802 | <record id="pcg_60222" model="account.account.template"> | 782 | <record id="pcg_60222" model="account.account.template"> |
| 433 | @@ -880,7 +860,7 @@ | |||
| 434 | 880 | </record> | 860 | </record> |
| 435 | 881 | 861 | ||
| 436 | 882 | <record id="pcg_6071" model="account.account.template"> | 862 | <record id="pcg_6071" model="account.account.template"> |
| 438 | 883 | <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/> | 863 | <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/> |
| 439 | 884 | </record> | 864 | </record> |
| 440 | 885 | 865 | ||
| 441 | 886 | <record id="pcg_6072" model="account.account.template"> | 866 | <record id="pcg_6072" model="account.account.template"> |
| 442 | @@ -1056,7 +1036,7 @@ | |||
| 443 | 1056 | </record> | 1036 | </record> |
| 444 | 1057 | 1037 | ||
| 445 | 1058 | <record id="pcg_6248" model="account.account.template"> | 1038 | <record id="pcg_6248" model="account.account.template"> |
| 447 | 1059 | <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/> | 1039 | <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/> |
| 448 | 1060 | </record> | 1040 | </record> |
| 449 | 1061 | 1041 | ||
| 450 | 1062 | 1042 | ||
| 451 | 1063 | 1043 | ||
| 452 | === modified file 'l10n_fr/plan_comptable_general.xml' | |||
| 453 | --- l10n_fr/plan_comptable_general.xml 2012-11-29 22:26:45 +0000 | |||
| 454 | +++ l10n_fr/plan_comptable_general.xml 2012-12-13 15:05:41 +0000 | |||
| 455 | @@ -3581,7 +3581,6 @@ | |||
| 456 | 3581 | <field name="type">view</field> | 3581 | <field name="type">view</field> |
| 457 | 3582 | <field name="user_type" ref="account.data_account_type_view"/> | 3582 | <field name="user_type" ref="account.data_account_type_view"/> |
| 458 | 3583 | <field name="parent_id" ref="pcg_445"/> | 3583 | <field name="parent_id" ref="pcg_445"/> |
| 459 | 3584 | <field name="reconcile" eval="True"/> | ||
| 460 | 3585 | </record> | 3584 | </record> |
| 461 | 3586 | 3585 | ||
| 462 | 3587 | <record id="pcg_445201" model="account.account.template"> | 3586 | <record id="pcg_445201" model="account.account.template"> |
| 463 | @@ -3590,7 +3589,6 @@ | |||
| 464 | 3590 | <field name="type">other</field> | 3589 | <field name="type">other</field> |
| 465 | 3591 | <field name="user_type" ref="account.data_account_type_liability"/> | 3590 | <field name="user_type" ref="account.data_account_type_liability"/> |
| 466 | 3592 | <field name="parent_id" ref="pcg_4452"/> | 3591 | <field name="parent_id" ref="pcg_4452"/> |
| 467 | 3593 | <field name="reconcile" eval="True"/> | ||
| 468 | 3594 | </record> | 3592 | </record> |
| 469 | 3595 | 3593 | ||
| 470 | 3596 | <record id="pcg_445202" model="account.account.template"> | 3594 | <record id="pcg_445202" model="account.account.template"> |
| 471 | @@ -3599,7 +3597,6 @@ | |||
| 472 | 3599 | <field name="type">other</field> | 3597 | <field name="type">other</field> |
| 473 | 3600 | <field name="user_type" ref="account.data_account_type_liability"/> | 3598 | <field name="user_type" ref="account.data_account_type_liability"/> |
| 474 | 3601 | <field name="parent_id" ref="pcg_4452"/> | 3599 | <field name="parent_id" ref="pcg_4452"/> |
| 475 | 3602 | <field name="reconcile" eval="True"/> | ||
| 476 | 3603 | </record> | 3600 | </record> |
| 477 | 3604 | 3601 | ||
| 478 | 3605 | <record id="pcg_445203" model="account.account.template"> | 3602 | <record id="pcg_445203" model="account.account.template"> |
| 479 | @@ -3608,7 +3605,6 @@ | |||
| 480 | 3608 | <field name="type">other</field> | 3605 | <field name="type">other</field> |
| 481 | 3609 | <field name="user_type" ref="account.data_account_type_liability"/> | 3606 | <field name="user_type" ref="account.data_account_type_liability"/> |
| 482 | 3610 | <field name="parent_id" ref="pcg_4452"/> | 3607 | <field name="parent_id" ref="pcg_4452"/> |
| 483 | 3611 | <field name="reconcile" eval="True"/> | ||
| 484 | 3612 | </record> | 3608 | </record> |
| 485 | 3613 | 3609 | ||
| 486 | 3614 | <record id="pcg_4455" model="account.account.template"> | 3610 | <record id="pcg_4455" model="account.account.template"> |
| 487 | @@ -3644,7 +3640,6 @@ | |||
| 488 | 3644 | <field name="type">view</field> | 3640 | <field name="type">view</field> |
| 489 | 3645 | <field name="user_type" ref="account.data_account_type_view"/> | 3641 | <field name="user_type" ref="account.data_account_type_view"/> |
| 490 | 3646 | <field name="parent_id" ref="pcg_445"/> | 3642 | <field name="parent_id" ref="pcg_445"/> |
| 491 | 3647 | <field name="reconcile" eval="True"/> | ||
| 492 | 3648 | </record> | 3643 | </record> |
| 493 | 3649 | 3644 | ||
| 494 | 3650 | <record id="pcg_44562" model="account.account.template"> | 3645 | <record id="pcg_44562" model="account.account.template"> |
| 495 | @@ -3653,7 +3648,6 @@ | |||
| 496 | 3653 | <field name="type">other</field> | 3648 | <field name="type">other</field> |
| 497 | 3654 | <field name="user_type" ref="account.data_account_type_asset"/> | 3649 | <field name="user_type" ref="account.data_account_type_asset"/> |
| 498 | 3655 | <field name="parent_id" ref="pcg_4456"/> | 3650 | <field name="parent_id" ref="pcg_4456"/> |
| 499 | 3656 | <field name="reconcile" eval="True"/> | ||
| 500 | 3657 | </record> | 3651 | </record> |
| 501 | 3658 | 3652 | ||
| 502 | 3659 | <record id="pcg_44563" model="account.account.template"> | 3653 | <record id="pcg_44563" model="account.account.template"> |
| 503 | @@ -3671,7 +3665,6 @@ | |||
| 504 | 3671 | <field name="type">other</field> | 3665 | <field name="type">other</field> |
| 505 | 3672 | <field name="user_type" ref="account.data_account_type_asset"/> | 3666 | <field name="user_type" ref="account.data_account_type_asset"/> |
| 506 | 3673 | <field name="parent_id" ref="pcg_4456"/> | 3667 | <field name="parent_id" ref="pcg_4456"/> |
| 507 | 3674 | <field name="reconcile" eval="True"/> | ||
| 508 | 3675 | </record> | 3668 | </record> |
| 509 | 3676 | 3669 | ||
| 510 | 3677 | <record id="pcg_445662" model="account.account.template"> | 3670 | <record id="pcg_445662" model="account.account.template"> |
| 511 | @@ -3680,7 +3673,6 @@ | |||
| 512 | 3680 | <field name="type">other</field> | 3673 | <field name="type">other</field> |
| 513 | 3681 | <field name="user_type" ref="account.data_account_type_asset"/> | 3674 | <field name="user_type" ref="account.data_account_type_asset"/> |
| 514 | 3682 | <field name="parent_id" ref="pcg_4456"/> | 3675 | <field name="parent_id" ref="pcg_4456"/> |
| 515 | 3683 | <field name="reconcile" eval="True"/> | ||
| 516 | 3684 | </record> | 3676 | </record> |
| 517 | 3685 | 3677 | ||
| 518 | 3686 | <record id="pcg_44567" model="account.account.template"> | 3678 | <record id="pcg_44567" model="account.account.template"> |
| 519 | @@ -3717,7 +3709,6 @@ | |||
| 520 | 3717 | <field name="type">view</field> | 3709 | <field name="type">view</field> |
| 521 | 3718 | <field name="user_type" ref="account.data_account_type_view"/> | 3710 | <field name="user_type" ref="account.data_account_type_view"/> |
| 522 | 3719 | <field name="parent_id" ref="pcg_4457"/> | 3711 | <field name="parent_id" ref="pcg_4457"/> |
| 523 | 3720 | <field name="reconcile" eval="True"/> | ||
| 524 | 3721 | </record> | 3712 | </record> |
| 525 | 3722 | 3713 | ||
| 526 | 3723 | <record id="pcg_445711" model="account.account.template"> | 3714 | <record id="pcg_445711" model="account.account.template"> |
| 527 | @@ -3726,7 +3717,6 @@ | |||
| 528 | 3726 | <field name="type">other</field> | 3717 | <field name="type">other</field> |
| 529 | 3727 | <field name="user_type" ref="account.data_account_type_liability"/> | 3718 | <field name="user_type" ref="account.data_account_type_liability"/> |
| 530 | 3728 | <field name="parent_id" ref="pcg_44571"/> | 3719 | <field name="parent_id" ref="pcg_44571"/> |
| 531 | 3729 | <field name="reconcile" eval="True"/> | ||
| 532 | 3730 | </record> | 3720 | </record> |
| 533 | 3731 | 3721 | ||
| 534 | 3732 | <record id="pcg_445712" model="account.account.template"> | 3722 | <record id="pcg_445712" model="account.account.template"> |
| 535 | @@ -3735,7 +3725,6 @@ | |||
| 536 | 3735 | <field name="type">other</field> | 3725 | <field name="type">other</field> |
| 537 | 3736 | <field name="user_type" ref="account.data_account_type_liability"/> | 3726 | <field name="user_type" ref="account.data_account_type_liability"/> |
| 538 | 3737 | <field name="parent_id" ref="pcg_44571"/> | 3727 | <field name="parent_id" ref="pcg_44571"/> |
| 539 | 3738 | <field name="reconcile" eval="True"/> | ||
| 540 | 3739 | </record> | 3728 | </record> |
| 541 | 3740 | 3729 | ||
| 542 | 3741 | <record id="pcg_445713" model="account.account.template"> | 3730 | <record id="pcg_445713" model="account.account.template"> |
| 543 | @@ -3744,7 +3733,6 @@ | |||
| 544 | 3744 | <field name="type">other</field> | 3733 | <field name="type">other</field> |
| 545 | 3745 | <field name="user_type" ref="account.data_account_type_liability"/> | 3734 | <field name="user_type" ref="account.data_account_type_liability"/> |
| 546 | 3746 | <field name="parent_id" ref="pcg_44571"/> | 3735 | <field name="parent_id" ref="pcg_44571"/> |
| 547 | 3747 | <field name="reconcile" eval="True"/> | ||
| 548 | 3748 | </record> | 3736 | </record> |
| 549 | 3749 | 3737 | ||
| 550 | 3750 | <record id="pcg_44578" model="account.account.template"> | 3738 | <record id="pcg_44578" model="account.account.template"> |
| 551 | @@ -3762,7 +3750,6 @@ | |||
| 552 | 3762 | <field name="type">view</field> | 3750 | <field name="type">view</field> |
| 553 | 3763 | <field name="user_type" ref="account.data_account_type_view"/> | 3751 | <field name="user_type" ref="account.data_account_type_view"/> |
| 554 | 3764 | <field name="parent_id" ref="pcg_445"/> | 3752 | <field name="parent_id" ref="pcg_445"/> |
| 555 | 3765 | <field name="reconcile" eval="True"/> | ||
| 556 | 3766 | </record> | 3753 | </record> |
| 557 | 3767 | 3754 | ||
| 558 | 3768 | <record id="pcg_44581" model="account.account.template"> | 3755 | <record id="pcg_44581" model="account.account.template"> |
hello, this proposal is the same as the following which has been merged in trunk :
https:/
Thus I'm rejecting this proposal.
Thanks,
Cédric